Merge "Only generate versioned resource API file when asked to" into androidx-master-dev
diff --git a/activity/activity/api/1.2.0-alpha04.txt b/activity/activity/api/1.2.0-alpha04.txt
index bae9f7e..be3ea0d 100644
--- a/activity/activity/api/1.2.0-alpha04.txt
+++ b/activity/activity/api/1.2.0-alpha04.txt
@@ -1,7 +1,7 @@
 // Signature format: 3.0
 package androidx.activity {
 
-  public class ComponentActivity extends android.app.Activity implements androidx.activity.result.ActivityResultCaller androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+  public class ComponentActivity extends android.app.Activity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
     ctor public ComponentActivity();
     ctor @ContentView public ComponentActivity(@LayoutRes int);
     method public final androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
@@ -79,6 +79,10 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> register(String, androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
   }
 
+  public interface ActivityResultRegistryOwner {
+    method public androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
+  }
+
   public final class IntentSenderRequest {
     method public android.content.Intent? getFillInIntent();
     method public int getFlagsMask();
diff --git a/activity/activity/api/current.txt b/activity/activity/api/current.txt
index bae9f7e..be3ea0d 100644
--- a/activity/activity/api/current.txt
+++ b/activity/activity/api/current.txt
@@ -1,7 +1,7 @@
 // Signature format: 3.0
 package androidx.activity {
 
-  public class ComponentActivity extends android.app.Activity implements androidx.activity.result.ActivityResultCaller androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+  public class ComponentActivity extends android.app.Activity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
     ctor public ComponentActivity();
     ctor @ContentView public ComponentActivity(@LayoutRes int);
     method public final androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
@@ -79,6 +79,10 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> register(String, androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
   }
 
+  public interface ActivityResultRegistryOwner {
+    method public androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
+  }
+
   public final class IntentSenderRequest {
     method public android.content.Intent? getFillInIntent();
     method public int getFlagsMask();
diff --git a/activity/activity/api/public_plus_experimental_1.2.0-alpha04.txt b/activity/activity/api/public_plus_experimental_1.2.0-alpha04.txt
index cd1177c4..73add5e 100644
--- a/activity/activity/api/public_plus_experimental_1.2.0-alpha04.txt
+++ b/activity/activity/api/public_plus_experimental_1.2.0-alpha04.txt
@@ -1,7 +1,7 @@
 // Signature format: 3.0
 package androidx.activity {
 
-  public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+  public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
     ctor public ComponentActivity();
     ctor @ContentView public ComponentActivity(@LayoutRes int);
     method public final androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
@@ -78,6 +78,10 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> register(String, androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
   }
 
+  public interface ActivityResultRegistryOwner {
+    method public androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
+  }
+
   public final class IntentSenderRequest {
     method public android.content.Intent? getFillInIntent();
     method public int getFlagsMask();
diff --git a/activity/activity/api/public_plus_experimental_current.txt b/activity/activity/api/public_plus_experimental_current.txt
index cd1177c4..73add5e 100644
--- a/activity/activity/api/public_plus_experimental_current.txt
+++ b/activity/activity/api/public_plus_experimental_current.txt
@@ -1,7 +1,7 @@
 // Signature format: 3.0
 package androidx.activity {
 
-  public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+  public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
     ctor public ComponentActivity();
     ctor @ContentView public ComponentActivity(@LayoutRes int);
     method public final androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
@@ -78,6 +78,10 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> register(String, androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
   }
 
+  public interface ActivityResultRegistryOwner {
+    method public androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
+  }
+
   public final class IntentSenderRequest {
     method public android.content.Intent? getFillInIntent();
     method public int getFlagsMask();
diff --git a/activity/activity/api/restricted_1.2.0-alpha04.txt b/activity/activity/api/restricted_1.2.0-alpha04.txt
index cd1177c4..73add5e 100644
--- a/activity/activity/api/restricted_1.2.0-alpha04.txt
+++ b/activity/activity/api/restricted_1.2.0-alpha04.txt
@@ -1,7 +1,7 @@
 // Signature format: 3.0
 package androidx.activity {
 
-  public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+  public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
     ctor public ComponentActivity();
     ctor @ContentView public ComponentActivity(@LayoutRes int);
     method public final androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
@@ -78,6 +78,10 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> register(String, androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
   }
 
+  public interface ActivityResultRegistryOwner {
+    method public androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
+  }
+
   public final class IntentSenderRequest {
     method public android.content.Intent? getFillInIntent();
     method public int getFlagsMask();
diff --git a/activity/activity/api/restricted_current.txt b/activity/activity/api/restricted_current.txt
index cd1177c4..73add5e 100644
--- a/activity/activity/api/restricted_current.txt
+++ b/activity/activity/api/restricted_current.txt
@@ -1,7 +1,7 @@
 // Signature format: 3.0
 package androidx.activity {
 
-  public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+  public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.activity.OnBackPressedDispatcherOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
     ctor public ComponentActivity();
     ctor @ContentView public ComponentActivity(@LayoutRes int);
     method public final androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
@@ -78,6 +78,10 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> register(String, androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
   }
 
+  public interface ActivityResultRegistryOwner {
+    method public androidx.activity.result.ActivityResultRegistry getActivityResultRegistry();
+  }
+
   public final class IntentSenderRequest {
     method public android.content.Intent? getFillInIntent();
     method public int getFlagsMask();
diff --git a/activity/activity/src/main/java/androidx/activity/ComponentActivity.java b/activity/activity/src/main/java/androidx/activity/ComponentActivity.java
index bdaf02c..8ca2619 100644
--- a/activity/activity/src/main/java/androidx/activity/ComponentActivity.java
+++ b/activity/activity/src/main/java/androidx/activity/ComponentActivity.java
@@ -42,6 +42,7 @@
 import androidx.activity.result.ActivityResultCaller;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.ActivityResultRegistry;
+import androidx.activity.result.ActivityResultRegistryOwner;
 import androidx.activity.result.IntentSenderRequest;
 import androidx.activity.result.contract.ActivityResultContract;
 import androidx.annotation.CallSuper;
@@ -84,6 +85,7 @@
         HasDefaultViewModelProviderFactory,
         SavedStateRegistryOwner,
         OnBackPressedDispatcherOwner,
+        ActivityResultRegistryOwner,
         ActivityResultCaller {
 
     static final class NonConfigurationInstances {
@@ -531,6 +533,7 @@
      * @return the {@link ActivityResultRegistry}
      */
     @NonNull
+    @Override
     public final ActivityResultRegistry getActivityResultRegistry() {
         return mActivityResultRegistry;
     }
diff --git a/activity/activity/src/main/java/androidx/activity/result/ActivityResultRegistryOwner.java b/activity/activity/src/main/java/androidx/activity/result/ActivityResultRegistryOwner.java
new file mode 100644
index 0000000..c6ba684
--- /dev/null
+++ b/activity/activity/src/main/java/androidx/activity/result/ActivityResultRegistryOwner.java
@@ -0,0 +1,42 @@
+/*
+ * 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.activity.result;
+
+import androidx.activity.result.contract.ActivityResultContract;
+import androidx.annotation.NonNull;
+
+/**
+ * A class that has an {@link ActivityResultRegistry} that allows you to register a
+ * {@link ActivityResultCallback} for handling an
+ * {@link androidx.activity.result.contract.ActivityResultContract}.
+ *
+ * If it is not safe to call
+ * {@link ActivityResultRegistry#register(String, ActivityResultContract, ActivityResultCallback)}
+ * in the constructor, it is strongly recommended to also implement {@link ActivityResultCaller}.
+ *
+ * @see ActivityResultRegistry
+ */
+public interface ActivityResultRegistryOwner {
+
+    /**
+     * Returns the ActivityResultRegistry of the provider.
+     *
+     * @return The activity result registry of the provider.
+     */
+    @NonNull
+    ActivityResultRegistry getActivityResultRegistry();
+}
diff --git a/androidx-plugin/.idea/codeStyles b/androidx-plugin/.idea/codeStyles
new file mode 100644
index 0000000..e2e415d
--- /dev/null
+++ b/androidx-plugin/.idea/codeStyles
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleConfiguration">
+    <code_scheme name="Project" version="173">
+      <codeStyleSettings language="XML">
+        <indentOptions>
+          <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        </indentOptions>
+        <arrangement>
+          <rules>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>xmlns:android</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>xmlns:.*</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:id</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:name</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>name</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>style</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>ANDROID_ATTRIBUTE_ORDER</order>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>.*</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+            </section>
+          </rules>
+        </arrangement>
+      </codeStyleSettings>
+    </code_scheme>
+  </component>
+</project>
\ No newline at end of file
diff --git a/androidx-plugin/README.md b/androidx-plugin/README.md
new file mode 100644
index 0000000..90435de
--- /dev/null
+++ b/androidx-plugin/README.md
@@ -0,0 +1,18 @@
+# AndroidX Gradle Plugin
+
+The AndroidX Gradle plugin is a repackaged version of the existing Gradle plugin in the `buildSrc` directory.
+
+This project helps decouple AndroidX project builds from having to use `buildSrc` and they can use the maven coordinates
+`androidx.build:gradle-plugin:<version>` instead. 
+
+```groovy
+// in settings.gradle
+includeBuild("../androidx-plugin")
+
+// in build.gradle
+dependencies {
+    //.. other dependencies
+    classpath 'androidx.build:gradle-plugin:0.1.0'
+}
+```
+
diff --git a/androidx-plugin/build.gradle b/androidx-plugin/build.gradle
new file mode 100644
index 0000000..2ea079f
--- /dev/null
+++ b/androidx-plugin/build.gradle
@@ -0,0 +1,44 @@
+buildscript {
+    apply from: '../buildSrc/build_dependencies.gradle'
+
+    repositories {
+        google()
+        jcenter()
+        maven {
+            url 'https://androidx.dev/dokka/builds/6402791/artifacts/repository'
+            metadataSources {
+                mavenPom()
+                artifact()
+            }
+        }
+    }
+
+    dependencies {
+        classpath build_libs.agp
+        classpath build_libs.kotlin.gradle_plugin
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:${build_versions.dokka}"
+        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${build_versions.dokka}"
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        jcenter()
+        maven {
+            url 'https://androidx.dev/metalava/builds/6401339/artifacts/repo/m2repository'
+            metadataSources {
+                mavenPom()
+                artifact()
+            }
+        }
+        maven {
+            url 'https://androidx.dev/dokka/builds/6402791/artifacts/repository'
+            metadataSources {
+                mavenPom()
+                artifact()
+            }
+        }
+    }
+}
diff --git a/androidx-plugin/gradle-plugin/.gitignore b/androidx-plugin/gradle-plugin/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/androidx-plugin/gradle-plugin/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/androidx-plugin/gradle-plugin/build.gradle b/androidx-plugin/gradle-plugin/build.gradle
new file mode 100644
index 0000000..a1a8e70
--- /dev/null
+++ b/androidx-plugin/gradle-plugin/build.gradle
@@ -0,0 +1,65 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.gradle.api.attributes.Attribute
+import org.gradle.api.attributes.Bundling
+
+plugins {
+    id "kotlin"
+    id "java-gradle-plugin"
+}
+
+ext.supportRootFolder = project.projectDir.getParentFile().getParentFile()
+
+apply from: '../../buildSrc/build_dependencies.gradle'
+apply from: "../../buildSrc/kotlin-dsl-dependency.gradle"
+
+dependencies {
+    implementation project(":jetpad-integration")
+
+    compileOnly findGradleKotlinDsl()
+    implementation gradleApi()
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${build_versions.kotlin}"
+
+    implementation build_libs.agp
+    implementation build_libs.dex_member_list
+    implementation build_libs.kotlin.gradle_plugin
+    implementation build_libs.kotlinpoet
+
+    implementation "org.jetbrains.dokka:dokka-gradle-plugin:${build_versions.dokka}"
+    implementation "org.jetbrains.dokka:dokka-android-gradle-plugin:${build_versions.dokka}"
+
+    // Not really sure about these:
+    implementation "androidx.benchmark:benchmark-gradle-plugin:1.0.0"
+    implementation "com.google.protobuf:protobuf-gradle-plugin:0.8.8"
+    implementation "org.anarres.jarjar:jarjar-gradle:1.0.1"
+}
+
+sourceSets {
+    main.java.srcDirs += "${supportRootFolder}/buildSrc/src/main/kotlin"
+    main.java.srcDirs += "${supportRootFolder}/inspection/inspection-gradle-plugin/src/main/kotlin"
+    main.resources.srcDirs += "${supportRootFolder}/inspection/inspection-gradle-plugin/src/main/resources"
+}
+
+version = "0.1.0"
+group = "androidx.build"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+tasks.withType(KotlinCompile).all {
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs += ["-Werror"]
+    }
+}
+
+gradlePlugin {
+    plugins {
+        AndroidXPlugin {
+            id = "AndroidXPlugin"
+            implementationClass = "androidx.build.AndroidXPlugin"
+        }
+    }
+}
diff --git a/androidx-plugin/gradle.properties b/androidx-plugin/gradle.properties
new file mode 100644
index 0000000..4d15d01
--- /dev/null
+++ b/androidx-plugin/gradle.properties
@@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
\ No newline at end of file
diff --git a/androidx-plugin/gradle/wrapper/gradle-wrapper.jar b/androidx-plugin/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..f6b961f
--- /dev/null
+++ b/androidx-plugin/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/androidx-plugin/gradle/wrapper/gradle-wrapper.properties b/androidx-plugin/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..f4bab61
--- /dev/null
+++ b/androidx-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Apr 04 22:05:15 PDT 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
diff --git a/androidx-plugin/gradlew b/androidx-plugin/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/androidx-plugin/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/androidx-plugin/gradlew.bat b/androidx-plugin/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/androidx-plugin/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off

+@rem ##########################################################################

+@rem

+@rem  Gradle startup script for Windows

+@rem

+@rem ##########################################################################

+

+@rem Set local scope for the variables with windows NT shell

+if "%OS%"=="Windows_NT" setlocal

+

+set DIRNAME=%~dp0

+if "%DIRNAME%" == "" set DIRNAME=.

+set APP_BASE_NAME=%~n0

+set APP_HOME=%DIRNAME%

+

+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

+set DEFAULT_JVM_OPTS=

+

+@rem Find java.exe

+if defined JAVA_HOME goto findJavaFromJavaHome

+

+set JAVA_EXE=java.exe

+%JAVA_EXE% -version >NUL 2>&1

+if "%ERRORLEVEL%" == "0" goto init

+

+echo.

+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

+echo.

+echo Please set the JAVA_HOME variable in your environment to match the

+echo location of your Java installation.

+

+goto fail

+

+:findJavaFromJavaHome

+set JAVA_HOME=%JAVA_HOME:"=%

+set JAVA_EXE=%JAVA_HOME%/bin/java.exe

+

+if exist "%JAVA_EXE%" goto init

+

+echo.

+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

+echo.

+echo Please set the JAVA_HOME variable in your environment to match the

+echo location of your Java installation.

+

+goto fail

+

+:init

+@rem Get command-line arguments, handling Windows variants

+

+if not "%OS%" == "Windows_NT" goto win9xME_args

+

+:win9xME_args

+@rem Slurp the command line arguments.

+set CMD_LINE_ARGS=

+set _SKIP=2

+

+:win9xME_args_slurp

+if "x%~1" == "x" goto execute

+

+set CMD_LINE_ARGS=%*

+

+:execute

+@rem Setup the command line

+

+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+

+@rem Execute Gradle

+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

+

+:end

+@rem End local scope for the variables with windows NT shell

+if "%ERRORLEVEL%"=="0" goto mainEnd

+

+:fail

+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

+rem the _cmd.exe /c_ return code!

+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

+exit /b 1

+

+:mainEnd

+if "%OS%"=="Windows_NT" endlocal

+

+:omega

diff --git a/androidx-plugin/settings.gradle b/androidx-plugin/settings.gradle
new file mode 100644
index 0000000..81a01da
--- /dev/null
+++ b/androidx-plugin/settings.gradle
@@ -0,0 +1,3 @@
+include ':gradle-plugin'
+include ':jetpad-integration'
+project(':jetpad-integration').projectDir = file('../buildSrc/jetpad-integration')
\ No newline at end of file
diff --git a/annotation/annotation/api/1.2.0-alpha01.txt b/annotation/annotation/api/1.2.0-alpha01.txt
index 9ad0e40..082a397 100644
--- a/annotation/annotation/api/1.2.0-alpha01.txt
+++ b/annotation/annotation/api/1.2.0-alpha01.txt
@@ -32,10 +32,10 @@
     method public abstract String suggest() default "";
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface ColorRes {
@@ -57,7 +57,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DrawableRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
     method public abstract double from() default java.lang.Double.NEGATIVE_INFINITY;
     method public abstract boolean fromInclusive() default true;
     method public abstract double to() default java.lang.Double.POSITIVE_INFINITY;
@@ -74,7 +74,7 @@
     method public abstract String value();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface IdRes {
@@ -116,7 +116,7 @@
     method public abstract int[] value() default {};
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
     method public abstract long from() default java.lang.Long.MIN_VALUE;
     method public abstract long to() default java.lang.Long.MAX_VALUE;
   }
@@ -163,7 +163,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface RawRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
     method @IntRange(from=1) public abstract int api() default 1;
     method @IntRange(from=1) public abstract int value() default 1;
   }
@@ -173,7 +173,7 @@
     method public abstract String name();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
     method public abstract String[] allOf() default {};
     method public abstract String[] anyOf() default {};
     method public abstract boolean conditional() default false;
@@ -201,7 +201,7 @@
     enum_constant public static final androidx.annotation.RestrictTo.Scope TESTS;
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
     method public abstract long max() default java.lang.Long.MAX_VALUE;
     method public abstract long min() default java.lang.Long.MIN_VALUE;
     method public abstract long multiple() default 1;
diff --git a/annotation/annotation/api/current.txt b/annotation/annotation/api/current.txt
index 9ad0e40..082a397 100644
--- a/annotation/annotation/api/current.txt
+++ b/annotation/annotation/api/current.txt
@@ -32,10 +32,10 @@
     method public abstract String suggest() default "";
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface ColorRes {
@@ -57,7 +57,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DrawableRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
     method public abstract double from() default java.lang.Double.NEGATIVE_INFINITY;
     method public abstract boolean fromInclusive() default true;
     method public abstract double to() default java.lang.Double.POSITIVE_INFINITY;
@@ -74,7 +74,7 @@
     method public abstract String value();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface IdRes {
@@ -116,7 +116,7 @@
     method public abstract int[] value() default {};
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
     method public abstract long from() default java.lang.Long.MIN_VALUE;
     method public abstract long to() default java.lang.Long.MAX_VALUE;
   }
@@ -163,7 +163,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface RawRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
     method @IntRange(from=1) public abstract int api() default 1;
     method @IntRange(from=1) public abstract int value() default 1;
   }
@@ -173,7 +173,7 @@
     method public abstract String name();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
     method public abstract String[] allOf() default {};
     method public abstract String[] anyOf() default {};
     method public abstract boolean conditional() default false;
@@ -201,7 +201,7 @@
     enum_constant public static final androidx.annotation.RestrictTo.Scope TESTS;
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
     method public abstract long max() default java.lang.Long.MAX_VALUE;
     method public abstract long min() default java.lang.Long.MIN_VALUE;
     method public abstract long multiple() default 1;
diff --git a/annotation/annotation/api/public_plus_experimental_1.2.0-alpha01.txt b/annotation/annotation/api/public_plus_experimental_1.2.0-alpha01.txt
index 9ad0e40..082a397 100644
--- a/annotation/annotation/api/public_plus_experimental_1.2.0-alpha01.txt
+++ b/annotation/annotation/api/public_plus_experimental_1.2.0-alpha01.txt
@@ -32,10 +32,10 @@
     method public abstract String suggest() default "";
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface ColorRes {
@@ -57,7 +57,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DrawableRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
     method public abstract double from() default java.lang.Double.NEGATIVE_INFINITY;
     method public abstract boolean fromInclusive() default true;
     method public abstract double to() default java.lang.Double.POSITIVE_INFINITY;
@@ -74,7 +74,7 @@
     method public abstract String value();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface IdRes {
@@ -116,7 +116,7 @@
     method public abstract int[] value() default {};
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
     method public abstract long from() default java.lang.Long.MIN_VALUE;
     method public abstract long to() default java.lang.Long.MAX_VALUE;
   }
@@ -163,7 +163,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface RawRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
     method @IntRange(from=1) public abstract int api() default 1;
     method @IntRange(from=1) public abstract int value() default 1;
   }
@@ -173,7 +173,7 @@
     method public abstract String name();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
     method public abstract String[] allOf() default {};
     method public abstract String[] anyOf() default {};
     method public abstract boolean conditional() default false;
@@ -201,7 +201,7 @@
     enum_constant public static final androidx.annotation.RestrictTo.Scope TESTS;
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
     method public abstract long max() default java.lang.Long.MAX_VALUE;
     method public abstract long min() default java.lang.Long.MIN_VALUE;
     method public abstract long multiple() default 1;
diff --git a/annotation/annotation/api/public_plus_experimental_current.txt b/annotation/annotation/api/public_plus_experimental_current.txt
index 9ad0e40..082a397 100644
--- a/annotation/annotation/api/public_plus_experimental_current.txt
+++ b/annotation/annotation/api/public_plus_experimental_current.txt
@@ -32,10 +32,10 @@
     method public abstract String suggest() default "";
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface ColorRes {
@@ -57,7 +57,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DrawableRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
     method public abstract double from() default java.lang.Double.NEGATIVE_INFINITY;
     method public abstract boolean fromInclusive() default true;
     method public abstract double to() default java.lang.Double.POSITIVE_INFINITY;
@@ -74,7 +74,7 @@
     method public abstract String value();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface IdRes {
@@ -116,7 +116,7 @@
     method public abstract int[] value() default {};
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
     method public abstract long from() default java.lang.Long.MIN_VALUE;
     method public abstract long to() default java.lang.Long.MAX_VALUE;
   }
@@ -163,7 +163,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface RawRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
     method @IntRange(from=1) public abstract int api() default 1;
     method @IntRange(from=1) public abstract int value() default 1;
   }
@@ -173,7 +173,7 @@
     method public abstract String name();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
     method public abstract String[] allOf() default {};
     method public abstract String[] anyOf() default {};
     method public abstract boolean conditional() default false;
@@ -201,7 +201,7 @@
     enum_constant public static final androidx.annotation.RestrictTo.Scope TESTS;
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
     method public abstract long max() default java.lang.Long.MAX_VALUE;
     method public abstract long min() default java.lang.Long.MIN_VALUE;
     method public abstract long multiple() default 1;
diff --git a/annotation/annotation/api/restricted_1.2.0-alpha01.txt b/annotation/annotation/api/restricted_1.2.0-alpha01.txt
index 9ad0e40..082a397 100644
--- a/annotation/annotation/api/restricted_1.2.0-alpha01.txt
+++ b/annotation/annotation/api/restricted_1.2.0-alpha01.txt
@@ -32,10 +32,10 @@
     method public abstract String suggest() default "";
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface ColorRes {
@@ -57,7 +57,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DrawableRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
     method public abstract double from() default java.lang.Double.NEGATIVE_INFINITY;
     method public abstract boolean fromInclusive() default true;
     method public abstract double to() default java.lang.Double.POSITIVE_INFINITY;
@@ -74,7 +74,7 @@
     method public abstract String value();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface IdRes {
@@ -116,7 +116,7 @@
     method public abstract int[] value() default {};
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
     method public abstract long from() default java.lang.Long.MIN_VALUE;
     method public abstract long to() default java.lang.Long.MAX_VALUE;
   }
@@ -163,7 +163,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface RawRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
     method @IntRange(from=1) public abstract int api() default 1;
     method @IntRange(from=1) public abstract int value() default 1;
   }
@@ -173,7 +173,7 @@
     method public abstract String name();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
     method public abstract String[] allOf() default {};
     method public abstract String[] anyOf() default {};
     method public abstract boolean conditional() default false;
@@ -201,7 +201,7 @@
     enum_constant public static final androidx.annotation.RestrictTo.Scope TESTS;
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
     method public abstract long max() default java.lang.Long.MAX_VALUE;
     method public abstract long min() default java.lang.Long.MIN_VALUE;
     method public abstract long multiple() default 1;
diff --git a/annotation/annotation/api/restricted_current.txt b/annotation/annotation/api/restricted_current.txt
index 9ad0e40..082a397 100644
--- a/annotation/annotation/api/restricted_current.txt
+++ b/annotation/annotation/api/restricted_current.txt
@@ -32,10 +32,10 @@
     method public abstract String suggest() default "";
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorInt {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface ColorLong {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface ColorRes {
@@ -57,7 +57,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface DrawableRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface FloatRange {
     method public abstract double from() default java.lang.Double.NEGATIVE_INFINITY;
     method public abstract boolean fromInclusive() default true;
     method public abstract double to() default java.lang.Double.POSITIVE_INFINITY;
@@ -74,7 +74,7 @@
     method public abstract String value();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.FIELD}) public @interface HalfFloat {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface IdRes {
@@ -116,7 +116,7 @@
     method public abstract int[] value() default {};
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface IntRange {
     method public abstract long from() default java.lang.Long.MIN_VALUE;
     method public abstract long to() default java.lang.Long.MAX_VALUE;
   }
@@ -163,7 +163,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface RawRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) public @interface RequiresApi {
     method @IntRange(from=1) public abstract int api() default 1;
     method @IntRange(from=1) public abstract int value() default 1;
   }
@@ -173,7 +173,7 @@
     method public abstract String name();
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PARAMETER}) public @interface RequiresPermission {
     method public abstract String[] allOf() default {};
     method public abstract String[] anyOf() default {};
     method public abstract boolean conditional() default false;
@@ -201,7 +201,7 @@
     enum_constant public static final androidx.annotation.RestrictTo.Scope TESTS;
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
+  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface Size {
     method public abstract long max() default java.lang.Long.MAX_VALUE;
     method public abstract long min() default java.lang.Long.MIN_VALUE;
     method public abstract long multiple() default 1;
diff --git a/annotation/annotation/src/main/java/androidx/annotation/ColorInt.java b/annotation/annotation/src/main/java/androidx/annotation/ColorInt.java
index a10102c..0e67c97 100644
--- a/annotation/annotation/src/main/java/androidx/annotation/ColorInt.java
+++ b/annotation/annotation/src/main/java/androidx/annotation/ColorInt.java
@@ -21,6 +21,7 @@
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.CLASS;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -34,6 +35,7 @@
  *  public abstract void setTextColor(@ColorInt int color);
  * }</pre>
  */
+@Documented
 @Retention(CLASS)
 @Target({PARAMETER, METHOD, LOCAL_VARIABLE, FIELD})
 public @interface ColorInt {
diff --git a/annotation/annotation/src/main/java/androidx/annotation/ColorLong.java b/annotation/annotation/src/main/java/androidx/annotation/ColorLong.java
index 5fe32cd..408f78e 100644
--- a/annotation/annotation/src/main/java/androidx/annotation/ColorLong.java
+++ b/annotation/annotation/src/main/java/androidx/annotation/ColorLong.java
@@ -22,6 +22,7 @@
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -40,6 +41,7 @@
  *
  * @see android.graphics.Color
  */
+@Documented
 @Retention(SOURCE)
 @Target({PARAMETER, METHOD, LOCAL_VARIABLE, FIELD})
 public @interface ColorLong {
diff --git a/annotation/annotation/src/main/java/androidx/annotation/FloatRange.java b/annotation/annotation/src/main/java/androidx/annotation/FloatRange.java
index 712833f..7cc6196 100644
--- a/annotation/annotation/src/main/java/androidx/annotation/FloatRange.java
+++ b/annotation/annotation/src/main/java/androidx/annotation/FloatRange.java
@@ -22,6 +22,7 @@
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.CLASS;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -36,6 +37,7 @@
  *  }
  * </code></pre>
  */
+@Documented
 @Retention(CLASS)
 @Target({METHOD, PARAMETER, FIELD, LOCAL_VARIABLE, ANNOTATION_TYPE})
 public @interface FloatRange {
diff --git a/annotation/annotation/src/main/java/androidx/annotation/HalfFloat.java b/annotation/annotation/src/main/java/androidx/annotation/HalfFloat.java
index fb234b2..a0e287e 100644
--- a/annotation/annotation/src/main/java/androidx/annotation/HalfFloat.java
+++ b/annotation/annotation/src/main/java/androidx/annotation/HalfFloat.java
@@ -21,6 +21,7 @@
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -36,6 +37,7 @@
  * public abstract void setPosition(@HalfFloat short x, @HalfFloat short y, @HalfFloat short z);
  * }</pre>
  */
+@Documented
 @Retention(SOURCE)
 @Target({PARAMETER, METHOD, LOCAL_VARIABLE, FIELD})
 public @interface HalfFloat {
diff --git a/annotation/annotation/src/main/java/androidx/annotation/IntRange.java b/annotation/annotation/src/main/java/androidx/annotation/IntRange.java
index 883d687..6d86249 100644
--- a/annotation/annotation/src/main/java/androidx/annotation/IntRange.java
+++ b/annotation/annotation/src/main/java/androidx/annotation/IntRange.java
@@ -22,6 +22,7 @@
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.CLASS;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -36,6 +37,7 @@
  *  }
  * </code></pre>
  */
+@Documented
 @Retention(CLASS)
 @Target({METHOD, PARAMETER, FIELD, LOCAL_VARIABLE, ANNOTATION_TYPE})
 public @interface IntRange {
diff --git a/annotation/annotation/src/main/java/androidx/annotation/RequiresApi.java b/annotation/annotation/src/main/java/androidx/annotation/RequiresApi.java
index a6f4f6e..cf69280 100644
--- a/annotation/annotation/src/main/java/androidx/annotation/RequiresApi.java
+++ b/annotation/annotation/src/main/java/androidx/annotation/RequiresApi.java
@@ -22,6 +22,7 @@
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.CLASS;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -32,6 +33,7 @@
  * expresses that this is a requirement on the caller, rather than being used to "suppress" warnings
  * within the method that exceed the {@code minSdkVersion}.
  */
+@Documented
 @Retention(CLASS)
 @Target({TYPE, METHOD, CONSTRUCTOR, FIELD, PACKAGE})
 public @interface RequiresApi {
diff --git a/annotation/annotation/src/main/java/androidx/annotation/RequiresPermission.java b/annotation/annotation/src/main/java/androidx/annotation/RequiresPermission.java
index 583dde9..267c8e2 100644
--- a/annotation/annotation/src/main/java/androidx/annotation/RequiresPermission.java
+++ b/annotation/annotation/src/main/java/androidx/annotation/RequiresPermission.java
@@ -22,6 +22,7 @@
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.CLASS;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -73,6 +74,7 @@
  *   public static final String ACTION_CALL = "android.intent.action.CALL";
  * </code></pre>
  */
+@Documented
 @Retention(CLASS)
 @Target({ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD, PARAMETER})
 public @interface RequiresPermission {
diff --git a/annotation/annotation/src/main/java/androidx/annotation/Size.java b/annotation/annotation/src/main/java/androidx/annotation/Size.java
index bc4b0ee..6b9d5de 100644
--- a/annotation/annotation/src/main/java/androidx/annotation/Size.java
+++ b/annotation/annotation/src/main/java/androidx/annotation/Size.java
@@ -22,6 +22,7 @@
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.CLASS;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -37,6 +38,7 @@
  *  }
  * }</pre>
  */
+@Documented
 @Retention(CLASS)
 @Target({PARAMETER, LOCAL_VARIABLE, METHOD, FIELD, ANNOTATION_TYPE})
 public @interface Size {
diff --git a/appcompat/appcompat/api/restricted_1.2.0-beta01.txt b/appcompat/appcompat/api/restricted_1.2.0-beta01.txt
index 05e8e4a..34ad4f3 100644
--- a/appcompat/appcompat/api/restricted_1.2.0-beta01.txt
+++ b/appcompat/appcompat/api/restricted_1.2.0-beta01.txt
@@ -439,8 +439,8 @@
     method public void invalidate();
     method public void onCloseMenu(androidx.appcompat.view.menu.MenuBuilder!, boolean);
     method public void onCloseSubMenu(androidx.appcompat.view.menu.SubMenuBuilder!);
-    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder!, android.view.MenuItem!);
-    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder!);
+    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder, android.view.MenuItem);
+    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder);
     method public boolean onSubMenuSelected(androidx.appcompat.view.menu.SubMenuBuilder!);
     method public void setCustomView(android.view.View!);
     method public void setSubtitle(CharSequence!);
@@ -590,8 +590,8 @@
     method public void invalidate();
     method public void onCloseMenu(androidx.appcompat.view.menu.MenuBuilder!, boolean);
     method public void onCloseSubMenu(androidx.appcompat.view.menu.SubMenuBuilder!);
-    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder!, android.view.MenuItem!);
-    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder!);
+    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder, android.view.MenuItem);
+    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder);
     method public boolean onSubMenuSelected(androidx.appcompat.view.menu.SubMenuBuilder!);
     method public void setCustomView(android.view.View!);
     method public void setSubtitle(CharSequence!);
@@ -918,8 +918,8 @@
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static interface MenuBuilder.Callback {
-    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder!, android.view.MenuItem!);
-    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder!);
+    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder, android.view.MenuItem);
+    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder);
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static interface MenuBuilder.ItemInvoker {
@@ -1074,8 +1074,8 @@
   }
 
   public static interface MenuPresenter.Callback {
-    method public void onCloseMenu(androidx.appcompat.view.menu.MenuBuilder!, boolean);
-    method public boolean onOpenSubMenu(androidx.appcompat.view.menu.MenuBuilder!);
+    method public void onCloseMenu(androidx.appcompat.view.menu.MenuBuilder, boolean);
+    method public boolean onOpenSubMenu(androidx.appcompat.view.menu.MenuBuilder);
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public interface MenuView {
diff --git a/appcompat/appcompat/api/restricted_current.txt b/appcompat/appcompat/api/restricted_current.txt
index 05e8e4a..34ad4f3 100644
--- a/appcompat/appcompat/api/restricted_current.txt
+++ b/appcompat/appcompat/api/restricted_current.txt
@@ -439,8 +439,8 @@
     method public void invalidate();
     method public void onCloseMenu(androidx.appcompat.view.menu.MenuBuilder!, boolean);
     method public void onCloseSubMenu(androidx.appcompat.view.menu.SubMenuBuilder!);
-    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder!, android.view.MenuItem!);
-    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder!);
+    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder, android.view.MenuItem);
+    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder);
     method public boolean onSubMenuSelected(androidx.appcompat.view.menu.SubMenuBuilder!);
     method public void setCustomView(android.view.View!);
     method public void setSubtitle(CharSequence!);
@@ -590,8 +590,8 @@
     method public void invalidate();
     method public void onCloseMenu(androidx.appcompat.view.menu.MenuBuilder!, boolean);
     method public void onCloseSubMenu(androidx.appcompat.view.menu.SubMenuBuilder!);
-    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder!, android.view.MenuItem!);
-    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder!);
+    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder, android.view.MenuItem);
+    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder);
     method public boolean onSubMenuSelected(androidx.appcompat.view.menu.SubMenuBuilder!);
     method public void setCustomView(android.view.View!);
     method public void setSubtitle(CharSequence!);
@@ -918,8 +918,8 @@
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static interface MenuBuilder.Callback {
-    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder!, android.view.MenuItem!);
-    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder!);
+    method public boolean onMenuItemSelected(androidx.appcompat.view.menu.MenuBuilder, android.view.MenuItem);
+    method public void onMenuModeChange(androidx.appcompat.view.menu.MenuBuilder);
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static interface MenuBuilder.ItemInvoker {
@@ -1074,8 +1074,8 @@
   }
 
   public static interface MenuPresenter.Callback {
-    method public void onCloseMenu(androidx.appcompat.view.menu.MenuBuilder!, boolean);
-    method public boolean onOpenSubMenu(androidx.appcompat.view.menu.MenuBuilder!);
+    method public void onCloseMenu(androidx.appcompat.view.menu.MenuBuilder, boolean);
+    method public boolean onOpenSubMenu(androidx.appcompat.view.menu.MenuBuilder);
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public interface MenuView {
diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
index e9465a8..c10c37c 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
@@ -17,10 +17,13 @@
 package androidx.appcompat.app;
 
 import static androidx.appcompat.testutils.TestUtilsActions.setSystemUiVisibility;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -79,6 +82,38 @@
     }
 
     @Test
+    public void testActionBarOverflowVisibilityListener() {
+        ActionBar actionBar = mActivityTestRule.getActivity().getSupportActionBar();
+        final boolean[] madeVisible = new boolean[] {false};
+        actionBar.addOnMenuVisibilityListener(new ActionBar.OnMenuVisibilityListener() {
+            @Override
+            public void onMenuVisibilityChanged(boolean isVisible) {
+                madeVisible[0] = isVisible;
+            }
+        });
+        openActionBarOverflowOrOptionsMenu(getApplicationContext());
+        assertTrue("OnMenuVisibilityListener should be called",
+                madeVisible[0]);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testActionBarShowHideNoOverflowVisibilityListener() {
+        ActionBar actionBar = mActivityTestRule.getActivity().getSupportActionBar();
+        final boolean[] receivedCallback = new boolean[] {false};
+        actionBar.addOnMenuVisibilityListener(new ActionBar.OnMenuVisibilityListener() {
+            @Override
+            public void onMenuVisibilityChanged(boolean isVisible) {
+                receivedCallback[0] = true;
+            }
+        });
+        actionBar.openOptionsMenu();
+        actionBar.closeOptionsMenu();
+        assertFalse("OnMenuVisibilityListener should not be called",
+                receivedCallback[0]);
+    }
+
+    @Test
     public void testDefaultActionBarTitle() {
         assertEquals(mActivityTestRule.getActivity().getTitle(),
                 mActivityTestRule.getActivity().getSupportActionBar().getTitle());
diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerRtlActivity.java b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerRtlActivity.java
index 7a9395d..ef13c07 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerRtlActivity.java
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerRtlActivity.java
@@ -19,8 +19,6 @@
 import android.content.res.Configuration;
 import android.view.ContextThemeWrapper;
 
-import androidx.testutils.LocaleTestUtils;
-
 import java.util.Locale;
 
 public class AppCompatSpinnerRtlActivity extends AppCompatSpinnerActivity {
@@ -28,7 +26,7 @@
         Configuration overrideConfig = new Configuration();
         overrideConfig.fontScale = 0;
         // Mark activity to use RTL language / locale
-        overrideConfig.locale = new Locale(LocaleTestUtils.RTL_LANGUAGE);
+        overrideConfig.locale = new Locale("ar", "sa");
 
         ContextThemeWrapper wrappedBase = new ContextThemeWrapper(
                 newBase, androidx.appcompat.test.R.style.Theme_AppCompat_Empty);
@@ -38,5 +36,4 @@
 
         super.attachBaseContext(newBase);
     }
-
 }
diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerRtlTest.java b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerRtlTest.java
index 099781e..3ff4329 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerRtlTest.java
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerRtlTest.java
@@ -28,6 +28,7 @@
  * This class is for testing RTL-related functionality of {@link AppCompatSpinner}
  */
 @LargeTest
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.JELLY_BEAN_MR1)
 public class AppCompatSpinnerRtlTest
         extends AppCompatBaseViewTest<AppCompatSpinnerRtlActivity, AppCompatSpinner> {
     private Instrumentation mInstrumentation;
@@ -49,7 +50,6 @@
     }
 
     @Test
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.JELLY_BEAN_MR1)
     public void testHorizontalOffsetRtl() {
         AppCompatSpinnerTest.checkOffsetIsCorrect(mInstrumentation, mContainer, 200, false, true);
     }
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java b/appcompat/appcompat/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java
index 48491f8..5e5b692 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java
@@ -1165,7 +1165,7 @@
     }
 
     @Override
-    public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
+    public boolean onMenuItemSelected(@NonNull MenuBuilder menu, @NonNull MenuItem item) {
         final Window.Callback cb = getWindowCallback();
         if (cb != null && !mIsDestroyed) {
             final PanelFeatureState panel = findMenuPanel(menu.getRootMenu());
@@ -1177,7 +1177,7 @@
     }
 
     @Override
-    public void onMenuModeChange(MenuBuilder menu) {
+    public void onMenuModeChange(@NonNull MenuBuilder menu) {
         reopenMenu(true);
     }
 
@@ -1942,7 +1942,7 @@
         return true;
     }
 
-    void checkCloseActionMenu(MenuBuilder menu) {
+    void checkCloseActionMenu(@NonNull MenuBuilder menu) {
         if (mClosingActionMenu) {
             return;
         }
@@ -2724,7 +2724,7 @@
         }
 
         @Override
-        public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
+        public void onCloseMenu(@NonNull MenuBuilder menu, boolean allMenusAreClosing) {
             final Menu parentMenu = menu.getRootMenu();
             final boolean isSubMenu = parentMenu != menu;
             final PanelFeatureState panel = findMenuPanel(isSubMenu ? parentMenu : menu);
@@ -2741,8 +2741,9 @@
         }
 
         @Override
-        public boolean onOpenSubMenu(MenuBuilder subMenu) {
-            if (subMenu == null && mHasActionBar) {
+        public boolean onOpenSubMenu(@NonNull MenuBuilder subMenu) {
+            // Only dispatch for the root menu
+            if (subMenu == subMenu.getRootMenu() && mHasActionBar) {
                 Window.Callback cb = getWindowCallback();
                 if (cb != null && !mIsDestroyed) {
                     cb.onMenuOpened(FEATURE_SUPPORT_ACTION_BAR, subMenu);
@@ -2757,7 +2758,7 @@
         }
 
         @Override
-        public boolean onOpenSubMenu(MenuBuilder subMenu) {
+        public boolean onOpenSubMenu(@NonNull MenuBuilder subMenu) {
             Window.Callback cb = getWindowCallback();
             if (cb != null) {
                 cb.onMenuOpened(FEATURE_SUPPORT_ACTION_BAR, subMenu);
@@ -2766,7 +2767,7 @@
         }
 
         @Override
-        public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
+        public void onCloseMenu(@NonNull MenuBuilder menu, boolean allMenusAreClosing) {
             checkCloseActionMenu(menu);
         }
     }
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/app/ToolbarActionBar.java b/appcompat/appcompat/src/main/java/androidx/appcompat/app/ToolbarActionBar.java
index 811e4b5..819f56c 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/app/ToolbarActionBar.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/app/ToolbarActionBar.java
@@ -30,6 +30,7 @@
 import android.view.Window;
 import android.widget.SpinnerAdapter;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.view.WindowCallbackWrapper;
 import androidx.appcompat.view.menu.MenuBuilder;
@@ -555,7 +556,7 @@
         }
 
         @Override
-        public boolean onOpenSubMenu(MenuBuilder subMenu) {
+        public boolean onOpenSubMenu(@NonNull MenuBuilder subMenu) {
             if (mWindowCallback != null) {
                 mWindowCallback.onMenuOpened(AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR, subMenu);
                 return true;
@@ -564,7 +565,7 @@
         }
 
         @Override
-        public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
+        public void onCloseMenu(@NonNull MenuBuilder menu, boolean allMenusAreClosing) {
             if (mClosingActionMenu) {
                 return;
             }
@@ -584,12 +585,12 @@
         }
 
         @Override
-        public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
+        public boolean onMenuItemSelected(@NonNull MenuBuilder menu, @NonNull MenuItem item) {
             return false;
         }
 
         @Override
-        public void onMenuModeChange(MenuBuilder menu) {
+        public void onMenuModeChange(@NonNull MenuBuilder menu) {
             if (mWindowCallback != null) {
                 if (mDecorToolbar.isOverflowMenuShowing()) {
                     mWindowCallback.onPanelClosed(AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR, menu);
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/app/WindowDecorActionBar.java b/appcompat/appcompat/src/main/java/androidx/appcompat/app/WindowDecorActionBar.java
index ec0a241..847bbb8 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/app/WindowDecorActionBar.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/app/WindowDecorActionBar.java
@@ -43,6 +43,7 @@
 import android.view.animation.Interpolator;
 import android.widget.SpinnerAdapter;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.appcompat.R;
 import androidx.appcompat.content.res.AppCompatResources;
@@ -1115,7 +1116,7 @@
         }
 
         @Override
-        public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
+        public boolean onMenuItemSelected(@NonNull MenuBuilder menu, @NonNull MenuItem item) {
             if (mCallback != null) {
                 return mCallback.onActionItemClicked(this, item);
             } else {
@@ -1143,7 +1144,7 @@
         }
 
         @Override
-        public void onMenuModeChange(MenuBuilder menu) {
+        public void onMenuModeChange(@NonNull MenuBuilder menu) {
             if (mCallback == null) {
                 return;
             }
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/view/StandaloneActionMode.java b/appcompat/appcompat/src/main/java/androidx/appcompat/view/StandaloneActionMode.java
index 3d3bcd9..b41f106 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/view/StandaloneActionMode.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/view/StandaloneActionMode.java
@@ -24,6 +24,7 @@
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 import androidx.appcompat.view.menu.MenuBuilder;
 import androidx.appcompat.view.menu.MenuPopupHelper;
@@ -137,7 +138,7 @@
     }
 
     @Override
-    public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
+    public boolean onMenuItemSelected(@NonNull MenuBuilder menu, @NonNull MenuItem item) {
         return mCallback.onActionItemClicked(this, item);
     }
 
@@ -157,7 +158,7 @@
     }
 
     @Override
-    public void onMenuModeChange(MenuBuilder menu) {
+    public void onMenuModeChange(@NonNull MenuBuilder menu) {
         invalidate();
         mContextView.showOverflowMenu();
     }
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/BaseMenuPresenter.java b/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/BaseMenuPresenter.java
index 769f66a..cb193a7 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/BaseMenuPresenter.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/BaseMenuPresenter.java
@@ -218,7 +218,8 @@
     @Override
     public boolean onSubMenuSelected(SubMenuBuilder menu) {
         if (mCallback != null) {
-            return mCallback.onOpenSubMenu(menu);
+            // Use the root menu if we were passed a null subMenu
+            return mCallback.onOpenSubMenu(menu != null ? menu : mMenu);
         }
         return false;
     }
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java b/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
index 5c40900..c91e2b8 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
@@ -201,14 +201,14 @@
          * @param item The menu item that is selected
          * @return whether the menu item selection was handled
          */
-        boolean onMenuItemSelected(MenuBuilder menu, MenuItem item);
+        boolean onMenuItemSelected(@NonNull MenuBuilder menu, @NonNull MenuItem item);
 
         /**
          * Called when the mode of the menu changes (for example, from icon to expanded).
          *
          * @param menu the menu that has changed modes
          */
-        void onMenuModeChange(MenuBuilder menu);
+        void onMenuModeChange(@NonNull MenuBuilder menu);
     }
 
     /**
@@ -830,7 +830,7 @@
         return mContext;
     }
 
-    boolean dispatchMenuItemSelected(MenuBuilder menu, MenuItem item) {
+    boolean dispatchMenuItemSelected(@NonNull MenuBuilder menu, @NonNull MenuItem item) {
         return mCallback != null && mCallback.onMenuItemSelected(menu, item);
     }
 
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuDialogHelper.java b/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuDialogHelper.java
index 4853815..4d4093b 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuDialogHelper.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuDialogHelper.java
@@ -24,6 +24,7 @@
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.R;
 import androidx.appcompat.app.AlertDialog;
 
@@ -147,7 +148,7 @@
     }
 
     @Override
-    public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
+    public void onCloseMenu(@NonNull MenuBuilder menu, boolean allMenusAreClosing) {
         if (allMenusAreClosing || menu == mMenu) {
             dismiss();
         }
@@ -157,7 +158,7 @@
     }
 
     @Override
-    public boolean onOpenSubMenu(MenuBuilder subMenu) {
+    public boolean onOpenSubMenu(@NonNull MenuBuilder subMenu) {
         if (mPresenterCallback != null) {
             return mPresenterCallback.onOpenSubMenu(subMenu);
         }
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuPresenter.java b/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuPresenter.java
index 8ba9936..f975589 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuPresenter.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuPresenter.java
@@ -22,6 +22,7 @@
 import android.os.Parcelable;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 
 /**
@@ -42,7 +43,7 @@
          * @param menu
          * @param allMenusAreClosing
          */
-        void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing);
+        void onCloseMenu(@NonNull MenuBuilder menu, boolean allMenusAreClosing);
 
         /**
          * Called when a submenu opens. Useful for notifying the application
@@ -53,7 +54,7 @@
          * @return true if the Callback will handle presenting the submenu, false if
          *         the presenter should attempt to do so.
          */
-        boolean onOpenSubMenu(MenuBuilder subMenu);
+        boolean onOpenSubMenu(@NonNull MenuBuilder subMenu);
     }
 
     /**
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/SubMenuBuilder.java b/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/SubMenuBuilder.java
index a456183..9f13495 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/SubMenuBuilder.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/SubMenuBuilder.java
@@ -25,6 +25,7 @@
 import android.view.SubMenu;
 import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 
 /**
@@ -85,7 +86,7 @@
     }
 
     @Override
-    boolean dispatchMenuItemSelected(MenuBuilder menu, MenuItem item) {
+    boolean dispatchMenuItemSelected(@NonNull MenuBuilder menu, @NonNull MenuItem item) {
         return super.dispatchMenuItemSelected(menu, item) ||
                 mParentMenu.dispatchMenuItemSelected(menu, item);
     }
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuPresenter.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuPresenter.java
index 56ae74d..11f4532 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuPresenter.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuPresenter.java
@@ -340,10 +340,6 @@
             // Post this for later; we might still need a layout for the anchor to be right.
             ((View) mMenuView).post(mPostedOpenRunnable);
 
-            // ActionMenuPresenter uses null as a callback argument here
-            // to indicate overflow is opening.
-            super.onSubMenuSelected(null);
-
             return true;
         }
         return false;
@@ -760,8 +756,8 @@
         }
 
         @Override
-        public boolean onOpenSubMenu(MenuBuilder subMenu) {
-            if (subMenu == null) return false;
+        public boolean onOpenSubMenu(@NonNull MenuBuilder subMenu) {
+            if (subMenu == mMenu) return false;
 
             mOpenSubMenuId = ((SubMenuBuilder) subMenu).getItem().getItemId();
             final Callback cb = getCallback();
@@ -769,7 +765,7 @@
         }
 
         @Override
-        public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
+        public void onCloseMenu(@NonNull MenuBuilder menu, boolean allMenusAreClosing) {
             if (menu instanceof SubMenuBuilder) {
                 menu.getRootMenu().close(false /* closeAllMenus */);
             }
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuView.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuView.java
index 71b7a39..e8d2071 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuView.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuView.java
@@ -774,13 +774,13 @@
         }
 
         @Override
-        public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
+        public boolean onMenuItemSelected(@NonNull MenuBuilder menu, @NonNull MenuItem item) {
             return mOnMenuItemClickListener != null &&
                     mOnMenuItemClickListener.onMenuItemClick(item);
         }
 
         @Override
-        public void onMenuModeChange(MenuBuilder menu) {
+        public void onMenuModeChange(@NonNull MenuBuilder menu) {
             if (mMenuBuilderCallback != null) {
                 mMenuBuilderCallback.onMenuModeChange(menu);
             }
@@ -792,11 +792,11 @@
         }
 
         @Override
-        public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
+        public void onCloseMenu(@NonNull MenuBuilder menu, boolean allMenusAreClosing) {
         }
 
         @Override
-        public boolean onOpenSubMenu(MenuBuilder subMenu) {
+        public boolean onOpenSubMenu(@NonNull MenuBuilder subMenu) {
             return false;
         }
     }
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/PopupMenu.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/PopupMenu.java
index bd207d0..9edac30 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/PopupMenu.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/PopupMenu.java
@@ -108,7 +108,7 @@
         mMenu = new MenuBuilder(context);
         mMenu.setCallback(new MenuBuilder.Callback() {
             @Override
-            public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
+            public boolean onMenuItemSelected(@NonNull MenuBuilder menu, @NonNull MenuItem item) {
                 if (mMenuItemClickListener != null) {
                     return mMenuItemClickListener.onMenuItemClick(item);
                 }
@@ -116,7 +116,7 @@
             }
 
             @Override
-            public void onMenuModeChange(MenuBuilder menu) {
+            public void onMenuModeChange(@NonNull MenuBuilder menu) {
             }
         });
 
diff --git a/appcompat/appcompat/src/main/res/values-af/strings.xml b/appcompat/appcompat/src/main/res/values-af/strings.xml
index 2f5b123..ebe06c7 100644
--- a/appcompat/appcompat/src/main/res/values-af/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-af/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Klaar"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Gaan na tuisskerm"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Gaan op"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Nog opsies"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Vou in"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Soek"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Soek …"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Soektognavraag"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Vee navraag uit"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Dien navraag in"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Stemsoektog"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Kies \'n program"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Sien alles"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Deel met <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Deel met"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"AAN"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"AF"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Soek"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Kieslys+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Simbool+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funksie+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"spasiebalk"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Klaar"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Gaan na tuisskerm"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Gaan op"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Nog opsies"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Vou in"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Soek"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Soek …"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Soektognavraag"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Vee navraag uit"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Dien navraag in"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Stemsoektog"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Kies \'n program"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Sien alles"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Deel met <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Deel met"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"AAN"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"AF"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Soek"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Kieslys+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Simbool+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funksie+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"spasiebalk"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-am/strings.xml b/appcompat/appcompat/src/main/res/values-am/strings.xml
index 538fe35..53d606a 100644
--- a/appcompat/appcompat/src/main/res/values-am/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-am/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"ተከናውኗል"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"መነሻ ዳስስ"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"ወደ ላይ ያስሱ"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"ተጨማሪ አማራጮች"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"ሰብስብ"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"ፍለጋ"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"ይፈልጉ…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"የፍለጋ መጠይቅ"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"መጠይቅ አጽዳ"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"መጠይቅ አስገባ"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"የድምጽ ፍለጋ"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"አንድ መተግበሪያ ይምረጡ"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"ሁሉንም ይመልከቱ"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"ለ<xliff:g id="APPLICATION_NAME">%s</xliff:g> አጋራ"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"አጋራ በ"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"አብራ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"አጥፋ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"ፍለጋ"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"ክፍተት"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"ሰርዝ"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"ተከናውኗል"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"መነሻ ዳስስ"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"ወደ ላይ ያስሱ"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"ተጨማሪ አማራጮች"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"ሰብስብ"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"ፍለጋ"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"ይፈልጉ…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"የፍለጋ መጠይቅ"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"መጠይቅ አጽዳ"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"መጠይቅ አስገባ"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"የድምጽ ፍለጋ"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"አንድ መተግበሪያ ይምረጡ"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"ሁሉንም ይመልከቱ"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"ለ<xliff:g id="APPLICATION_NAME">%s</xliff:g> አጋራ"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"አጋራ በ"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"አብራ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"አጥፋ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"ፍለጋ"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"ክፍተት"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"ሰርዝ"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ar/strings.xml b/appcompat/appcompat/src/main/res/values-ar/strings.xml
index 6bab55f..3613bd9 100644
--- a/appcompat/appcompat/src/main/res/values-ar/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ar/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"تم"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"التوجه إلى المنزل"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"التنقل إلى أعلى"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"خيارات أكثر"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"تصغير"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"البحث"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"بحث…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"طلب بحث"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"محو طلب البحث"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"إرسال طلب البحث"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"بحث صوتي"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"اختيار تطبيق"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"عرض الكل"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"مشاركة مع <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"مشاركة مع"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"تفعيل"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"إيقاف"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"البحث"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"القائمة+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"فضاء"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"حذف"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"تم"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"التوجه إلى المنزل"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"التنقل إلى أعلى"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"خيارات أكثر"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"تصغير"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"البحث"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"بحث…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"طلب بحث"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"محو طلب البحث"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"إرسال طلب البحث"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"بحث صوتي"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"اختيار تطبيق"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"عرض الكل"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"مشاركة مع <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"مشاركة مع"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"تفعيل"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"إيقاف"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"البحث"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"القائمة+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"فضاء"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"حذف"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-as/strings.xml b/appcompat/appcompat/src/main/res/values-as/strings.xml
index 700c8fb..1a3b4a1 100644
--- a/appcompat/appcompat/src/main/res/values-as/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-as/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"সম্পন্ন হ’ল"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"গৃহ পৃষ্ঠালৈ যাওক"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"ওপৰলৈ যাওক"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"অধিক বিকল্প"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"সংকোচন কৰক"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"সন্ধান"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"সন্ধান কৰক…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"সন্ধান কৰা প্ৰশ্ন"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"সন্ধান কৰা প্ৰশ্ন মচক"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"প্ৰশ্ন দাখিল কৰক"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"কণ্ঠধ্বনিৰ দ্বাৰা সন্ধান"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"কোনো এপ্ বাছনি কৰক"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"সকলো চাওক"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>ৰ জৰিয়তে শ্বেয়াৰ কৰক"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"ইয়াৰ জৰিয়তে শ্বেয়াৰ কৰক"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"অন"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"অফ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"সন্ধান"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"সম্পন্ন হ’ল"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"গৃহ পৃষ্ঠালৈ যাওক"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"ওপৰলৈ যাওক"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"অধিক বিকল্প"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"সংকোচন কৰক"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"সন্ধান"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"সন্ধান কৰক…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"সন্ধান কৰা প্ৰশ্ন"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"সন্ধান কৰা প্ৰশ্ন মচক"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"প্ৰশ্ন দাখিল কৰক"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"কণ্ঠধ্বনিৰ দ্বাৰা সন্ধান"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"কোনো এপ্ বাছনি কৰক"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"সকলো চাওক"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>ৰ জৰিয়তে শ্বেয়াৰ কৰক"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"ইয়াৰ জৰিয়তে শ্বেয়াৰ কৰক"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"অন"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"অফ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"সন্ধান"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-az/strings.xml b/appcompat/appcompat/src/main/res/values-az/strings.xml
index 7e8bc1a..7651e37 100644
--- a/appcompat/appcompat/src/main/res/values-az/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-az/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Hazırdır"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Əsas səhifəyə keçin"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Yuxarı keçin"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Digər seçimlər"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Yığcamlaşdırın"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Axtarın"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Axtarış..."</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Axtarış sorğusu"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Sorğunu silin"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Sorğunu göndərin"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Səsli axtarış"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Tətbiq seçin"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Hamısına baxın"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ilə paylaşın"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Paylaşın"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"AKTİV"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DEAKTİV"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Axtarın"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menyu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funksiya+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"daxil olun"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"silin"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Hazırdır"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Əsas səhifəyə keçin"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Yuxarı keçin"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Digər seçimlər"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Yığcamlaşdırın"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Axtarın"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Axtarış..."</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Axtarış sorğusu"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Sorğunu silin"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Sorğunu göndərin"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Səsli axtarış"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Tətbiq seçin"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Hamısına baxın"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ilə paylaşın"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Paylaşın"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"AKTİV"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DEAKTİV"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Axtarın"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menyu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funksiya+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"daxil olun"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"silin"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-b+sr+Latn/strings.xml b/appcompat/appcompat/src/main/res/values-b+sr+Latn/strings.xml
index 7a5b75d..21337c6 100644
--- a/appcompat/appcompat/src/main/res/values-b+sr+Latn/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-b+sr+Latn/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Gotovo"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Idite na početnu"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Idite nagore"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Još opcija"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Skupi"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Pretražite"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Pretražite…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Pretražite upit"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Obrišite upit"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Pošaljite upit"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Glasovna pretraga"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Izaberite aplikaciju"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Prikaži sve"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Delite pomoću aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Delite pomoću"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"UKLJUČENO"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ISKLJUČENO"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Pretražite"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"taster za razmak"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Gotovo"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Idite na početnu"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Idite nagore"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Još opcija"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Skupi"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Pretražite"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Pretražite…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Pretražite upit"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Obrišite upit"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Pošaljite upit"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Glasovna pretraga"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Izaberite aplikaciju"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Prikaži sve"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Delite pomoću aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Delite pomoću"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"UKLJUČENO"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ISKLJUČENO"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Pretražite"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"taster za razmak"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-be/strings.xml b/appcompat/appcompat/src/main/res/values-be/strings.xml
index 2ac4d23..a4c13de 100644
--- a/appcompat/appcompat/src/main/res/values-be/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-be/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Гатова"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Перайсці на галоўную старонку"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Перайсці ўверх"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Дадатковыя параметры"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Згарнуць"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Пошук"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Пошук…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Пошукавы запыт"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Выдаліць запыт"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Адправіць запыт"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Галасавы пошук"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Выберыце праграму"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Паказаць усе"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Абагуліць праз праграму \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Абагуліць праз"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"УКЛ."</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ВЫКЛ."</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Пошук"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Меню +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fn +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"Прабел"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Гатова"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Перайсці на галоўную старонку"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Перайсці ўверх"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Дадатковыя параметры"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Згарнуць"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Пошук"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Пошук…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Пошукавы запыт"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Выдаліць запыт"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Адправіць запыт"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Галасавы пошук"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Выберыце праграму"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Паказаць усе"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Абагуліць праз праграму \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\""</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Абагуліць праз"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"УКЛ."</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ВЫКЛ."</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Пошук"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Меню +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fn +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"Прабел"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-bg/strings.xml b/appcompat/appcompat/src/main/res/values-bg/strings.xml
index 0799e8b..6cc8f40 100644
--- a/appcompat/appcompat/src/main/res/values-bg/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-bg/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Готово"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Навигиране към началния екран"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Навигиране нагоре"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Още опции"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Свиване"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Търсене"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Търсете…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Заявка за търсене"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Изчистване на заявката"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Изпращане на заявката"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Гласово търсене"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Изберете приложение"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Преглед на всички"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Споделяне със: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Споделяне със:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ВКЛ."</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ИЗКЛ."</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Търсене"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"клавиша за интервал"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Готово"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Навигиране към началния екран"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Навигиране нагоре"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Още опции"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Свиване"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Търсене"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Търсете…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Заявка за търсене"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Изчистване на заявката"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Изпращане на заявката"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Гласово търсене"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Изберете приложение"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Преглед на всички"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Споделяне със: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Споделяне със:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ВКЛ."</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ИЗКЛ."</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Търсене"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"клавиша за интервал"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-bn/strings.xml b/appcompat/appcompat/src/main/res/values-bn/strings.xml
index 684a956..2e45752 100644
--- a/appcompat/appcompat/src/main/res/values-bn/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-bn/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"হয়ে গেছে"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"হোমে নেভিগেট করুন"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"উপরে নেভিগেট করুন"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"আরও বিকল্প"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"সঙ্কুচিত করুন"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"সার্চ করুন"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"সার্চ করুন…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"সার্চ কোয়েরি"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"কোয়েরি মুছে ফেলুন"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"কোয়েরি জমা দিন"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"ভয়েস সার্চ করুন"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"একটি অ্যাপ বেছে নিন"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"সবগুলি দেখুন"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>-এর সাথে শেয়ার করুন"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"শেয়ার করুন"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"চালু করুন"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"বন্ধ আছে"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"সার্চ করুন"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"মুছুন"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"হয়ে গেছে"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"হোমে নেভিগেট করুন"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"উপরে নেভিগেট করুন"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"আরও বিকল্প"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"সঙ্কুচিত করুন"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"সার্চ করুন"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"সার্চ করুন…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"সার্চ কোয়েরি"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"কোয়েরি মুছে ফেলুন"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"কোয়েরি জমা দিন"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"ভয়েস সার্চ করুন"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"একটি অ্যাপ বেছে নিন"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"সবগুলি দেখুন"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>-এর সাথে শেয়ার করুন"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"শেয়ার করুন"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"চালু করুন"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"বন্ধ আছে"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"সার্চ করুন"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"মুছুন"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-bs/strings.xml b/appcompat/appcompat/src/main/res/values-bs/strings.xml
index 4198b75..a960ca8 100644
--- a/appcompat/appcompat/src/main/res/values-bs/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-bs/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Gotovo"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Vratite se na početnu stranicu"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Idi gore"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Više opcija"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Suzi"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Pretraži"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Pretražite..."</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Pretraži upit"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Obriši upit"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Pošalji upit"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Glasovno pretraživanje"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Odaberite aplikaciju"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Prikaži sve"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Dijeli putem aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Dijeli sa"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"UKLJUČENO"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ISKLJUČENO"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Pretražite"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"razmak"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Gotovo"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Vratite se na početnu stranicu"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Idi gore"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Više opcija"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Suzi"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Pretraži"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Pretražite..."</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Pretraži upit"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Obriši upit"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Pošalji upit"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Glasovno pretraživanje"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Odaberite aplikaciju"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Prikaži sve"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Dijeli putem aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Dijeli sa"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"UKLJUČENO"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ISKLJUČENO"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Pretražite"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"razmak"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ca/strings.xml b/appcompat/appcompat/src/main/res/values-ca/strings.xml
index b558afa2..ff09a4b6 100644
--- a/appcompat/appcompat/src/main/res/values-ca/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ca/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Fet"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navega a la pàgina d\'inici"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navega cap amunt"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Més opcions"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Replega"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Cerca"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Cerca…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Consulta de cerca"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Esborra la consulta"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Envia la consulta"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Cerca per veu"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Selecciona una aplicació"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Mostra-ho tot"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Comparteix amb <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Comparteix amb"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ACTIVA"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DESACTIVA"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Cerca"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menú+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Maj+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funció+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"Espai"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Retorn"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Supr"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Fet"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navega fins a la pàgina d\'inici"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navega cap amunt"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Més opcions"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Replega"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Cerca"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Cerca…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Consulta de cerca"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Esborra la consulta"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Envia la consulta"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Cerca per veu"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Selecciona una aplicació"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Mostra-ho tot"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Comparteix amb <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Comparteix amb"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ACTIVA"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DESACTIVA"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Cerca"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menú+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Maj+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funció+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"Espai"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Retorn"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Supr"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-cs/strings.xml b/appcompat/appcompat/src/main/res/values-cs/strings.xml
index 9342fc8..d38f873 100644
--- a/appcompat/appcompat/src/main/res/values-cs/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-cs/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Hotovo"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Přejít na plochu"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Přejít nahoru"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Více možností"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Sbalit"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Hledat"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Vyhledat…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Dotaz pro vyhledávání"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Smazat dotaz"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Odeslat dotaz"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Hlasové vyhledávání"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Vybrat aplikaci"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Zobrazit vše"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Sdílet s aplikací <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Sdílet s"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ZAP"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"VYP"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Hledat"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fn+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"mezerník"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Hotovo"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Přejít na plochu"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Přejít nahoru"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Více možností"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Sbalit"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Hledat"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Vyhledat…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Dotaz pro vyhledávání"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Smazat dotaz"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Odeslat dotaz"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Hlasové vyhledávání"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Vybrat aplikaci"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Zobrazit vše"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Sdílet s aplikací <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Sdílet s"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ZAP"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"VYP"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Hledat"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fn+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"mezerník"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-da/strings.xml b/appcompat/appcompat/src/main/res/values-da/strings.xml
index 392e5a7..82298e3 100644
--- a/appcompat/appcompat/src/main/res/values-da/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-da/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Udfør"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Find hjem"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Gå op"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Flere valgmuligheder"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Skjul"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Søg"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Søg…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Søgeforespørgsel"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Ryd forespørgsel"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Indsend forespørgsel"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Talesøgning"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Vælg en app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Se alle"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Del med <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Del med"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"TIL"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"FRA"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Søg"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fn+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"mellemrum"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"slet"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Udfør"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Find hjem"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Gå op"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Flere valgmuligheder"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Skjul"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Søg"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Søg…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Søgeforespørgsel"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Ryd forespørgsel"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Indsend forespørgsel"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Talesøgning"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Vælg en app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Se alle"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Del med <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Del med"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"TIL"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"FRA"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Søg"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fn+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"mellemrum"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"slet"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-de/strings.xml b/appcompat/appcompat/src/main/res/values-de/strings.xml
index c06df8e..a2fcce6 100644
--- a/appcompat/appcompat/src/main/res/values-de/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-de/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Fertig"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Zur Startseite"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Nach oben"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Weitere Optionen"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Minimieren"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Suche"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Suchen…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Suchanfrage"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Suchanfrage löschen"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Anfrage senden"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Sprachsuche"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"App auswählen"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Alle anzeigen"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Mit <xliff:g id="APPLICATION_NAME">%s</xliff:g> teilen"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Teilen mit"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"AN"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"AUS"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Suche"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menütaste +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta-Taste +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Strg +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Umschalttaste +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym-Taste +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funktionstaste +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"Leertaste"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Eingabetaste"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Löschen"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Fertig"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Zur Startseite"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Nach oben"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Weitere Optionen"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Minimieren"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Suche"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Suchen…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Suchanfrage"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Suchanfrage löschen"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Anfrage senden"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Sprachsuche"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"App auswählen"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Alle anzeigen"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Mit <xliff:g id="APPLICATION_NAME">%s</xliff:g> teilen"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Teilen mit"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"AN"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"AUS"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Suche"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menütaste +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta-Taste +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Strg +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Umschalttaste +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym-Taste +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funktionstaste +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"Leertaste"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Eingabetaste"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Löschen"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-el/strings.xml b/appcompat/appcompat/src/main/res/values-el/strings.xml
index ca7edd1..6d848f1 100644
--- a/appcompat/appcompat/src/main/res/values-el/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-el/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Τέλος"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Πλοήγηση στην αρχική σελίδα"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Πλοήγηση προς τα επάνω"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Περισσότερες επιλογές"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Σύμπτυξη"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Αναζήτηση"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Αναζήτηση…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Ερώτημα αναζήτησης"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Διαγραφή ερωτήματος"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Υποβολή ερωτήματος"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Φωνητική αναζήτηση"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Επιλέξτε μια εφαρμογή"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Εμφάνιση όλων"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Κοινοποίηση στην εφαρμογή <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Κοινοποίηση σε"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Αναζήτηση"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"διάστημα"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Τέλος"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Πλοήγηση στην αρχική σελίδα"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Πλοήγηση προς τα επάνω"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Περισσότερες επιλογές"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Σύμπτυξη"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Αναζήτηση"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Αναζήτηση…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Ερώτημα αναζήτησης"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Διαγραφή ερωτήματος"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Υποβολή ερωτήματος"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Φωνητική αναζήτηση"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Επιλέξτε μια εφαρμογή"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Εμφάνιση όλων"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Κοινοποίηση στην εφαρμογή <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Κοινοποίηση σε"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Αναζήτηση"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"διάστημα"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-en-rAU/strings.xml b/appcompat/appcompat/src/main/res/values-en-rAU/strings.xml
index 15bc1c7..33eb98d 100644
--- a/appcompat/appcompat/src/main/res/values-en-rAU/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-en-rAU/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Done"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navigate home"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navigate up"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"More options"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Collapse"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Search"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Search…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Search query"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Clear query"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Submit query"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Voice search"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Choose an app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"See all"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Share with"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ON"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"OFF"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Search"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Done"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navigate home"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navigate up"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"More options"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Collapse"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Search"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Search…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Search query"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Clear query"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Submit query"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Voice search"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Choose an app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"See all"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Share with"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ON"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"OFF"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Search"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-en-rCA/strings.xml b/appcompat/appcompat/src/main/res/values-en-rCA/strings.xml
index 15bc1c7..33eb98d 100644
--- a/appcompat/appcompat/src/main/res/values-en-rCA/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-en-rCA/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Done"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navigate home"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navigate up"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"More options"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Collapse"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Search"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Search…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Search query"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Clear query"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Submit query"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Voice search"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Choose an app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"See all"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Share with"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ON"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"OFF"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Search"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Done"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navigate home"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navigate up"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"More options"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Collapse"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Search"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Search…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Search query"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Clear query"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Submit query"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Voice search"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Choose an app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"See all"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Share with"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ON"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"OFF"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Search"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-en-rGB/strings.xml b/appcompat/appcompat/src/main/res/values-en-rGB/strings.xml
index 15bc1c7..33eb98d 100644
--- a/appcompat/appcompat/src/main/res/values-en-rGB/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-en-rGB/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Done"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navigate home"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navigate up"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"More options"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Collapse"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Search"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Search…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Search query"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Clear query"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Submit query"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Voice search"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Choose an app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"See all"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Share with"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ON"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"OFF"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Search"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Done"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navigate home"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navigate up"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"More options"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Collapse"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Search"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Search…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Search query"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Clear query"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Submit query"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Voice search"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Choose an app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"See all"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Share with"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ON"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"OFF"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Search"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-en-rIN/strings.xml b/appcompat/appcompat/src/main/res/values-en-rIN/strings.xml
index 15bc1c7..33eb98d 100644
--- a/appcompat/appcompat/src/main/res/values-en-rIN/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-en-rIN/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Done"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navigate home"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navigate up"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"More options"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Collapse"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Search"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Search…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Search query"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Clear query"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Submit query"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Voice search"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Choose an app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"See all"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Share with"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ON"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"OFF"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Search"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Done"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navigate home"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navigate up"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"More options"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Collapse"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Search"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Search…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Search query"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Clear query"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Submit query"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Voice search"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Choose an app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"See all"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Share with"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ON"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"OFF"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Search"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-en-rXC/strings.xml b/appcompat/appcompat/src/main/res/values-en-rXC/strings.xml
index 17646af..0d989c4 100644
--- a/appcompat/appcompat/src/main/res/values-en-rXC/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-en-rXC/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎Done‎‏‎‎‏‎"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎Navigate home‎‏‎‎‏‎"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎Navigate up‎‏‎‎‏‎"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎More options‎‏‎‎‏‎"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎Collapse‎‏‎‎‏‎"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎Search‎‏‎‎‏‎"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎Search…‎‏‎‎‏‎"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎Search query‎‏‎‎‏‎"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎Clear query‎‏‎‎‏‎"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎Submit query‎‏‎‎‏‎"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎Voice search‎‏‎‎‏‎"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎Choose an app‎‏‎‎‏‎"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎See all‎‏‎‎‏‎"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎Share with ‎‏‎‎‏‏‎<xliff:g id="APPLICATION_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎Share with‎‏‎‎‏‎"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎ON‎‏‎‎‏‎"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎OFF‎‏‎‎‏‎"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎Search‎‏‎‎‏‎"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎Menu+‎‏‎‎‏‎"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎Meta+‎‏‎‎‏‎"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‏‏‎Ctrl+‎‏‎‎‏‎"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎Alt+‎‏‎‎‏‎"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎Shift+‎‏‎‎‏‎"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‎Sym+‎‏‎‎‏‎"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎Function+‎‏‎‎‏‎"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎space‎‏‎‎‏‎"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎enter‎‏‎‎‏‎"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎delete‎‏‎‎‏‎"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎Done‎‏‎‎‏‎"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎Navigate home‎‏‎‎‏‎"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‎Navigate up‎‏‎‎‏‎"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎More options‎‏‎‎‏‎"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎Collapse‎‏‎‎‏‎"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎Search‎‏‎‎‏‎"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎Search…‎‏‎‎‏‎"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎Search query‎‏‎‎‏‎"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‏‎Clear query‎‏‎‎‏‎"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎Submit query‎‏‎‎‏‎"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎Voice search‎‏‎‎‏‎"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎Choose an app‎‏‎‎‏‎"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎See all‎‏‎‎‏‎"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎Share with ‎‏‎‎‏‏‎<xliff:g id="APPLICATION_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎Share with‎‏‎‎‏‎"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎ON‎‏‎‎‏‎"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎OFF‎‏‎‎‏‎"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎Search‎‏‎‎‏‎"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‎Menu+‎‏‎‎‏‎"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎Meta+‎‏‎‎‏‎"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎Ctrl+‎‏‎‎‏‎"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‎‎Alt+‎‏‎‎‏‎"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎Shift+‎‏‎‎‏‎"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎Sym+‎‏‎‎‏‎"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎Function+‎‏‎‎‏‎"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‎‎space‎‏‎‎‏‎"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‎enter‎‏‎‎‏‎"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎delete‎‏‎‎‏‎"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-es-rUS/strings.xml b/appcompat/appcompat/src/main/res/values-es-rUS/strings.xml
index 2f2e257..da382ac 100644
--- a/appcompat/appcompat/src/main/res/values-es-rUS/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-es-rUS/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Listo"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navegar a la página principal"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navegar hacia arriba"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Más opciones"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Contraer"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Buscar"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Buscar…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Búsqueda"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Borrar consulta"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Enviar consulta"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Búsqueda por voz"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Elegir una app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Ver todas"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Compartir con <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Compartir con"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ACTIVAR"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DESACTIVAR"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Buscar"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menú+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Mayúscula+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Función+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"espacio"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"intro"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"borrar"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Listo"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navegar a la página principal"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navegar hacia arriba"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Más opciones"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Contraer"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Buscar"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Buscar…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Búsqueda"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Borrar consulta"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Enviar consulta"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Búsqueda por voz"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Elegir una app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Ver todas"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Compartir con <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Compartir con"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ACTIVAR"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DESACTIVAR"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Buscar"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menú+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Mayúscula+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Función+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"espacio"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"intro"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"borrar"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-es/strings.xml b/appcompat/appcompat/src/main/res/values-es/strings.xml
index c100f70..663ddd6 100644
--- a/appcompat/appcompat/src/main/res/values-es/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-es/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Listo"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Ir a inicio"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Desplazarse hacia arriba"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Más opciones"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Ocultar"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Buscar"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Buscar…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Consulta de búsqueda"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Borrar consulta"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Enviar consulta"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Búsqueda por voz"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Seleccionar una aplicación"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Ver todo"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Compartir con <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Compartir con"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ACTIVADO"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DESACTIVADO"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Buscar"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menú +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Mayús +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Función +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"Espacio"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Intro"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Suprimir"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Listo"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Ir a inicio"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Desplazarse hacia arriba"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Más opciones"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Ocultar"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Buscar"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Buscar…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Consulta de búsqueda"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Borrar consulta"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Enviar consulta"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Búsqueda por voz"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Seleccionar una aplicación"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Ver todo"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Compartir con <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Compartir con"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ACTIVADO"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DESACTIVADO"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Buscar"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menú +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Mayús +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Función +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"Espacio"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Intro"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Suprimir"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-et/strings.xml b/appcompat/appcompat/src/main/res/values-et/strings.xml
index d454f8f..aeee475 100644
--- a/appcompat/appcompat/src/main/res/values-et/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-et/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Valmis"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Liigu avalehele"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Liigu üles"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Rohkem valikuid"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Ahendamine"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Otsing"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Otsige …"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Otsingupäring"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Päringu tühistamine"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Päringu esitamine"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Häälotsing"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Valige rakendus"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Kuva kõik"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Jagamine rakendusega <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Jaga:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"SEES"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"VÄLJAS"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Otsing"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menüü +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Tõstuklahv +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funktsiooniklahv +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"tühik"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"sisestusklahv"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"kustuta"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Valmis"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Liigu avalehele"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Liigu üles"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Rohkem valikuid"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Ahendamine"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Otsing"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Otsige …"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Otsingupäring"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Päringu tühistamine"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Päringu esitamine"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Häälotsing"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Valige rakendus"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Kuva kõik"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Jagamine rakendusega <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Jaga:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"SEES"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"VÄLJAS"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Otsing"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menüü +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Tõstuklahv +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funktsiooniklahv +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"tühik"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"sisestusklahv"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"kustuta"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-eu/strings.xml b/appcompat/appcompat/src/main/res/values-eu/strings.xml
index 17e3845..dd840eb 100644
--- a/appcompat/appcompat/src/main/res/values-eu/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-eu/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Eginda"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Joan orri nagusira"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Joan gora"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Aukera gehiago"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Tolestu"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Bilatu"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Bilatu…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Bilaketa-kontsulta"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Garbitu kontsulta"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Bidali kontsulta"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Ahozko bilaketa"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Aukeratu aplikazio bat"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Ikusi guztiak"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Partekatu <xliff:g id="APPLICATION_NAME">%s</xliff:g> aplikazioarekin"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Partekatu honekin"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"AKTIBATU"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DESAKTIBATU"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Bilatu"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menua +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ktrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Maius +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funtzioa +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"zuriunea"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"sartu"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"ezabatu"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Eginda"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Joan orri nagusira"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Joan gora"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Aukera gehiago"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Tolestu"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Bilatu"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Bilatu…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Bilaketa-kontsulta"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Garbitu kontsulta"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Bidali kontsulta"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Ahozko bilaketa"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Aukeratu aplikazio bat"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Ikusi guztiak"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Partekatu <xliff:g id="APPLICATION_NAME">%s</xliff:g> aplikazioarekin"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Partekatu honekin"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"AKTIBATU"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DESAKTIBATU"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Bilatu"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menua +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ktrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Maius +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funtzioa +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"zuriunea"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"sartu"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"ezabatu"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-fa/strings.xml b/appcompat/appcompat/src/main/res/values-fa/strings.xml
index 51eb691..dc62c07 100644
--- a/appcompat/appcompat/src/main/res/values-fa/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-fa/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"تمام"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"پیمایش به صفحه اصلی"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"رفتن به بالا"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"گزینه‌های بیشتر"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"کوچک کردن"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"جستجو"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"جستجو…‏"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"درخواست جستجو"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"پاک کردن پُرسمان"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"ارسال پُرسمان"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"جستجوی گفتاری"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"انتخاب برنامه"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"دیدن همه"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"هم‌رسانی با <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"هم‌رسانی با"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"روشن"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"خاموش"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"جستجو"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"منو+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"‎Meta+‎"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"‎Ctrl+‎"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"‎Alt+‎"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"‎Shift+‎"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"‎Sym+‎"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"‎Function+‎"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"فاصله"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"حذف"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"تمام"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"پیمایش به صفحه اصلی"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"رفتن به بالا"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"گزینه‌های بیشتر"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"کوچک کردن"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"جستجو"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"جستجو…‏"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"درخواست جستجو"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"پاک کردن پُرسمان"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"ارسال پُرسمان"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"جستجوی گفتاری"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"انتخاب برنامه"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"دیدن همه"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"هم‌رسانی با <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"هم‌رسانی با"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"روشن"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"خاموش"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"جستجو"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"منو+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"‎Meta+‎"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"‎Ctrl+‎"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"‎Alt+‎"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"‎Shift+‎"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"‎Sym+‎"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"‎Function+‎"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"فاصله"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"حذف"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-fi/strings.xml b/appcompat/appcompat/src/main/res/values-fi/strings.xml
index 82e632a..d056452 100644
--- a/appcompat/appcompat/src/main/res/values-fi/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-fi/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Valmis"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Siirry etusivulle"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Siirry ylös"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Lisäasetukset"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Tiivistä"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Haku"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Haku…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Hakukysely"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Tyhjennä kysely"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Lähetä kysely"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Puhehaku"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Valitse sovellus"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Näytä kaikki"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Jaa: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Jaa…"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"PÄÄLLÄ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"POIS PÄÄLTÄ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Haku"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Valikko+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Vaihto+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fn+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"välilyönti"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Valmis"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Siirry etusivulle"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Siirry ylös"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Lisäasetukset"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Tiivistä"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Haku"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Haku…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Hakukysely"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Tyhjennä kysely"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Lähetä kysely"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Puhehaku"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Valitse sovellus"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Näytä kaikki"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Jaa: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Jaa…"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"PÄÄLLÄ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"POIS PÄÄLTÄ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Haku"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Valikko+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Vaihto+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fn+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"välilyönti"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-fr-rCA/strings.xml b/appcompat/appcompat/src/main/res/values-fr-rCA/strings.xml
index a4d4fca..f065c79 100644
--- a/appcompat/appcompat/src/main/res/values-fr-rCA/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-fr-rCA/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Terminé"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Revenir à l\'accueil"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Revenir en arrière"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Autres options"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Réduire"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Rechercher"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Rechercher…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Requête de recherche"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Effacer la requête"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Envoyer la requête"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Recherche vocale"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Sélectionner une application"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Tout afficher"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Partager avec <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Partager avec"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ACTIVER"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DÉSACTIVER"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Rechercher"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Méta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Maj+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fonction+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"espace"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"entrée"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"supprimer"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Terminé"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Revenir à l\'accueil"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Revenir en arrière"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Autres options"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Réduire"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Rechercher"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Rechercher…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Requête de recherche"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Effacer la requête"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Envoyer la requête"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Recherche vocale"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Sélectionner une application"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Tout afficher"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Partager avec <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Partager avec"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ACTIVER"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DÉSACTIVER"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Rechercher"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Méta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Maj+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fonction+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"espace"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"entrée"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"supprimer"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-fr/strings.xml b/appcompat/appcompat/src/main/res/values-fr/strings.xml
index 29c3b60..af79560 100644
--- a/appcompat/appcompat/src/main/res/values-fr/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-fr/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"OK"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Revenir à l\'accueil"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Revenir en haut de la page"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Autres options"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Réduire"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Rechercher"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Rechercher…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Requête de recherche"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Effacer la requête"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Envoyer la requête"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Recherche vocale"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Sélectionner une application"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Tout afficher"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Partager avec <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Partager avec"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"OUI"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"NON"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Rechercher"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Méta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Maj+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fonction+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"espace"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"entrée"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"supprimer"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"OK"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Revenir à l\'accueil"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Revenir en haut de la page"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Autres options"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Réduire"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Rechercher"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Rechercher…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Requête de recherche"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Effacer la requête"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Envoyer la requête"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Recherche vocale"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Sélectionner une application"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Tout afficher"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Partager avec <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Partager avec"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"OUI"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"NON"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Rechercher"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Méta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Maj+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fonction+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"espace"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"entrée"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"supprimer"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-gl/strings.xml b/appcompat/appcompat/src/main/res/values-gl/strings.xml
index 2903f68..ae38a7e 100644
--- a/appcompat/appcompat/src/main/res/values-gl/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-gl/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Feito"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Vai ao inicio"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Vai cara arriba"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Máis opcións"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Contrae"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Realiza buscas"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Busca…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Busca a consulta"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Borra a consulta"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Envía a consulta"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Busca por voz"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Selecciona unha aplicación"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Ver todo"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Comparte contido coa aplicación <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Comparte contido con"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ACTIVAR"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DESACTIVAR"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Buscar"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menú +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Maiús +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Función +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"espazo"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"intro"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"eliminar"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Feito"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Vai ao inicio"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Vai cara arriba"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Máis opcións"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Contrae"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Realiza buscas"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Busca…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Busca a consulta"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Borra a consulta"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Envía a consulta"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Busca por voz"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Selecciona unha aplicación"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Ver todo"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Comparte contido coa aplicación <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Comparte contido con"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ACTIVAR"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DESACTIVAR"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Buscar"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menú +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Maiús +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Función +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"espazo"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"intro"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"eliminar"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-gu/strings.xml b/appcompat/appcompat/src/main/res/values-gu/strings.xml
index 7a6fdb0..b6ac9fe 100644
--- a/appcompat/appcompat/src/main/res/values-gu/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-gu/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"થઈ ગયું"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"ઘરનો રસ્તો બતાવો"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"ઉપર નૅવિગેટ કરો"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"વધુ વિકલ્પો"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"સંકુચિત કરો"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"શોધો"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"શોધો…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"શોધ ક્વેરી"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"ક્વેરી સાફ કરો"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"ક્વેરી સબમિટ કરો"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"વૉઇસ શોધ"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"ઍપ્લિકેશન પસંદ કરો"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"બધી જુઓ"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>ની સાથે શેર કરો"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"આની સાથે શેર કરો"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ચાલુ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"બંધ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"શોધો"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"થઈ ગયું"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"ઘરનો રસ્તો બતાવો"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"ઉપર નૅવિગેટ કરો"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"વધુ વિકલ્પો"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"સંકુચિત કરો"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"શોધો"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"શોધો…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"શોધ ક્વેરી"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"ક્વેરી સાફ કરો"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"ક્વેરી સબમિટ કરો"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"વૉઇસ શોધ"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"ઍપ્લિકેશન પસંદ કરો"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"બધી જુઓ"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>ની સાથે શેર કરો"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"આની સાથે શેર કરો"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ચાલુ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"બંધ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"શોધો"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-hi/strings.xml b/appcompat/appcompat/src/main/res/values-hi/strings.xml
index 20a76ee..4fff3c4 100644
--- a/appcompat/appcompat/src/main/res/values-hi/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-hi/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"हो गया"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"होम पेज पर जाएं"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"वापस जाएं"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"ज़्यादा विकल्प"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"छोटा करें"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"खोजें"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"खोजें…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"सर्च क्वेरी"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"क्‍वेरी हटाएं"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"क्वेरी सबमिट करें"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"बोलकर खोजें"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"कोई ऐप्लिकेशन चुनें"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"सभी देखें"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> से शेयर करें"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"इससे शेयर करें:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"चालू"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"बंद"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"खोजें"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"हो गया"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"होम पेज पर जाएं"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"वापस जाएं"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"ज़्यादा विकल्प"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"छोटा करें"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"खोजें"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"खोजें…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"सर्च क्वेरी"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"क्‍वेरी हटाएं"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"क्वेरी सबमिट करें"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"बोलकर खोजें"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"कोई ऐप्लिकेशन चुनें"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"सभी देखें"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> से शेयर करें"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"इससे शेयर करें:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"चालू"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"बंद"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"खोजें"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-hr/strings.xml b/appcompat/appcompat/src/main/res/values-hr/strings.xml
index d5c3a92..1ed9ef0 100644
--- a/appcompat/appcompat/src/main/res/values-hr/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-hr/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Gotovo"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Idi na početnu"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Natrag"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Više opcija"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Sažmi"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Pretraži"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Pretražite…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Upit za pretraživanje"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Izbriši upit"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Pošalji upit"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Glasovno pretraživanje"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Odabir aplikacije"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Prikaži sve"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Dijeli putem aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Dijeli s"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"UKLJUČENO"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ISKLJUČENO"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Pretraži"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"svemir"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Gotovo"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Idi na početnu"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Natrag"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Više opcija"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Sažmi"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Pretraži"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Pretražite…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Upit za pretraživanje"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Izbriši upit"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Pošalji upit"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Glasovno pretraživanje"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Odabir aplikacije"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Prikaži sve"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Dijeli putem aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Dijeli s"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"UKLJUČENO"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ISKLJUČENO"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Pretraži"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"svemir"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-hu/strings.xml b/appcompat/appcompat/src/main/res/values-hu/strings.xml
index cd668fb..97edd37 100644
--- a/appcompat/appcompat/src/main/res/values-hu/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-hu/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Kész"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Ugrás a főoldalra"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Fel"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"További lehetőségek"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Összecsukás"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Keresés"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Keresés…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Keresési lekérdezés"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Lekérdezés törlése"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Lekérdezés küldése"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Hangalapú keresés"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Válasszon alkalmazást"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Az összes megtekintése"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Megosztás a következő alkalmazással: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Megosztás a következővel:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"BE"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"KI"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Keresés"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"Szóköz"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Kész"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Ugrás a főoldalra"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Fel"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"További lehetőségek"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Összecsukás"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Keresés"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Keresés…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Keresési lekérdezés"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Lekérdezés törlése"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Lekérdezés küldése"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Hangalapú keresés"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Válasszon alkalmazást"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Az összes megtekintése"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Megosztás a következő alkalmazással: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Megosztás a következővel:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"BE"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"KI"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Keresés"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"Szóköz"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-hy/strings.xml b/appcompat/appcompat/src/main/res/values-hy/strings.xml
index fd944f4..f918547 100644
--- a/appcompat/appcompat/src/main/res/values-hy/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-hy/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Պատրաստ է"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Անցնել գլխավոր էջ"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Անցնել վերև"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Այլ ընտրանքներ"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Ծալել"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Որոնել"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Որոնում…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Որոնման հարցում"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Ջնջել հարցումը"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Ուղարկել հարցումը"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Ձայնային որոնում"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Ընտրել հավելված"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Տեսնել բոլորը"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Կիսվել <xliff:g id="APPLICATION_NAME">%s</xliff:g> հավելվածի միջոցով"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Կիսվել…"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ՄԻԱՑՆԵԼ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ԱՆՋԱՏԵԼ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Որոնել"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"բացատ"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Պատրաստ է"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Անցնել գլխավոր էջ"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Անցնել վերև"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Այլ ընտրանքներ"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Ծալել"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Որոնել"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Որոնում…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Որոնման հարցում"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Ջնջել հարցումը"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Ուղարկել հարցումը"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Ձայնային որոնում"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Ընտրել հավելված"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Տեսնել բոլորը"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Կիսվել <xliff:g id="APPLICATION_NAME">%s</xliff:g> հավելվածի միջոցով"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Կիսվել…"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ՄԻԱՑՆԵԼ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ԱՆՋԱՏԵԼ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Որոնել"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"բացատ"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-in/strings.xml b/appcompat/appcompat/src/main/res/values-in/strings.xml
index bb80ccc..eade686 100644
--- a/appcompat/appcompat/src/main/res/values-in/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-in/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Selesai"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Tunjukkan jalan ke rumah"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Kembali ke atas"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Opsi lain"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Ciutkan"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Telusuri"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Telusuri..."</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Telusuri kueri"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Hapus kueri"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Kirim kueri"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Penelusuran suara"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Pilih aplikasi"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Lihat semua"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Bagikan dengan <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Bagikan dengan"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"AKTIF"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"NONAKTIF"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Telusuri"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"spasi"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Selesai"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Tunjukkan jalan ke rumah"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Kembali ke atas"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Opsi lain"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Ciutkan"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Telusuri"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Telusuri..."</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Telusuri kueri"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Hapus kueri"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Kirim kueri"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Penelusuran suara"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Pilih aplikasi"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Lihat semua"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Bagikan dengan <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Bagikan dengan"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"AKTIF"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"NONAKTIF"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Telusuri"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"spasi"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-is/strings.xml b/appcompat/appcompat/src/main/res/values-is/strings.xml
index b5a26bd..ba7e3cc 100644
--- a/appcompat/appcompat/src/main/res/values-is/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-is/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Lokið"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Fara heim"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Fara upp"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Fleiri valkostir"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Minnka"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Leit"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Leita…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Leitarfyrirspurn"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Hreinsa fyrirspurn"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Senda fyrirspurn"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Raddleit"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Veldu forrit"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Sjá allt"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Deila með <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Deila með"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"KVEIKT"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"SLÖKKT"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Leit"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Valmynd+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Aðgerðarlykill+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"bilslá"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"eyða"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Lokið"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Fara heim"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Fara upp"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Fleiri valkostir"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Minnka"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Leit"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Leita…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Leitarfyrirspurn"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Hreinsa fyrirspurn"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Senda fyrirspurn"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Raddleit"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Veldu forrit"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Sjá allt"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Deila með <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Deila með"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"KVEIKT"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"SLÖKKT"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Leit"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Valmynd+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Aðgerðarlykill+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"bilslá"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"eyða"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-it/strings.xml b/appcompat/appcompat/src/main/res/values-it/strings.xml
index 3d28b74..b31a0e2 100644
--- a/appcompat/appcompat/src/main/res/values-it/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-it/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Fine"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Portami a casa"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Torna indietro"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Altre opzioni"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Comprimi"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Cerca"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Cerca…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Query di ricerca"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Cancella query"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Invia query"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Ricerca vocale"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Scelta di un\'app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Mostra tutto"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Condividi tramite <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Condividi con"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ON"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"OFF"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Cerca"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"MENU +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"META +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"CTRL +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"ALT +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"MAIUSC +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"SYM +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"FUNZIONE +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"SPAZIO"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"INVIO"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"CANC"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Fine"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Portami a casa"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Torna indietro"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Altre opzioni"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Comprimi"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Cerca"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Cerca…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Query di ricerca"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Cancella query"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Invia query"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Ricerca vocale"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Scelta di un\'app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Mostra tutto"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Condividi tramite <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Condividi con"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ON"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"OFF"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Cerca"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"MENU +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"META +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"CTRL +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"ALT +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"MAIUSC +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"SYM +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"FUNZIONE +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"SPAZIO"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"INVIO"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"CANC"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-iw/strings.xml b/appcompat/appcompat/src/main/res/values-iw/strings.xml
index fe32c2a..e6f1201 100644
--- a/appcompat/appcompat/src/main/res/values-iw/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-iw/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"סיום"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"ניווט לדף הבית"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"ניווט למעלה"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"עוד אפשרויות"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"כיווץ"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"חיפוש"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"חיפוש…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"שאילתת חיפוש"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"מחיקת השאילתה"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"שליחת שאילתה"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"חיפוש קולי"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"בחירת אפליקציה"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"הצגת הכול"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"שיתוף עם <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"שיתוף עם"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"מופעל"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"כבוי"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"חיפוש"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"תפריט+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+‎"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"רווח"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"מחיקה"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"סיום"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"ניווט לדף הבית"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"ניווט למעלה"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"עוד אפשרויות"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"כיווץ"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"חיפוש"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"חיפוש…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"שאילתת חיפוש"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"מחיקת השאילתה"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"שליחת שאילתה"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"חיפוש קולי"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"בחירת אפליקציה"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"הצגת הכול"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"שיתוף עם <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"שיתוף עם"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"מופעל"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"כבוי"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"חיפוש"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"תפריט+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+‎"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"רווח"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"מחיקה"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ja/strings.xml b/appcompat/appcompat/src/main/res/values-ja/strings.xml
index 4946f8f..e92cac0 100644
--- a/appcompat/appcompat/src/main/res/values-ja/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ja/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"完了"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"ホームに戻る"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"前に戻る"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"その他のオプション"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"折りたたむ"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"検索"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"検索…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"検索キーワード"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"検索キーワードを削除"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"検索キーワードを送信"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"音声検索"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"アプリの選択"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"すべて表示"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>と共有"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"共有"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ON"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"OFF"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"検索"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"Space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"完了"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"ホームに戻る"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"前に戻る"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"その他のオプション"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"折りたたむ"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"検索"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"検索…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"検索キーワード"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"検索キーワードを削除"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"検索キーワードを送信"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"音声検索"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"アプリの選択"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"すべて表示"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>と共有"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"共有"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ON"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"OFF"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"検索"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"Space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ka/strings.xml b/appcompat/appcompat/src/main/res/values-ka/strings.xml
index 7db6070..11d069b 100644
--- a/appcompat/appcompat/src/main/res/values-ka/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ka/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"მზადაა"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"მთავარზე გადასვლა"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"ზემოთ გადასვლა"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"სხვა ვარიანტები"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"ჩაკეცვა"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"ძიება"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"ძიება…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"მოთხოვნის ძიება"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"მოთხოვნის გასუფთავება"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"მოთხოვნის გადაგზავნა"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"ხმოვანი ძიება"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"აირჩიეთ აპი"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"ყველას ნახვა"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>-ით გაზიარება"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"გაზიარება:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ჩართვა"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"გამორთვა"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"ძიება"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"შორისი"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"მზადაა"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"მთავარზე გადასვლა"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"ზემოთ გადასვლა"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"სხვა ვარიანტები"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"ჩაკეცვა"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"ძიება"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"ძიება…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"მოთხოვნის ძიება"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"მოთხოვნის გასუფთავება"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"მოთხოვნის გადაგზავნა"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"ხმოვანი ძიება"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"აირჩიეთ აპი"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"ყველას ნახვა"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>-ით გაზიარება"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"გაზიარება:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ჩართვა"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"გამორთვა"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"ძიება"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"შორისი"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-kk/strings.xml b/appcompat/appcompat/src/main/res/values-kk/strings.xml
index 994c1e4..8944fea 100644
--- a/appcompat/appcompat/src/main/res/values-kk/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-kk/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Дайын"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Негізгі бетке өту"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Жоғары қарай өту"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Басқа опциялар"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Жию"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Іздеу"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Іздеу…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Іздеу сұрауы"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Сұрауды өшіру"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Сұрауды жіберу"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Дауыспен іздеу"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Қолданбаны таңдау"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Барлығын көру"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> қолданбасымен бөлісу"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Бөлісу"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ҚОСУ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ӨШІРУ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Іздеу"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"бос орын"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Дайын"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Негізгі бетке өту"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Жоғары қарай өту"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Басқа опциялар"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Жию"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Іздеу"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Іздеу…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Іздеу сұрауы"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Сұрауды өшіру"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Сұрауды жіберу"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Дауыспен іздеу"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Қолданбаны таңдау"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Барлығын көру"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> қолданбасымен бөлісу"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Бөлісу"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ҚОСУ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ӨШІРУ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Іздеу"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"бос орын"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-km/strings.xml b/appcompat/appcompat/src/main/res/values-km/strings.xml
index a8f853e..fd257d0 100644
--- a/appcompat/appcompat/src/main/res/values-km/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-km/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"រួចរាល់"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"​ទៅទំព័រដើម"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"រំកិលឡើងលើ"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"ជម្រើសច្រើនទៀត"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"បង្រួម"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"ស្វែងរក"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"ស្វែងរក…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"ស្វែងរកសំណួរ​"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"សម្អាត​សំណួរ"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"ដាក់បញ្ជូន​សំណួរ"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"ស្វែងរក​តាម​សំឡេង"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"ជ្រើសរើស​កម្មវិធី​​"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"មើលទាំងអស់"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"ចែក​រំលែក​ជា​មួយ <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"ចែករំលែក​ជា​មួយ"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"បើក"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"បិទ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"ស្វែងរក"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"លុប"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"រួចរាល់"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"​ទៅទំព័រដើម"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"រំកិលឡើងលើ"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"ជម្រើសច្រើនទៀត"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"បង្រួម"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"ស្វែងរក"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"ស្វែងរក…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"ស្វែងរកសំណួរ​"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"សម្អាត​សំណួរ"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"ដាក់បញ្ជូន​សំណួរ"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"ស្វែងរក​តាម​សំឡេង"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"ជ្រើសរើស​កម្មវិធី​​"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"មើលទាំងអស់"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"ចែក​រំលែក​ជា​មួយ <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"ចែករំលែក​ជា​មួយ"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"បើក"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"បិទ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"ស្វែងរក"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"លុប"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-kn/strings.xml b/appcompat/appcompat/src/main/res/values-kn/strings.xml
index 25b1b8e..40454c7 100644
--- a/appcompat/appcompat/src/main/res/values-kn/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-kn/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"ಮುಗಿದಿದೆ"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"ಹೋಮ್‌ಗೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"ಕುಗ್ಗಿಸಿ"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"ಹುಡುಕಿ"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"ಹುಡುಕಿ…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸಿ"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"ಧ್ವನಿ ಹುಡುಕಾಟ"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"ಆ್ಯಪ್‌ವೊಂದನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"ಎಲ್ಲವನ್ನೂ ನೋಡಿ"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ಆನ್"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ಆಫ್"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"ಹುಡುಕಿ"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"ಮುಗಿದಿದೆ"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"ಹೋಮ್‌ಗೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"ಕುಗ್ಗಿಸಿ"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"ಹುಡುಕಿ"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"ಹುಡುಕಿ…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸಿ"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"ಧ್ವನಿ ಹುಡುಕಾಟ"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"ಆ್ಯಪ್‌ವೊಂದನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"ಎಲ್ಲವನ್ನೂ ನೋಡಿ"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ಆನ್"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ಆಫ್"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"ಹುಡುಕಿ"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ko/strings.xml b/appcompat/appcompat/src/main/res/values-ko/strings.xml
index 63a7525..199e87c 100644
--- a/appcompat/appcompat/src/main/res/values-ko/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ko/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"완료"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"홈으로 이동"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"위로 이동"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"추가 옵션"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"접기"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"검색"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"검색..."</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"검색어"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"검색어 삭제"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"검색어 보내기"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"음성 검색"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"앱 선택"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"전체 보기"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>과(와) 공유"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"공유 대상:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"사용"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"사용 중지"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"검색"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"스페이스바"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"완료"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"홈으로 이동"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"위로 이동"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"추가 옵션"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"접기"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"검색"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"검색..."</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"검색어"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"검색어 삭제"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"검색어 보내기"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"음성 검색"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"앱 선택"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"전체 보기"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>과(와) 공유"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"공유 대상:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"사용"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"사용 중지"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"검색"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"스페이스바"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ky/strings.xml b/appcompat/appcompat/src/main/res/values-ky/strings.xml
index 1acce80..345a9df 100644
--- a/appcompat/appcompat/src/main/res/values-ky/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ky/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Бүттү"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Башкы бетке чабыттоо"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Мурунку экранга өтүү"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Дагы параметрлер"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Жыйыштыруу"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Издөө"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Издөө…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Изделген сурам"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Сурамды өчүрүү"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Сурам тапшыруу"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Үн менен издөө"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Колдонмо тандоо"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Баарын көрүү"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> аркылуу бөлүшүү"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Төмөнкү менен бөлүшүү"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"КҮЙҮК"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ӨЧҮК"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Издөө"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"боштук"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Бүттү"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Башкы бетке чабыттоо"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Мурунку экранга өтүү"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Дагы параметрлер"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Жыйыштыруу"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Издөө"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Издөө…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Изделген сурам"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Сурамды өчүрүү"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Сурам тапшыруу"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Айтып издөө"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Колдонмо тандоо"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Баарын көрүү"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> аркылуу бөлүшүү"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Төмөнкү менен бөлүшүү"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"КҮЙҮК"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ӨЧҮК"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Издөө"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"боштук"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-lo/strings.xml b/appcompat/appcompat/src/main/res/values-lo/strings.xml
index bdc87522..b3cc639 100644
--- a/appcompat/appcompat/src/main/res/values-lo/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-lo/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"ແລ້ວໆ"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"ກັບໄປໜ້າຫຼັກ"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"ເລື່ອນຂຶ້ນເທິງ"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"ຕົວເລືອກເພີ່ມເຕີມ"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"ຫຍໍ້ລົງ"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"ຊອກຫາ"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"ຊອກຫາ…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"ຄຳສຳລັບຄົ້ນຫາ"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"ລຶບຂໍ້ຄວາມຊອກຫາ"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"ສົ່ງຂໍ້ມູນ"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"ຊອກຫາດ້ວຍສຽງ"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"ເລືອກແອັບ"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"ເບິ່ງທັງໝົດ"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"ແບ່ງປັນດ້ວຍ <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"ແບ່ງປັນກັບ"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ເປີດ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ປິດ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"ຊອກຫາ"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"ຍະຫວ່າງ"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"ລຶບ"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"ແລ້ວໆ"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"ກັບໄປໜ້າຫຼັກ"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"ເລື່ອນຂຶ້ນເທິງ"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"ຕົວເລືອກເພີ່ມເຕີມ"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"ຫຍໍ້ລົງ"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"ຊອກຫາ"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"ຊອກຫາ…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"ຄຳສຳລັບຄົ້ນຫາ"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"ລຶບຂໍ້ຄວາມຊອກຫາ"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"ສົ່ງຂໍ້ມູນ"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"ຊອກຫາດ້ວຍສຽງ"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"ເລືອກແອັບ"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"ເບິ່ງທັງໝົດ"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"ແບ່ງປັນດ້ວຍ <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"ແບ່ງປັນກັບ"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ເປີດ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ປິດ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"ຊອກຫາ"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"ຍະຫວ່າງ"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"ລຶບ"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-lt/strings.xml b/appcompat/appcompat/src/main/res/values-lt/strings.xml
index 333b502..b71d958 100644
--- a/appcompat/appcompat/src/main/res/values-lt/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-lt/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Atlikta"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Eiti į pagrindinį puslapį"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Naršyti aukštyn"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Daugiau parinkčių"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Sutraukti"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Ieškoti"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Ieškoti…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Paieškos užklausa"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Išvalyti užklausą"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Pateikti užklausą"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Paieška balsu"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Pasirinkite programą"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Žr. viską"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Bendrinti naudojant programą „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Bendrinti su"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ĮJUNGTI"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"IŠJUNGTI"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Ieškoti"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"„Menu“ +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"„Meta“ +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"„Ctrl“ +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"„Alt“ +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"„Shift“ +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"„Sym“ +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"„Function“ +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"„space“"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"„enter“"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"„delete“"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Atlikta"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Eiti į pagrindinį puslapį"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Naršyti aukštyn"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Daugiau parinkčių"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Sutraukti"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Ieškoti"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Ieškoti…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Paieškos užklausa"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Išvalyti užklausą"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Pateikti užklausą"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Paieška balsu"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Pasirinkite programą"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Žr. viską"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Bendrinti naudojant programą „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Bendrinti su"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ĮJUNGTI"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"IŠJUNGTI"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Ieškoti"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"„Menu“ +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"„Meta“ +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"„Ctrl“ +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"„Alt“ +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"„Shift“ +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"„Sym“ +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"„Function“ +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"„space“"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"„enter“"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"„delete“"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-lv/strings.xml b/appcompat/appcompat/src/main/res/values-lv/strings.xml
index f06ff5b..0b4f07e 100644
--- a/appcompat/appcompat/src/main/res/values-lv/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-lv/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Gatavs"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Pārvietoties uz sākuma ekrānu"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Pārvietoties uz augšu"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Citas opcijas"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Sakļaut"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Meklēt"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Meklējiet…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Meklēšanas vaicājums"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Notīrīt vaicājumu"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Iesniegt vaicājumu"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Meklēt ar balsi"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Izvēlieties lietotni"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Skatīt visu"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Kopīgot ar lietojumprogrammu <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Kopīgot ar:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"IESLĒGT"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"IZSLĒGT"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Meklēt"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Poga Izvēlne +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta taustiņš +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Vadīšanas taustiņš +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alternēšanas taustiņš +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Pārslēgšanas taustiņš +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Simbolu taustiņš +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funkcijas taustiņš +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"atstarpes taustiņš"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"ievadīšanas taustiņš"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"dzēšanas taustiņš"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Gatavs"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Pārvietoties uz sākuma ekrānu"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Pārvietoties uz augšu"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Citas opcijas"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Sakļaut"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Meklēt"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Meklējiet…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Meklēšanas vaicājums"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Notīrīt vaicājumu"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Iesniegt vaicājumu"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Meklēt ar balsi"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Izvēlieties lietotni"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Skatīt visu"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Kopīgot ar lietojumprogrammu <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Kopīgot ar:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"IESLĒGT"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"IZSLĒGT"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Meklēt"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Poga Izvēlne +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta taustiņš +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Vadīšanas taustiņš +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alternēšanas taustiņš +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Pārslēgšanas taustiņš +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Simbolu taustiņš +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funkcijas taustiņš +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"atstarpes taustiņš"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"ievadīšanas taustiņš"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"dzēšanas taustiņš"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-mk/strings.xml b/appcompat/appcompat/src/main/res/values-mk/strings.xml
index 9974cd8..07145d8 100644
--- a/appcompat/appcompat/src/main/res/values-mk/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-mk/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Готово"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Движи се кон дома"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Движи се нагоре"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Повеќе опции"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Собери"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Пребарај"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Пребарување…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Пребарај барање"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Исчисти барање"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Поднеси барање"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Гласовно пребарување"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Избери апликација"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Прикажи ги сите"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Сподели со <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Сподели со"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ВКЛУЧЕНО"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ИСКЛУЧЕНО"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Пребарај"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"вселена"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"избриши"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Готово"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Движи се кон дома"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Движи се нагоре"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Повеќе опции"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Собери"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Пребарај"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Пребарување…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Пребарај барање"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Исчисти барање"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Поднеси барање"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Гласовно пребарување"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Избери апликација"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Прикажи ги сите"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Сподели со <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Сподели со"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ВКЛУЧЕНО"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ИСКЛУЧЕНО"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Пребарај"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"вселена"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"избриши"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ml/strings.xml b/appcompat/appcompat/src/main/res/values-ml/strings.xml
index f912ced0..2acae41 100644
--- a/appcompat/appcompat/src/main/res/values-ml/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ml/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"പൂർത്തിയായി"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"ഹോമിലേക്ക് പോവുക"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"മുകളിലേക്ക് പോവുക"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"കൂടുതൽ ഓപ്ഷനുകൾ"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"ചുരുക്കുക"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"തിരയുക"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"തിരയുക…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"ചോദ്യം തിരയുക"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"ചോദ്യം മായ്‌ക്കുക"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"ചോദ്യം സമർപ്പിക്കുക"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"സംസാരത്തിലൂടെ തിരയുക"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"ആപ്പ് തിരഞ്ഞെടുക്കുക"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"എല്ലാം കാണുക"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> എന്നതുമായി പങ്കിടുക"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"ഇനിപ്പറയുന്നതുമായി പങ്കിടുക"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ഓൺ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ഓഫ്"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"തിരയുക"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"മെനു+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"മെറ്റ+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"ഫംഗ്ഷന്‍+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"സ്‌പെയ്‌സ്"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"ഇല്ലാതാക്കുക"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"പൂർത്തിയായി"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"ഹോമിലേക്ക് പോവുക"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"മുകളിലേക്ക് പോവുക"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"കൂടുതൽ ഓപ്ഷനുകൾ"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"ചുരുക്കുക"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"തിരയുക"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"തിരയുക…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"ചോദ്യം തിരയുക"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"ചോദ്യം മായ്‌ക്കുക"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"ചോദ്യം സമർപ്പിക്കുക"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"സംസാരത്തിലൂടെ തിരയുക"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"ആപ്പ് തിരഞ്ഞെടുക്കുക"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"എല്ലാം കാണുക"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> എന്നതുമായി പങ്കിടുക"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"ഇനിപ്പറയുന്നതുമായി പങ്കിടുക"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ഓൺ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ഓഫ്"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"തിരയുക"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"മെനു+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"മെറ്റ+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"ഫംഗ്ഷന്‍+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"സ്‌പെയ്‌സ്"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"ഇല്ലാതാക്കുക"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-mn/strings.xml b/appcompat/appcompat/src/main/res/values-mn/strings.xml
index 4db0e5c..bb7b904 100644
--- a/appcompat/appcompat/src/main/res/values-mn/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-mn/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Болсон"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Нүүр хуудас уруу шилжих"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Дээш шилжих"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Бусад сонголт"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Буулгах"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Хайх"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Хайх…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Хайх асуулга"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Асуулга арилгах"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Асуулга илгээх"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Дуут хайлт"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Аппыг сонгох"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Бүгдийг харах"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>-тай хуваалцах"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Дараахтай хуваалцах"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ИДЭВХТЭЙ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ИДЭВХГҮЙ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Хайх"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Цэс+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Мета+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Шифт+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Функц+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"зай"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"оруулах"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"устгах"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Болсон"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Нүүр хуудас уруу шилжих"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Дээш шилжих"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Бусад сонголт"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Буулгах"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Хайх"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Хайх…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Хайх асуулга"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Асуулга арилгах"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Асуулга илгээх"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Дуут хайлт"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Аппыг сонгох"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Бүгдийг харах"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>-тай хуваалцах"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Дараахтай хуваалцах"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ИДЭВХТЭЙ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ИДЭВХГҮЙ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Хайх"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Цэс+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Мета+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Шифт+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Функц+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"зай"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"оруулах"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"устгах"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-mr/strings.xml b/appcompat/appcompat/src/main/res/values-mr/strings.xml
index 7ab57f4..4bc6cb1 100644
--- a/appcompat/appcompat/src/main/res/values-mr/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-mr/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"पूर्ण झाले"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"घराकडे नेव्हिगेट करा"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"वर नेव्‍हिगेट करा"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"आणखी पर्याय"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"कोलॅप्स करा"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"शोध"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"शोधा…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"शोध क्वेरी"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"क्‍वेरी साफ करा"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"क्वेरी सबमिट करा"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"व्हॉइस शोध"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"अ‍ॅप निवडा"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"सर्व पाहा"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> सह शेअर करा"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"यांच्यासोबत शेअर करा"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"सुरू"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"बंद"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"शोध"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"मेनू+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"एंटर करा"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"हटवा"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"पूर्ण झाले"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"घराकडे नेव्हिगेट करा"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"वर नेव्‍हिगेट करा"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"आणखी पर्याय"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"कोलॅप्स करा"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"शोध"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"शोधा…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"शोध क्वेरी"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"क्‍वेरी साफ करा"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"क्वेरी सबमिट करा"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"व्हॉइस शोध"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"अ‍ॅप निवडा"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"सर्व पाहा"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> सह शेअर करा"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"यांच्यासोबत शेअर करा"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"सुरू"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"बंद"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"शोध"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"मेनू+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"एंटर करा"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"हटवा"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ms/strings.xml b/appcompat/appcompat/src/main/res/values-ms/strings.xml
index c618b5e..c3bc68c 100644
--- a/appcompat/appcompat/src/main/res/values-ms/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ms/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Selesai"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navigasi laman utama"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navigasi ke atas"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Lagi pilihan"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Runtuhkan"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Cari"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Cari…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Pertanyaan carian"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Kosongkan pertanyaan"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Serah pertanyaan"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Carian suara"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Pilih apl"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Lihat semua"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Kongsi dengan <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Kongsi dengan"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"HIDUP"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"MATI"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Cari"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fungsi+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"ruang"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Selesai"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navigasi laman utama"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navigasi ke atas"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Lagi pilihan"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Runtuhkan"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Cari"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Cari…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Pertanyaan carian"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Kosongkan pertanyaan"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Serah pertanyaan"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Carian suara"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Pilih apl"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Lihat semua"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Kongsi dengan <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Kongsi dengan"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"HIDUP"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"MATI"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Cari"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fungsi+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"ruang"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-my/strings.xml b/appcompat/appcompat/src/main/res/values-my/strings.xml
index b44d03f..76c3833 100644
--- a/appcompat/appcompat/src/main/res/values-my/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-my/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"ပြီးပြီ"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"မူလနေရာကို ပြန်သွားရန်"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"အပေါ်သို့ ရွှေ့ရန်"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"နောက်ထပ် ရွေးစရာများ"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"လျှော့ပြရန်"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"ရှာရန်"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"ရှာဖွေရန်…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"ရှာဖွေရန် မေးခွန်း"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"ရှာဖွေမှုကို ဖယ်ရှားရန်"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"ရှာဖွေစရာ အချက်အလက်ကို ပေးပို့ရန်"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"အသံဖြင့် ရှာရန်"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"အက်ပ်တစ်ခုကို ရွေးရန်"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"အားလုံး ကြည့်ရန်"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ဖြင့် မျှဝေရန်"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"နှင့် မျှဝေရန်"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ဖွင့်ရန်"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ပိတ်ရန်"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"ရှာဖွေမှု"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"ပြီးပြီ"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"မူလနေရာကို ပြန်သွားရန်"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"အပေါ်သို့ ရွှေ့ရန်"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"နောက်ထပ် ရွေးစရာများ"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"လျှော့ပြရန်"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"ရှာရန်"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"ရှာဖွေရန်…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"ရှာဖွေရန် မေးခွန်း"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"ရှာဖွေမှုကို ဖယ်ရှားရန်"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"ရှာဖွေစရာ အချက်အလက်ကို ပေးပို့ရန်"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"အသံဖြင့် ရှာရန်"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"အက်ပ်တစ်ခုကို ရွေးရန်"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"အားလုံး ကြည့်ရန်"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ဖြင့် မျှဝေရန်"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"နှင့် မျှဝေရန်"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ဖွင့်ရန်"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ပိတ်ရန်"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"ရှာဖွေမှု"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-nb/strings.xml b/appcompat/appcompat/src/main/res/values-nb/strings.xml
index 73d218d..3d65762 100644
--- a/appcompat/appcompat/src/main/res/values-nb/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-nb/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Ferdig"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Naviger hjem"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Gå opp"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Flere alternativer"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Skjul"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Søk"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Søk"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Søkeord"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Slett søket"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Utfør søket"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Talesøk"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Velg en app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Se alle"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Del med <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Del med"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"PÅ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"AV"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Søk"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Meny+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funksjon+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"mellomrom"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"slett"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Ferdig"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Naviger hjem"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Gå opp"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Flere alternativer"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Skjul"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Søk"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Søk"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Søkeord"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Slett søket"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Utfør søket"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Talesøk"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Velg en app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Se alle"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Del med <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Del med"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"PÅ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"AV"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Søk"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Meny+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funksjon+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"mellomrom"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"slett"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ne/strings.xml b/appcompat/appcompat/src/main/res/values-ne/strings.xml
index 7fafce9..0bcea21 100644
--- a/appcompat/appcompat/src/main/res/values-ne/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ne/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"सम्पन्न भयो"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"गृह पृष्ठमा जानुहोस्"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"माथि नेभिगेट गर्नुहोस्"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"थप विकल्पहरू"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"संक्षिप्त गर्नुहोस्"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"खोज"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"खोज्नुहोस्…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"खोज प्रश्न"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"क्वेरी खाली गर्नुहोस्"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"क्वेरी पेस गर्नुहोस्"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"आवाजमा आधारित खोजी"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"एउटा अनुप्रयोग छान्नुहोस्"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"सबै हेर्नुहोस्"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> मार्फत आदान प्रदान गर्नुहोस्"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"यसमार्फत आदान प्रदान गर्नुहोस्"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"सक्रिय"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"निष्क्रिय"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"खोज"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"सम्पन्न भयो"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"गृह पृष्ठमा जानुहोस्"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"माथि नेभिगेट गर्नुहोस्"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"थप विकल्पहरू"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"संक्षिप्त गर्नुहोस्"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"खोज"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"खोज्नुहोस्…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"खोज प्रश्न"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"क्वेरी खाली गर्नुहोस्"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"क्वेरी पेस गर्नुहोस्"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"आवाजमा आधारित खोजी"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"एउटा अनुप्रयोग छान्नुहोस्"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"सबै हेर्नुहोस्"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> मार्फत आदान प्रदान गर्नुहोस्"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"यसमार्फत आदान प्रदान गर्नुहोस्"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"सक्रिय"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"निष्क्रिय"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"खोज"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-nl/strings.xml b/appcompat/appcompat/src/main/res/values-nl/strings.xml
index 28326ab..0e0db0a 100644
--- a/appcompat/appcompat/src/main/res/values-nl/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-nl/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Gereed"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navigeren naar startpositie"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Omhoog navigeren"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Meer opties"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Samenvouwen"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Zoeken"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Zoeken…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Zoekopdracht"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Zoekopdracht wissen"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Zoekopdracht verzenden"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Gesproken zoekopdracht"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Een app selecteren"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Alles weergeven"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Delen met <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Delen met"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"AAN"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"UIT"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Zoeken"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Functie +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"spatie"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Gereed"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navigeren naar startpositie"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Omhoog navigeren"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Meer opties"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Samenvouwen"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Zoeken"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Zoeken…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Zoekopdracht"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Zoekopdracht wissen"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Zoekopdracht verzenden"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Gesproken zoekopdracht"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Een app selecteren"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Alles weergeven"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Delen met <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Delen met"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"AAN"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"UIT"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Zoeken"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Functie +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"spatie"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-or/strings.xml b/appcompat/appcompat/src/main/res/values-or/strings.xml
index bb7c8ca..b59d060 100644
--- a/appcompat/appcompat/src/main/res/values-or/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-or/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"ହୋଇଗଲା"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"ହୋମ୍ ପେଜ୍‌କୁ ନେଭିଗେଟ୍ କରନ୍ତୁ"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"ଉପରକୁ ନେଭିଗେଟ୍ କରନ୍ତୁ"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"ଅଧିକ ବିକଳ୍ପ"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"ସଂକୁଚିତ କରନ୍ତୁ"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"ସର୍ଚ୍ଚ କରନ୍ତୁ…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"ସର୍ଚ୍ଚ କ୍ୱେରୀ"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"କ୍ୱେରୀ ଖାଲି କରନ୍ତୁ"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"କ୍ୱେରୀ ଦାଖଲ କରନ୍ତୁ"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"ଭଏସ୍‌ ସର୍ଚ୍ଚ"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"ଗୋଟିଏ ଆପ୍‍ ବାଛନ୍ତୁ"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"ସବୁ ଦେଖନ୍ତୁ"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ସହ ସେୟାର୍‍ କରନ୍ତୁ"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"ଏହାଙ୍କ ସହ ସେୟାର୍‌ କରନ୍ତୁ"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ଅନ୍"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ଅଫ୍"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"ମେନୁ"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"ସ୍ପେସ୍‍"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"ଏଣ୍ଟର୍"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"ଡିଲିଟ୍‍"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"ହୋଇଗଲା"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"ହୋମ୍ ପେଜ୍‌କୁ ନେଭିଗେଟ୍ କରନ୍ତୁ"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"ଉପରକୁ ନେଭିଗେଟ୍ କରନ୍ତୁ"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"ଅଧିକ ବିକଳ୍ପ"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"ସଂକୁଚିତ କରନ୍ତୁ"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"ସର୍ଚ୍ଚ କରନ୍ତୁ…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"ସର୍ଚ୍ଚ କ୍ୱେରୀ"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"କ୍ୱେରୀ ଖାଲି କରନ୍ତୁ"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"କ୍ୱେରୀ ଦାଖଲ କରନ୍ତୁ"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"ଭଏସ୍‌ ସର୍ଚ୍ଚ"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"ଗୋଟିଏ ଆପ୍‍ ବାଛନ୍ତୁ"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"ସବୁ ଦେଖନ୍ତୁ"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ସହ ସେୟାର୍‍ କରନ୍ତୁ"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"ଏହାଙ୍କ ସହ ସେୟାର୍‌ କରନ୍ତୁ"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ଅନ୍"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ଅଫ୍"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"ମେନୁ"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"ସ୍ପେସ୍‍"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"ଏଣ୍ଟର୍"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"ଡିଲିଟ୍‍"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-pa/strings.xml b/appcompat/appcompat/src/main/res/values-pa/strings.xml
index 9e06d71..486a246 100644
--- a/appcompat/appcompat/src/main/res/values-pa/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-pa/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"ਹੋ ਗਿਆ"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"ਹੋਮ \'ਤੇ ਜਾਓ"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"ਉੱਪਰ ਜਾਓ"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"ਹੋਰ ਵਿਕਲਪ"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"ਸਮੇਟੋ"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"ਖੋਜ"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"ਖੋਜ…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"ਖੋਜ ਪੁੱਛਗਿੱਛ"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"ਪੁੱਛਗਿੱਛ ਕਲੀਅਰ ਕਰੋ"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"ਪੁੱਛਗਿੱਛ ਸਪੁਰਦ ਕਰੋ"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"ਅਵਾਜ਼ੀ ਖੋਜ"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"ਇੱਕ ਐਪ ਚੁਣੋ"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"ਸਭ ਦੇਖੋ"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ਨਾਲ ਸਾਂਝਾ ਕਰੋ"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"ਇਸ ਨਾਲ ਸਾਂਝਾ ਕਰੋ"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ਚਾਲੂ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ਬੰਦ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"ਖੋਜ"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"ਮਿਟਾਓ"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"ਹੋ ਗਿਆ"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"ਹੋਮ \'ਤੇ ਜਾਓ"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"ਉੱਪਰ ਜਾਓ"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"ਹੋਰ ਵਿਕਲਪ"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"ਸਮੇਟੋ"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"ਖੋਜ"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"ਖੋਜ…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"ਖੋਜ ਪੁੱਛਗਿੱਛ"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"ਪੁੱਛਗਿੱਛ ਕਲੀਅਰ ਕਰੋ"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"ਪੁੱਛਗਿੱਛ ਸਪੁਰਦ ਕਰੋ"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"ਅਵਾਜ਼ੀ ਖੋਜ"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"ਇੱਕ ਐਪ ਚੁਣੋ"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"ਸਭ ਦੇਖੋ"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ਨਾਲ ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"ਇਸ ਨਾਲ ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ਚਾਲੂ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ਬੰਦ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"ਖੋਜ"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"ਮਿਟਾਓ"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-pl/strings.xml b/appcompat/appcompat/src/main/res/values-pl/strings.xml
index ee3b647..0993872 100644
--- a/appcompat/appcompat/src/main/res/values-pl/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-pl/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Gotowe"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Przejdź na stronę główną"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Przejdź wyżej"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Więcej opcji"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Zwiń"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Szukaj"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Szukaj…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Zapytanie"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Wyczyść zapytanie"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Wyślij zapytanie"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Wyszukiwanie głosowe"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Wybierz aplikację"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Pokaż wszystko"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Udostępnij przez: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Udostępnij przez:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"WŁ."</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"WYŁ."</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Szukaj"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funkcyjny+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"spacja"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Gotowe"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Przejdź na stronę główną"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Przejdź wyżej"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Więcej opcji"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Zwiń"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Szukaj"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Szukaj…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Zapytanie"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Wyczyść zapytanie"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Wyślij zapytanie"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Wyszukiwanie głosowe"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Wybierz aplikację"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Pokaż wszystko"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Udostępnij przez: <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Udostępnij przez:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"WŁ."</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"WYŁ."</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Szukaj"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funkcyjny+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"spacja"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-pt-rBR/strings.xml b/appcompat/appcompat/src/main/res/values-pt-rBR/strings.xml
index 03ab5a0..2ba802f 100644
--- a/appcompat/appcompat/src/main/res/values-pt-rBR/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-pt-rBR/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Concluído"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navegar para a página inicial"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navegar para cima"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Mais opções"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Recolher"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Pesquisar"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Pesquisar…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Consulta de pesquisa"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Limpar consulta"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Enviar consulta"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Pesquisa por voz"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Selecionar um app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Ver tudo"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Compartilhar com <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Compartilhar com"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ATIVADO"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DESATIVADO"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Pesquisar"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"espaço"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Concluído"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navegar para a página inicial"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navegar para cima"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Mais opções"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Recolher"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Pesquisar"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Pesquisar…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Consulta de pesquisa"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Limpar consulta"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Enviar consulta"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Pesquisa por voz"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Selecionar um app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Ver tudo"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Compartilhar com <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Compartilhar com"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ATIVADO"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DESATIVADO"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Pesquisar"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"espaço"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-pt-rPT/strings.xml b/appcompat/appcompat/src/main/res/values-pt-rPT/strings.xml
index f8181eb..379a72f 100644
--- a/appcompat/appcompat/src/main/res/values-pt-rPT/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-pt-rPT/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Concluído"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navegar para casa"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navegar para cima"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Mais opções"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Reduzir"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Pesquisar"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Pesquisar…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Consulta de pesquisa"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Limpar consulta"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Enviar consulta"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Pesquisa por voz"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Escolher uma aplicação"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Ver tudo"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Partilhar com a aplicação <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Partilhar com"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ATIVADO"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DESATIVADO"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Pesquisar"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Função +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"espaço"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"eliminar"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Concluído"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navegar para casa"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navegar para cima"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Mais opções"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Reduzir"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Pesquisar"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Pesquisar…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Consulta de pesquisa"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Limpar consulta"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Enviar consulta"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Pesquisa por voz"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Escolher uma aplicação"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Ver tudo"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Partilhar com a aplicação <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Partilhar com"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ATIVADO"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DESATIVADO"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Pesquisar"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Função +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"espaço"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"eliminar"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-pt/strings.xml b/appcompat/appcompat/src/main/res/values-pt/strings.xml
index 03ab5a0..2ba802f 100644
--- a/appcompat/appcompat/src/main/res/values-pt/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-pt/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Concluído"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navegar para a página inicial"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navegar para cima"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Mais opções"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Recolher"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Pesquisar"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Pesquisar…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Consulta de pesquisa"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Limpar consulta"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Enviar consulta"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Pesquisa por voz"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Selecionar um app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Ver tudo"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Compartilhar com <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Compartilhar com"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ATIVADO"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DESATIVADO"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Pesquisar"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"espaço"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Concluído"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navegar para a página inicial"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navegar para cima"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Mais opções"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Recolher"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Pesquisar"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Pesquisar…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Consulta de pesquisa"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Limpar consulta"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Enviar consulta"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Pesquisa por voz"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Selecionar um app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Ver tudo"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Compartilhar com <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Compartilhar com"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ATIVADO"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DESATIVADO"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Pesquisar"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"espaço"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ro/strings.xml b/appcompat/appcompat/src/main/res/values-ro/strings.xml
index 5bfd233..20a15ee 100644
--- a/appcompat/appcompat/src/main/res/values-ro/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ro/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Gata"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navigați la ecranul de pornire"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navigați în sus"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Mai multe opțiuni"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Restrângeți"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Căutați"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Căutați…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Termen de căutare"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Ștergeți interogarea"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Trimiteți interogarea"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Căutare vocală"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Alegeți o aplicație"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Afișați tot"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Trimiteți folosind <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Trimiteți la"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ACTIVAT"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"DEZACTIVAT"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Căutați"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Meniu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Gata"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navigați la ecranul de pornire"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navigați în sus"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Mai multe opțiuni"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Restrângeți"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Căutați"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Căutați…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Termen de căutare"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Ștergeți interogarea"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Trimiteți interogarea"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Căutare vocală"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Alegeți o aplicație"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Afișați tot"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Trimiteți folosind <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Trimiteți la"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ACTIVAT"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"DEZACTIVAT"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Căutați"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Meniu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ru/strings.xml b/appcompat/appcompat/src/main/res/values-ru/strings.xml
index e14527a..6f011a2 100644
--- a/appcompat/appcompat/src/main/res/values-ru/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ru/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Готово"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Перейти на главный экран"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Перейти вверх"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Ещё"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Свернуть"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Поиск"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Введите запрос"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Поисковый запрос"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Удалить запрос"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Отправить запрос"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Голосовой поиск"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Выберите приложение"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Показать все"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Поделиться с помощью <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Поделиться с помощью"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ВКЛ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ВЫКЛ"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Поиск"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Меню +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fn +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"Пробел"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Ввод"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Готово"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Перейти на главный экран"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Перейти вверх"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Ещё"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Свернуть"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Поиск"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Введите запрос"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Поисковый запрос"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Удалить запрос"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Отправить запрос"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Голосовой поиск"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Выберите приложение"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Показать все"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Поделиться с помощью <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Поделиться с помощью"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ВКЛ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ВЫКЛ"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Поиск"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Меню +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fn +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"Пробел"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Ввод"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-si/strings.xml b/appcompat/appcompat/src/main/res/values-si/strings.xml
index 26012ee..24119b3 100644
--- a/appcompat/appcompat/src/main/res/values-si/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-si/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"කළා"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"මුල් පිටුවට සංචාලනය කරන්න"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"ඉහළට සංචාලනය කරන්න"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"තවත් විකල්ප"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"හකුළන්න"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"සෙවීම"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"සොයන්න..."</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"සෙවුම් විමසුම"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"විමසුම හිස් කරන්න"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"විමසුම යොමු කරන්න"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"හඬ සෙවීම"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"යෙදුමක් තෝරන්න"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"සියල්ල බලන්න"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> සමඟ බෙදා ගන්න"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"සමග බෙදා ගන්න"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ක්‍රියාත්මකයි"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ක්‍රියාවිරහිතයි"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"සෙවීම"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"මකන්න"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"කළා"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"මුල් පිටුවට සංචාලනය කරන්න"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"ඉහළට සංචාලනය කරන්න"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"තවත් විකල්ප"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"හකුළන්න"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"සෙවීම"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"සොයන්න..."</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"සෙවුම් විමසුම"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"විමසුම හිස් කරන්න"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"විමසුම යොමු කරන්න"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"හඬ සෙවීම"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"යෙදුමක් තෝරන්න"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"සියල්ල බලන්න"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> සමඟ බෙදා ගන්න"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"සමග බෙදා ගන්න"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ක්‍රියාත්මකයි"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ක්‍රියාවිරහිතයි"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"සෙවීම"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"මකන්න"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-sk/strings.xml b/appcompat/appcompat/src/main/res/values-sk/strings.xml
index a143ecb..39021a0 100644
--- a/appcompat/appcompat/src/main/res/values-sk/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-sk/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Hotovo"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Prejsť na plochu"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Prejsť nahor"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Ďalšie možnosti"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Zbaliť"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Hľadať"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Vyhľadať…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Vyhľadávací dopyt"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Vymazať dopyt"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Odoslať dopyt"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Hlasové vyhľadávanie"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Vybrať aplikáciu"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Zobraziť všetky"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Zdieľať s aplikáciou <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Zdieľať s"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ZAP."</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"VYP."</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Hľadať"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"medzerník"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"odstrániť"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Hotovo"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Prejsť na plochu"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Prejsť nahor"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Ďalšie možnosti"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Zbaliť"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Hľadať"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Vyhľadať…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Vyhľadávací dopyt"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Vymazať dopyt"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Odoslať dopyt"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Hlasové vyhľadávanie"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Vybrať aplikáciu"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Zobraziť všetky"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Zdieľať s aplikáciou <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Zdieľať s"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ZAP."</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"VYP."</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Hľadať"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"medzerník"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"odstrániť"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-sl/strings.xml b/appcompat/appcompat/src/main/res/values-sl/strings.xml
index 3896bdb..3ba71a6 100644
--- a/appcompat/appcompat/src/main/res/values-sl/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-sl/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Končano"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Krmarjenje na začetek"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Pomik navzgor"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Več možnosti"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Strnitev"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Iskanje"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Iskanje …"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Iskalna poizvedba"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Izbris poizvedbe"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Pošiljanje poizvedbe"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Glasovno iskanje"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Izbira aplikacije"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Pokaži vse"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Skupna raba z drugimi prek aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Skupna raba z:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"VKLOP"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"IZKLOP"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Iskanje"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Meni +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fn +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"preslednica"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Končano"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Krmarjenje na začetek"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Pomik navzgor"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Več možnosti"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Strnitev"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Iskanje"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Iskanje …"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Iskalna poizvedba"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Izbris poizvedbe"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Pošiljanje poizvedbe"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Glasovno iskanje"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Izbira aplikacije"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Pokaži vse"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Skupna raba z drugimi prek aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Skupna raba z:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"VKLOP"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"IZKLOP"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Iskanje"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Meni +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fn +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"preslednica"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-sq/strings.xml b/appcompat/appcompat/src/main/res/values-sq/strings.xml
index fa36486..7940d55 100644
--- a/appcompat/appcompat/src/main/res/values-sq/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-sq/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"U krye"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Orientohu për në shtëpi"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Ngjitu lart"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Opsione të tjera"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Palos"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Kërko"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Kërko…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Kërko pyetjen"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Pastro pyetjen"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Dërgo pyetjen"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Kërkim me zë"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Zgjidh një aplikacion"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Shfaq çdo gjë"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Ndaje me <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Ndaje me"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"AKTIV"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"JOAKTIV"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Kërko"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menyja+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funksioni+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"hapësirë"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"U krye"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Orientohu për në shtëpi"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Ngjitu lart"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Opsione të tjera"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Palos"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Kërko"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Kërko…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Kërko pyetjen"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Pastro pyetjen"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Dërgo pyetjen"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Kërkim me zë"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Zgjidh një aplikacion"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Shfaq çdo gjë"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Ndaje me <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Ndaje me"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"AKTIV"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"JOAKTIV"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Kërko"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menyja+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funksioni+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"hapësirë"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-sr/strings.xml b/appcompat/appcompat/src/main/res/values-sr/strings.xml
index 13130c6..b7cefc0 100644
--- a/appcompat/appcompat/src/main/res/values-sr/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-sr/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Готово"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Идите на почетну"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Идите нагоре"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Још опција"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Скупи"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Претражите"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Претражите…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Претражите упит"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Обришите упит"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Пошаљите упит"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Гласовна претрага"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Изаберите апликацију"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Прикажи све"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Делите помоћу апликације <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Делите помоћу"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"УКЉУЧЕНО"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ИСКЉУЧЕНО"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Претражите"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"тастер за размак"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Готово"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Идите на почетну"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Идите нагоре"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Још опција"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Скупи"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Претражите"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Претражите…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Претражите упит"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Обришите упит"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Пошаљите упит"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Гласовна претрага"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Изаберите апликацију"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Прикажи све"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Делите помоћу апликације <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Делите помоћу"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"УКЉУЧЕНО"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ИСКЉУЧЕНО"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Претражите"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"тастер за размак"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-sv/strings.xml b/appcompat/appcompat/src/main/res/values-sv/strings.xml
index f9277fc..e91ca24 100644
--- a/appcompat/appcompat/src/main/res/values-sv/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-sv/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Klar"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Navigera hem"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Navigera uppåt"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Fler alternativ"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Komprimera"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Sök"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Sök …"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Sökfråga"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Ta bort frågan"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Skicka fråga"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Röstsökning"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Välj en app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Visa alla"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Dela med <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Dela med"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"PÅ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"AV"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Sök"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Meny + "</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta + "</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl + "</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt + "</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Skift + "</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Symbol + "</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Funktion + "</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"blanksteg"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"retur"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Klar"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Navigera hem"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Navigera uppåt"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Fler alternativ"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Komprimera"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Sök"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Sök …"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Sökfråga"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Ta bort frågan"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Skicka fråga"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Röstsökning"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Välj en app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Visa alla"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Dela med <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Dela med"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"PÅ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"AV"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Sök"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Meny + "</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta + "</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl + "</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt + "</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Skift + "</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Symbol + "</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Funktion + "</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"blanksteg"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"retur"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-sw/strings.xml b/appcompat/appcompat/src/main/res/values-sw/strings.xml
index 26760e3..357abb2 100644
--- a/appcompat/appcompat/src/main/res/values-sw/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-sw/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Nimemaliza"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Nenda mwanzo"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Sogeza juu"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Chaguo zaidi"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Kunja"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Tafuta"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Tafuta…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Hoja ya utafutaji"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Futa hoja"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Wasilisha hoja"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Kutafuta kwa kutamka"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Chagua programu"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Angalia zote"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Shiriki ukitumia <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Shiriki na"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"IMEWASHWA"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"IMEZIMWA"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Tafuta"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Nimemaliza"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Nenda mwanzo"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Sogeza juu"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Chaguo zaidi"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Kunja"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Tafuta"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Tafuta…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Hoja ya utafutaji"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Futa hoja"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Wasilisha hoja"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Kutafuta kwa kutamka"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Chagua programu"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Angalia zote"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Shiriki ukitumia <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Shiriki na"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"IMEWASHWA"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"IMEZIMWA"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Tafuta"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ta/strings.xml b/appcompat/appcompat/src/main/res/values-ta/strings.xml
index fef0b3c..83a67d2 100644
--- a/appcompat/appcompat/src/main/res/values-ta/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ta/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"முடிந்தது"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"முகப்பிற்குச் செல்லும்"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"மேலே செல்லும்"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"மேலும் விருப்பங்கள்"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"சுருக்கும்"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"தேடும்"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"தேடுக…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"தேடல் வினவல்"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"வினவலை அழிக்கும்"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"வினவலைச் சமர்ப்பிக்கும்"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"குரல் தேடல்"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"ஆப்ஸைத் தேர்வுசெய்க"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"அனைத்தையும் காட்டு"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> மூலம் பகிர்"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"இதில் பகிர்"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ஆன்"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ஆஃப்"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"தேடல்"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu மற்றும்"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta மற்றும்"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl மற்றும்"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt மற்றும்"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift மற்றும்"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym மற்றும்"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function மற்றும்"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"முடிந்தது"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"முகப்பிற்குச் செல்லும்"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"மேலே செல்லும்"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"மேலும் விருப்பங்கள்"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"சுருக்கும்"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"தேடும்"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"தேடுக…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"தேடல் வினவல்"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"வினவலை அழிக்கும்"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"வினவலைச் சமர்ப்பிக்கும்"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"குரல் தேடல்"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"ஆப்ஸைத் தேர்வுசெய்க"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"அனைத்தையும் காட்டு"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> மூலம் பகிர்"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"இதில் பகிர்"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ஆன்"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ஆஃப்"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"தேடல்"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu மற்றும்"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta மற்றும்"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl மற்றும்"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt மற்றும்"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift மற்றும்"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym மற்றும்"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function மற்றும்"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-te/strings.xml b/appcompat/appcompat/src/main/res/values-te/strings.xml
index d81d8e4..80f7d0d 100644
--- a/appcompat/appcompat/src/main/res/values-te/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-te/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"పూర్తయింది"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"హోమ్‌కు నావిగేట్ చేస్తుంది"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"పైకి నావిగేట్ చేస్తుంది"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"మరిన్ని ఎంపికలు"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"కుదిస్తుంది"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"శోధన"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"వెతకండి…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"శోధన ప్రశ్న"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"ప్రశ్నను తీసివేస్తుంది"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"ప్రశ్నని సమర్పిస్తుంది"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"వాయిస్ శోధన"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"యాప్‌ను ఎంచుకోండి"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"అన్నీ చూడండి"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>తో షేర్ చేస్తుంది"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"వీరితో షేర్ చేస్తుంది"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"ఆన్"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ఆఫ్"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"శోధన"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"స్పేస్"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"పూర్తయింది"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"హోమ్‌కు నావిగేట్ చేస్తుంది"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"పైకి నావిగేట్ చేస్తుంది"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"మరిన్ని ఎంపికలు"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"కుదిస్తుంది"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"శోధన"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"వెతకండి…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"శోధన ప్రశ్న"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"ప్రశ్నను తీసివేస్తుంది"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"ప్రశ్నని సమర్పిస్తుంది"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"వాయిస్ శోధన"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"యాప్‌ను ఎంచుకోండి"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"అన్నీ చూడండి"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g>తో షేర్ చేస్తుంది"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"వీరితో షేర్ చేస్తుంది"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"ఆన్"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ఆఫ్"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"శోధన"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"స్పేస్"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-th/strings.xml b/appcompat/appcompat/src/main/res/values-th/strings.xml
index 2c474dc..447f1c4 100644
--- a/appcompat/appcompat/src/main/res/values-th/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-th/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"เสร็จ"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"นำทางไปหน้าแรก"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"กลับ"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"ตัวเลือกอื่น"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"ยุบ"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"ค้นหา"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"ค้นหา…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"คำค้นหา"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"ล้างคำค้นหา"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"ส่งคำค้นหา"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"ค้นหาด้วยเสียง"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"เลือกแอป"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"ดูทั้งหมด"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"แชร์ทาง <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"แชร์กับ"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"เปิด"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ปิด"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"ค้นหา"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"เมนู+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"Space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"ลบ"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"เสร็จ"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"นำทางไปหน้าแรก"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"กลับ"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"ตัวเลือกอื่น"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"ยุบ"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"ค้นหา"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"ค้นหา…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"คำค้นหา"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"ล้างคำค้นหา"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"ส่งคำค้นหา"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"ค้นหาด้วยเสียง"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"เลือกแอป"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"ดูทั้งหมด"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"แชร์ทาง <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"แชร์กับ"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"เปิด"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ปิด"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"ค้นหา"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"เมนู+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"Space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"ลบ"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-tl/strings.xml b/appcompat/appcompat/src/main/res/values-tl/strings.xml
index e58f88e..4ab831a 100644
--- a/appcompat/appcompat/src/main/res/values-tl/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-tl/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Tapos na"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Mag-navigate sa home"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Mag-navigate pataas"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Higit pang opsyon"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"I-collapse"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Maghanap"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Maghanap…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Query sa paghahanap"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"I-clear ang query"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Isumite ang query"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Paghahanap gamit ang boses"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Pumili ng app"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Tingnan lahat"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Ibahagi gamit ang <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Ibahagi sa/kay"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"I-ON"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"I-OFF"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Maghanap"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Tapos na"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Mag-navigate sa home"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Mag-navigate pataas"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Higit pang opsyon"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"I-collapse"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Maghanap"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Maghanap…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Query sa paghahanap"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"I-clear ang query"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Isumite ang query"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Paghahanap gamit ang boses"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Pumili ng app"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Tingnan lahat"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Ibahagi gamit ang <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Ibahagi sa/kay"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"I-ON"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"I-OFF"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Maghanap"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-tr/strings.xml b/appcompat/appcompat/src/main/res/values-tr/strings.xml
index 7932c1a..6c3c331 100644
--- a/appcompat/appcompat/src/main/res/values-tr/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-tr/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Bitti"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Eve gidiş yolunu göster"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Yukarı git"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Diğer seçenekler"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Daralt"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Ara"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Ara…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Arama sorgusu"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Sorguyu temizle"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Sorguyu gönder"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Sesli arama"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Bir uygulama seçin"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Tümünü göster"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ile paylaş"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Şununla paylaş:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"AÇ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"KAPAT"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Ara"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menü+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Üst Karakter+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"boşluk"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"sil"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Bitti"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Eve gidiş yolunu göster"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Yukarı git"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Diğer seçenekler"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Daralt"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Ara"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Ara…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Arama sorgusu"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Sorguyu temizle"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Sorguyu gönder"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Sesli arama"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Bir uygulama seçin"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Tümünü göster"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ile paylaş"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Şununla paylaş:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"AÇ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"KAPAT"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Ara"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menü+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Üst Karakter+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"boşluk"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"sil"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-uk/strings.xml b/appcompat/appcompat/src/main/res/values-uk/strings.xml
index 6eab764..f93fd536 100644
--- a/appcompat/appcompat/src/main/res/values-uk/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-uk/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Готово"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Перейти на головну"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Перейти вгору"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Більше опцій"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Згорнути"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Пошук"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Введіть пошуковий запит…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Пошуковий запит"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Очистити запит"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Наіслати запит"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Голосовий пошук"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Вибрати програму"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Показати всі"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Поділитися через додаток <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Поділитися:"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"УВІМК."</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"ЗНИЖКА"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Пошук"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"пробіл"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Готово"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Перейти на головну"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Перейти вгору"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Більше опцій"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Згорнути"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Пошук"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Введіть пошуковий запит…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Пошуковий запит"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Очистити запит"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Наіслати запит"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Голосовий пошук"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Вибрати програму"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Показати всі"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Поділитися через додаток <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Поділитися:"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"УВІМК."</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"ЗНИЖКА"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Пошук"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"пробіл"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-ur/strings.xml b/appcompat/appcompat/src/main/res/values-ur/strings.xml
index 3b2b1f8..1e603d4 100644
--- a/appcompat/appcompat/src/main/res/values-ur/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-ur/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"ہو گیا"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"گھر کی طرف نیویگیٹ کریں"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"اوپر نیویگیٹ کریں"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"مزید اختیارات"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"سکیڑیں"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"تلاش کریں"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"تلاش کریں…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"تلاش کا استفسار"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"استفسار صاف کریں"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"استفسار جمع کرائیں"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"صوتی تلاش"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"ایک ایپ منتخب کریں"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"سبھی دیکھیں"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> کے ساتھ اشتراک کریں"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"اس کے ساتھ اشتراک کریں"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"آن"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"آف"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"تلاش کریں"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+‎"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+‎"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+‎"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+‎"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+‎"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+‎"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+‎"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"ہو گیا"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"گھر کی طرف نیویگیٹ کریں"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"اوپر نیویگیٹ کریں"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"مزید اختیارات"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"سکیڑیں"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"تلاش کریں"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"تلاش کریں…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"تلاش کا استفسار"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"استفسار صاف کریں"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"استفسار جمع کرائیں"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"صوتی تلاش"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"ایک ایپ منتخب کریں"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"سبھی دیکھیں"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> کے ساتھ اشتراک کریں"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"اس کے ساتھ اشتراک کریں"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"آن"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"آف"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"تلاش کریں"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+‎"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+‎"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+‎"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+‎"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+‎"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+‎"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+‎"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-uz/strings.xml b/appcompat/appcompat/src/main/res/values-uz/strings.xml
index 0c5bced..094283a 100644
--- a/appcompat/appcompat/src/main/res/values-uz/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-uz/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"OK"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Boshiga o‘tish"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Yopish"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Yana"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Yig‘ish"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Qidiruv"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Qidirish…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Qidiruv so‘rovi"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"So‘rovni o‘chirish"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"So‘rov yaratish"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Ovozli qidiruv"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Ilovani tanlang"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Hammasi"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> orqali ulashish"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Ulashish"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"YONIQ"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"YOQILMAGAN"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Qidiruv"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menyu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fn+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"Probel"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"OK"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Boshiga o‘tish"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Yopish"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Yana"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Yig‘ish"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Qidiruv"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Qidirish…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Qidiruv so‘rovi"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"So‘rovni o‘chirish"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"So‘rov yaratish"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Ovozli qidiruv"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Ilovani tanlang"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Hammasi"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> orqali ulashish"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Ulashish"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"YONIQ"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"YOQILMAGAN"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Qidiruv"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menyu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fn+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"Probel"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-vi/strings.xml b/appcompat/appcompat/src/main/res/values-vi/strings.xml
index e3bb407..069b20b 100644
--- a/appcompat/appcompat/src/main/res/values-vi/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-vi/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Xong"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Chỉ đường về nhà"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Di chuyển lên"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Tùy chọn khác"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Thu gọn"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Tìm kiếm"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Tìm kiếm…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Truy vấn tìm kiếm"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Xóa truy vấn"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Gửi truy vấn"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Tìm kiếm bằng giọng nói"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Chọn một ứng dụng"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Xem tất cả"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Chia sẻ với <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Chia sẻ với"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"BẬT"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"TẮT"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Tìm kiếm"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Xong"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Chỉ đường về nhà"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Di chuyển lên"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Tùy chọn khác"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Thu gọn"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Tìm kiếm"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Tìm kiếm…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Truy vấn tìm kiếm"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Xóa truy vấn"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Gửi truy vấn"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Tìm kiếm bằng giọng nói"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Chọn một ứng dụng"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Xem tất cả"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Chia sẻ với <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Chia sẻ với"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"BẬT"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"TẮT"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Tìm kiếm"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-zh-rCN/strings.xml b/appcompat/appcompat/src/main/res/values-zh-rCN/strings.xml
index ee28894..e988edb 100644
--- a/appcompat/appcompat/src/main/res/values-zh-rCN/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-zh-rCN/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"完成"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"转到首页"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"转到上一层级"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"更多选项"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"收起"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"搜索"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"搜索…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"搜索查询"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"清除查询"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"提交查询"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"语音搜索"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"选择应用"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"查看全部"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"与<xliff:g id="APPLICATION_NAME">%s</xliff:g>分享"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"分享对象"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"开启"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"关闭"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"搜索"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fn+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"空格键"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter 键"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete 键"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"完成"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"转到首页"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"转到上一层级"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"更多选项"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"收起"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"搜索"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"搜索…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"搜索查询"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"清除查询"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"提交查询"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"语音搜索"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"选择应用"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"查看全部"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"与<xliff:g id="APPLICATION_NAME">%s</xliff:g>分享"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"分享对象"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"开启"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"关闭"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"搜索"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fn+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"空格键"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter 键"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete 键"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-zh-rHK/strings.xml b/appcompat/appcompat/src/main/res/values-zh-rHK/strings.xml
index 8184754..6dc33f4 100644
--- a/appcompat/appcompat/src/main/res/values-zh-rHK/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-zh-rHK/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"完成"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"瀏覽主頁"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"向上瀏覽"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"更多選項"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"收合"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"搜尋"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"搜尋…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"搜尋查詢"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"清除查詢"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"提交查詢"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"語音搜尋"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"選擇應用程式"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"查看全部"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"使用「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」分享"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"分享對象"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"開啟"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"關閉"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"搜尋"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fn +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"空白鍵"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter 鍵"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"刪除"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"完成"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"瀏覽主頁"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"向上瀏覽"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"更多選項"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"收合"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"搜尋"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"搜尋…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"搜尋查詢"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"清除查詢"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"提交查詢"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"語音搜尋"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"選擇應用程式"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"查看全部"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"使用「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」分享"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"分享對象"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"開啟"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"關閉"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"搜尋"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fn +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"空白鍵"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter 鍵"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"刪除"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-zh-rTW/strings.xml b/appcompat/appcompat/src/main/res/values-zh-rTW/strings.xml
index 35a896e..a036570 100644
--- a/appcompat/appcompat/src/main/res/values-zh-rTW/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-zh-rTW/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"完成"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"瀏覽首頁"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"向上瀏覽"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"更多選項"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"收合"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"搜尋"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"搜尋…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"搜尋查詢"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"清除查詢"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"提交查詢"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"語音搜尋"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"選擇應用程式"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"查看全部"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"與「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」分享"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"分享對象"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"開啟"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"關閉"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"搜尋"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Menu +"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta +"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl +"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt +"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift +"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym +"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Fn +"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"空格鍵"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"Enter 鍵"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"Delete 鍵"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"完成"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"瀏覽首頁"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"向上瀏覽"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"更多選項"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"收合"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"搜尋"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"搜尋…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"搜尋查詢"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"清除查詢"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"提交查詢"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"語音搜尋"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"選擇應用程式"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"查看全部"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"與「<xliff:g id="APPLICATION_NAME">%s</xliff:g>」分享"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"分享對象"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"開啟"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"關閉"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"搜尋"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Menu +"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta +"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl +"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt +"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift +"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym +"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Fn +"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"空格鍵"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"Enter 鍵"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"Delete 鍵"</string>
 </resources>
diff --git a/appcompat/appcompat/src/main/res/values-zu/strings.xml b/appcompat/appcompat/src/main/res/values-zu/strings.xml
index 1158826..76108708 100644
--- a/appcompat/appcompat/src/main/res/values-zu/strings.xml
+++ b/appcompat/appcompat/src/main/res/values-zu/strings.xml
@@ -16,32 +16,32 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="abc_action_mode_done" msgid="2571498368472823490">"Kwenziwe"</string>
-    <string name="abc_action_bar_home_description" msgid="7903180715631665059">"Zulazulela ekhaya"</string>
-    <string name="abc_action_bar_up_description" msgid="6794660482873516081">"Zulazulela phezulu"</string>
-    <string name="abc_action_menu_overflow_description" msgid="1155814932213556626">"Ezinye izinketho"</string>
-    <string name="abc_toolbar_collapse_description" msgid="6389460216547290468">"Goqa"</string>
-    <string name="abc_searchview_description_search" msgid="5466662225065974044">"Sesha"</string>
-    <string name="abc_search_hint" msgid="940844115270746197">"Sesha…"</string>
-    <string name="abc_searchview_description_query" msgid="908784302972860853">"Sesha umbuzo"</string>
-    <string name="abc_searchview_description_clear" msgid="1769270744562318534">"Sula inkinga"</string>
-    <string name="abc_searchview_description_submit" msgid="8203855622131699655">"Thumela umbuzo"</string>
-    <string name="abc_searchview_description_voice" msgid="3478748990613108725">"Ukusesha ngezwi"</string>
-    <string name="abc_activitychooserview_choose_application" msgid="1798588241954930982">"Khetha insiza"</string>
-    <string name="abc_activity_chooser_view_see_all" msgid="3732416590524162402">"Buka konke"</string>
-    <string name="abc_shareactionprovider_share_with_application" msgid="9009661856846212431">"Yabelana ne-<xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="abc_shareactionprovider_share_with" msgid="2650565705514630347">"Yabelana no"</string>
-    <string name="abc_capital_on" msgid="7831734969929204599">"VULA"</string>
-    <string name="abc_capital_off" msgid="3403923230105792483">"VALA"</string>
-    <string name="search_menu_title" msgid="730395136688082741">"Sesha"</string>
-    <string name="abc_prepend_shortcut_label" msgid="3570106412128999382">"Imenyu+"</string>
-    <string name="abc_menu_meta_shortcut_label" msgid="8046416353848716905">"Meta+"</string>
-    <string name="abc_menu_ctrl_shortcut_label" msgid="944415252197684443">"Ctrl+"</string>
-    <string name="abc_menu_alt_shortcut_label" msgid="5725160506500770567">"Alt+"</string>
-    <string name="abc_menu_shift_shortcut_label" msgid="3271697756921353410">"Shift+"</string>
-    <string name="abc_menu_sym_shortcut_label" msgid="8327365089695024394">"Sym+"</string>
-    <string name="abc_menu_function_shortcut_label" msgid="4974283687810130415">"Function+"</string>
-    <string name="abc_menu_space_shortcut_label" msgid="2304645930658438191">"space"</string>
-    <string name="abc_menu_enter_shortcut_label" msgid="6840127756824236027">"enter"</string>
-    <string name="abc_menu_delete_shortcut_label" msgid="129742188101734366">"delete"</string>
+    <string name="abc_action_mode_done" msgid="4692188335987374352">"Kwenziwe"</string>
+    <string name="abc_action_bar_home_description" msgid="5976598919945601918">"Zulazulela ekhaya"</string>
+    <string name="abc_action_bar_up_description" msgid="8388173803310557296">"Zulazulela phezulu"</string>
+    <string name="abc_action_menu_overflow_description" msgid="3937310113216875497">"Ezinye izinketho"</string>
+    <string name="abc_toolbar_collapse_description" msgid="1656852541809559762">"Goqa"</string>
+    <string name="abc_searchview_description_search" msgid="3417662926640357176">"Sesha"</string>
+    <string name="abc_search_hint" msgid="7208076849092622260">"Sesha…"</string>
+    <string name="abc_searchview_description_query" msgid="693312494995508443">"Sesha umbuzo"</string>
+    <string name="abc_searchview_description_clear" msgid="3741173234950517107">"Sula inkinga"</string>
+    <string name="abc_searchview_description_submit" msgid="1486535517437947103">"Thumela umbuzo"</string>
+    <string name="abc_searchview_description_voice" msgid="2293578557972875415">"Ukusesha ngezwi"</string>
+    <string name="abc_activitychooserview_choose_application" msgid="2165779757652331008">"Khetha insiza"</string>
+    <string name="abc_activity_chooser_view_see_all" msgid="1189761859438369441">"Buka konke"</string>
+    <string name="abc_shareactionprovider_share_with_application" msgid="9055268688411532828">"Yabelana ne-<xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="abc_shareactionprovider_share_with" msgid="8875138169939072951">"Yabelana no"</string>
+    <string name="abc_capital_on" msgid="884982626291842264">"VULA"</string>
+    <string name="abc_capital_off" msgid="4215997306490295099">"VALA"</string>
+    <string name="search_menu_title" msgid="6264217191555673260">"Sesha"</string>
+    <string name="abc_prepend_shortcut_label" msgid="5520303668377388990">"Imenyu+"</string>
+    <string name="abc_menu_meta_shortcut_label" msgid="4192209724446364286">"Meta+"</string>
+    <string name="abc_menu_ctrl_shortcut_label" msgid="2223301931652355242">"Ctrl+"</string>
+    <string name="abc_menu_alt_shortcut_label" msgid="8833365367933412986">"Alt+"</string>
+    <string name="abc_menu_shift_shortcut_label" msgid="4741552369836443843">"Shift+"</string>
+    <string name="abc_menu_sym_shortcut_label" msgid="6180552449598693998">"Sym+"</string>
+    <string name="abc_menu_function_shortcut_label" msgid="375214403600139847">"Function+"</string>
+    <string name="abc_menu_space_shortcut_label" msgid="5473865519181928982">"space"</string>
+    <string name="abc_menu_enter_shortcut_label" msgid="7986526966204849475">"enter"</string>
+    <string name="abc_menu_delete_shortcut_label" msgid="838001238306846836">"delete"</string>
 </resources>
diff --git a/autofill/autofill/api/1.1.0-alpha01.txt b/autofill/autofill/api/1.1.0-alpha01.txt
index ba9f0ae..e83a39f 100644
--- a/autofill/autofill/api/1.1.0-alpha01.txt
+++ b/autofill/autofill/api/1.1.0-alpha01.txt
@@ -60,3 +60,47 @@
 
 }
 
+package androidx.autofill.inline.common {
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class ImageViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class ImageViewStyle.Builder {
+    ctor public ImageViewStyle.Builder();
+    method public androidx.autofill.inline.common.ImageViewStyle build();
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setScaleType(android.widget.ImageView.ScaleType);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class TextViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class TextViewStyle.Builder {
+    ctor public TextViewStyle.Builder();
+    method public androidx.autofill.inline.common.TextViewStyle build();
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextColor(@ColorInt int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextSize(float);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTypeface(String, int);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public class ViewStyle {
+  }
+
+  public static final class ViewStyle.Builder {
+    ctor public ViewStyle.Builder();
+    method public androidx.autofill.inline.common.ViewStyle build();
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setPadding(int, int, int, int);
+  }
+
+}
+
diff --git a/autofill/autofill/api/current.txt b/autofill/autofill/api/current.txt
index ba9f0ae..e83a39f 100644
--- a/autofill/autofill/api/current.txt
+++ b/autofill/autofill/api/current.txt
@@ -60,3 +60,47 @@
 
 }
 
+package androidx.autofill.inline.common {
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class ImageViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class ImageViewStyle.Builder {
+    ctor public ImageViewStyle.Builder();
+    method public androidx.autofill.inline.common.ImageViewStyle build();
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setScaleType(android.widget.ImageView.ScaleType);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class TextViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class TextViewStyle.Builder {
+    ctor public TextViewStyle.Builder();
+    method public androidx.autofill.inline.common.TextViewStyle build();
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextColor(@ColorInt int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextSize(float);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTypeface(String, int);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public class ViewStyle {
+  }
+
+  public static final class ViewStyle.Builder {
+    ctor public ViewStyle.Builder();
+    method public androidx.autofill.inline.common.ViewStyle build();
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setPadding(int, int, int, int);
+  }
+
+}
+
diff --git a/autofill/autofill/api/public_plus_experimental_1.1.0-alpha01.txt b/autofill/autofill/api/public_plus_experimental_1.1.0-alpha01.txt
index ba9f0ae..e83a39f 100644
--- a/autofill/autofill/api/public_plus_experimental_1.1.0-alpha01.txt
+++ b/autofill/autofill/api/public_plus_experimental_1.1.0-alpha01.txt
@@ -60,3 +60,47 @@
 
 }
 
+package androidx.autofill.inline.common {
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class ImageViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class ImageViewStyle.Builder {
+    ctor public ImageViewStyle.Builder();
+    method public androidx.autofill.inline.common.ImageViewStyle build();
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setScaleType(android.widget.ImageView.ScaleType);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class TextViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class TextViewStyle.Builder {
+    ctor public TextViewStyle.Builder();
+    method public androidx.autofill.inline.common.TextViewStyle build();
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextColor(@ColorInt int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextSize(float);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTypeface(String, int);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public class ViewStyle {
+  }
+
+  public static final class ViewStyle.Builder {
+    ctor public ViewStyle.Builder();
+    method public androidx.autofill.inline.common.ViewStyle build();
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setPadding(int, int, int, int);
+  }
+
+}
+
diff --git a/autofill/autofill/api/public_plus_experimental_current.txt b/autofill/autofill/api/public_plus_experimental_current.txt
index ba9f0ae..e83a39f 100644
--- a/autofill/autofill/api/public_plus_experimental_current.txt
+++ b/autofill/autofill/api/public_plus_experimental_current.txt
@@ -60,3 +60,47 @@
 
 }
 
+package androidx.autofill.inline.common {
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class ImageViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class ImageViewStyle.Builder {
+    ctor public ImageViewStyle.Builder();
+    method public androidx.autofill.inline.common.ImageViewStyle build();
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setScaleType(android.widget.ImageView.ScaleType);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class TextViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class TextViewStyle.Builder {
+    ctor public TextViewStyle.Builder();
+    method public androidx.autofill.inline.common.TextViewStyle build();
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextColor(@ColorInt int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextSize(float);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTypeface(String, int);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public class ViewStyle {
+  }
+
+  public static final class ViewStyle.Builder {
+    ctor public ViewStyle.Builder();
+    method public androidx.autofill.inline.common.ViewStyle build();
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setPadding(int, int, int, int);
+  }
+
+}
+
diff --git a/autofill/autofill/api/restricted_1.1.0-alpha01.txt b/autofill/autofill/api/restricted_1.1.0-alpha01.txt
index ba9f0ae..e83a39f 100644
--- a/autofill/autofill/api/restricted_1.1.0-alpha01.txt
+++ b/autofill/autofill/api/restricted_1.1.0-alpha01.txt
@@ -60,3 +60,47 @@
 
 }
 
+package androidx.autofill.inline.common {
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class ImageViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class ImageViewStyle.Builder {
+    ctor public ImageViewStyle.Builder();
+    method public androidx.autofill.inline.common.ImageViewStyle build();
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setScaleType(android.widget.ImageView.ScaleType);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class TextViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class TextViewStyle.Builder {
+    ctor public TextViewStyle.Builder();
+    method public androidx.autofill.inline.common.TextViewStyle build();
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextColor(@ColorInt int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextSize(float);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTypeface(String, int);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public class ViewStyle {
+  }
+
+  public static final class ViewStyle.Builder {
+    ctor public ViewStyle.Builder();
+    method public androidx.autofill.inline.common.ViewStyle build();
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setPadding(int, int, int, int);
+  }
+
+}
+
diff --git a/autofill/autofill/api/restricted_current.txt b/autofill/autofill/api/restricted_current.txt
index ba9f0ae..e83a39f 100644
--- a/autofill/autofill/api/restricted_current.txt
+++ b/autofill/autofill/api/restricted_current.txt
@@ -60,3 +60,47 @@
 
 }
 
+package androidx.autofill.inline.common {
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class ImageViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class ImageViewStyle.Builder {
+    ctor public ImageViewStyle.Builder();
+    method public androidx.autofill.inline.common.ImageViewStyle build();
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.ImageViewStyle.Builder setScaleType(android.widget.ImageView.ScaleType);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public final class TextViewStyle extends androidx.autofill.inline.common.ViewStyle {
+  }
+
+  public static final class TextViewStyle.Builder {
+    ctor public TextViewStyle.Builder();
+    method public androidx.autofill.inline.common.TextViewStyle build();
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setPadding(int, int, int, int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextColor(@ColorInt int);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTextSize(float);
+    method public androidx.autofill.inline.common.TextViewStyle.Builder setTypeface(String, int);
+  }
+
+  @RequiresApi(api=android.os.Build.VERSION_CODES.Q) public class ViewStyle {
+  }
+
+  public static final class ViewStyle.Builder {
+    ctor public ViewStyle.Builder();
+    method public androidx.autofill.inline.common.ViewStyle build();
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackground(android.graphics.drawable.Icon);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setBackgroundColor(int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setLayoutMargin(int, int, int, int);
+    method public androidx.autofill.inline.common.ViewStyle.Builder setPadding(int, int, int, int);
+  }
+
+}
+
diff --git a/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/ImageViewStyleTest.java b/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/ImageViewStyleTest.java
new file mode 100644
index 0000000..e5bdc90
--- /dev/null
+++ b/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/ImageViewStyleTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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.autofill.inline.common;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.Icon;
+import android.widget.ImageView;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = 29) // Needed only on 29 and above
+public class ImageViewStyleTest {
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getInstrumentation().getContext();
+    }
+
+    @Test
+    public void testStyleWithNothing() {
+        ImageViewStyle.Builder builder = new ImageViewStyle.Builder();
+        ImageViewStyle style = builder.build();
+        ImageView imageView = new ImageView(mContext);
+        style.applyStyleOnImageViewIfValid(imageView);
+    }
+
+    @Test
+    public void testStyleWithEverything() {
+        ImageViewStyle.Builder builder = new ImageViewStyle.Builder();
+        ImageViewStyle style = builder
+                .setScaleType(ImageView.ScaleType.FIT_START)
+                .setPadding(1, 2, 3, 4)
+                .setLayoutMargin(5, 6, 7, 8)
+                .setBackgroundColor(Color.YELLOW)
+                .build();
+        ImageView imageView = new ImageView(mContext);
+        imageView.setImageIcon(Icon.createWithResource(mContext,
+                androidx.autofill.test.R.drawable.ic_settings));
+        style.applyStyleOnImageViewIfValid(imageView);
+
+        Assert.assertEquals(ImageView.ScaleType.FIT_START, imageView.getScaleType());
+
+        TestUtils.verifyPadding(imageView, 1, 2, 3, 4);
+        TestUtils.verifyLayoutMargin(imageView, 5, 6, 7, 8);
+        TestUtils.verifyBackgroundColor(imageView, Color.YELLOW);
+    }
+}
diff --git a/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/TestUtils.java b/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/TestUtils.java
new file mode 100644
index 0000000..38cde01
--- /dev/null
+++ b/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/TestUtils.java
@@ -0,0 +1,70 @@
+/*
+ * 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.autofill.inline.common;
+
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+
+import org.junit.Assert;
+
+public final class TestUtils {
+
+    public static void verifyPadding(View view, int left, int top, int right, int bottom) {
+        Assert.assertEquals(left, view.getPaddingLeft());
+        Assert.assertEquals(top, view.getPaddingTop());
+        Assert.assertEquals(right, view.getPaddingRight());
+        Assert.assertEquals(bottom, view.getPaddingBottom());
+    }
+
+    public static void verifyLayoutMargin(View view, int left, int top, int right, int bottom) {
+        Assert.assertTrue(view.getLayoutParams() instanceof ViewGroup.MarginLayoutParams);
+        ViewGroup.MarginLayoutParams marginLayoutParams =
+                (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+        Assert.assertEquals(left, marginLayoutParams.leftMargin);
+        Assert.assertEquals(top, marginLayoutParams.topMargin);
+        Assert.assertEquals(right, marginLayoutParams.rightMargin);
+        Assert.assertEquals(bottom, marginLayoutParams.bottomMargin);
+    }
+
+    public static void verifyBackgroundColor(View view, @ColorInt int color) {
+        Drawable drawable = view.getBackground();
+        Assert.assertTrue(drawable instanceof ColorDrawable);
+        Assert.assertEquals(color, ((ColorDrawable) drawable).getColor());
+    }
+
+    public static void verifyTextSize(Context context, TextView textView, float spSize) {
+        float density = context.getResources().getDisplayMetrics().density;
+        Assert.assertEquals(spSize, toDp(density, textView.getTextSize()), 0.001);
+    }
+
+    private static int toDp(float density, float pixel) {
+        return (int) (pixel / density);
+    }
+
+    private static int toPixel(float density, int dp) {
+        return (int) (dp * density) + 1;
+    }
+
+    private TestUtils() {
+    }
+}
diff --git a/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/TextViewStyleTest.java b/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/TextViewStyleTest.java
new file mode 100644
index 0000000..386ca71
--- /dev/null
+++ b/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/TextViewStyleTest.java
@@ -0,0 +1,78 @@
+/*
+ * 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.autofill.inline.common;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.widget.TextView;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = 29) // Needed only on 29 and above
+public class TextViewStyleTest {
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getInstrumentation().getContext();
+    }
+
+    @Test
+    public void testStyleWithNothing() {
+        TextViewStyle.Builder builder = new TextViewStyle.Builder();
+        TextViewStyle style = builder.build();
+        TextView textView = new TextView(mContext);
+        textView.setText("Hello");
+        style.applyStyleOnTextViewIfValid(textView);
+    }
+
+    @Test
+    public void testStyleWithEverything() {
+        TextViewStyle.Builder builder = new TextViewStyle.Builder();
+        TextViewStyle style = builder
+                .setTextSize(16)
+                .setTextColor(Color.GREEN)
+                .setTypeface("sans", Typeface.ITALIC)
+                .setPadding(1, 2, 3, 4)
+                .setLayoutMargin(5, 6, 7, 8)
+                .setBackgroundColor(Color.YELLOW)
+                .build();
+        TextView textView = new TextView(mContext);
+        textView.setText("Hello");
+        style.applyStyleOnTextViewIfValid(textView);
+
+        Assert.assertEquals(textView.getCurrentTextColor(), Color.GREEN);
+        TestUtils.verifyTextSize(mContext, textView, 16);
+        // We can't verify font family...
+        Assert.assertTrue(textView.getTypeface().isItalic());
+
+        TestUtils.verifyPadding(textView, 1, 2, 3, 4);
+        TestUtils.verifyLayoutMargin(textView, 5, 6, 7, 8);
+        TestUtils.verifyBackgroundColor(textView, Color.YELLOW);
+    }
+}
diff --git a/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/ViewStyleTest.java b/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/ViewStyleTest.java
new file mode 100644
index 0000000..29c7d6b
--- /dev/null
+++ b/autofill/autofill/src/androidTest/java/androidx/autofill/inline/common/ViewStyleTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.autofill.inline.common;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.Icon;
+import android.graphics.drawable.RippleDrawable;
+import android.view.View;
+
+import androidx.autofill.R;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = 29) // Needed only on 29 and above
+public class ViewStyleTest {
+
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getInstrumentation().getContext();
+    }
+
+    @Test
+    public void testStyleWithNothing() {
+        ViewStyle.Builder builder = new ViewStyle.Builder();
+        ViewStyle style = builder.build();
+        View view = new View(mContext);
+        style.applyStyleOnViewIfValid(view);
+    }
+
+    @Test
+    public void testStyleWithPaddingAndBackgroundColor() {
+        ViewStyle.Builder builder = new ViewStyle.Builder();
+        ViewStyle style = builder
+                .setPadding(1, 2, 3, 4)
+                .setBackgroundColor(Color.BLUE)
+                .build();
+        View view = new View(mContext);
+        style.applyStyleOnViewIfValid(view);
+        TestUtils.verifyPadding(view, 1, 2, 3, 4);
+        TestUtils.verifyBackgroundColor(view, Color.BLUE);
+    }
+
+    @Test
+    public void testStyleWithLayoutMarginAndBackground() {
+        Icon backgroundIcon = Icon.createWithResource(mContext,
+                R.drawable.autofill_inline_suggestion_chip_background);
+        ViewStyle.Builder builder = new ViewStyle.Builder();
+        ViewStyle style = builder
+                .setLayoutMargin(5, 6, 7, 8)
+                .setBackground(backgroundIcon)
+                .build();
+        View view = new View(mContext);
+        style.applyStyleOnViewIfValid(view);
+        TestUtils.verifyLayoutMargin(view, 5, 6, 7, 8);
+        Assert.assertTrue(view.getBackground() instanceof RippleDrawable);
+    }
+
+    @Test
+    public void testStyleWithEverything() {
+        Icon backgroundIcon = Icon.createWithResource(mContext,
+                R.drawable.autofill_inline_suggestion_chip_background);
+        ViewStyle.Builder builder = new ViewStyle.Builder();
+        ViewStyle style = builder
+                .setPadding(1, 2, 3, 4)
+                .setLayoutMargin(5, 6, 7, 8)
+                .setBackground(backgroundIcon)
+                .setBackgroundColor(Color.YELLOW)
+                .build();
+        View view = new View(mContext);
+        style.applyStyleOnViewIfValid(view);
+        TestUtils.verifyPadding(view, 1, 2, 3, 4);
+        TestUtils.verifyLayoutMargin(view, 5, 6, 7, 8);
+        // When both background and background color are set, the background color takes precedence.
+        TestUtils.verifyBackgroundColor(view, Color.YELLOW);
+    }
+}
diff --git a/autofill/autofill/src/main/java/androidx/autofill/inline/common/BundledStyle.java b/autofill/autofill/src/main/java/androidx/autofill/inline/common/BundledStyle.java
new file mode 100644
index 0000000..b5e0523
--- /dev/null
+++ b/autofill/autofill/src/main/java/androidx/autofill/inline/common/BundledStyle.java
@@ -0,0 +1,104 @@
+/*
+ * 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.autofill.inline.common;
+
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+
+import android.os.Build;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+
+/**
+ * Base class representing a type that encodes the style information, and can be exported
+ * to a Bundle.
+ *
+ * @hide
+ */
+@RestrictTo(LIBRARY)
+@RequiresApi(api = Build.VERSION_CODES.Q) //TODO(b/147116534): Update to R.
+public abstract class BundledStyle {
+
+    @NonNull
+    protected final Bundle mBundle;
+
+    protected BundledStyle(@NonNull Bundle bundle) {
+        mBundle = bundle;
+    }
+
+    /**
+     * Returns the wrapped bundle containing the style specifications.
+     *
+     * @hide
+     */
+    @RestrictTo(LIBRARY)
+    @NonNull
+    public final Bundle getBundle() {
+        return mBundle;
+    }
+
+    /**
+     * Returns true if the wrapped bundle is valid according to the style key.
+     *
+     * @hide
+     */
+    @RestrictTo(LIBRARY)
+    public boolean isValid() {
+        return mBundle != null && mBundle.getBoolean(getStyleKey(), false);
+    }
+
+    /**
+     * @throws IllegalStateException if the wrapped bundle is determined invalid by
+     *                               {@link #isValid()}.
+     * @hide
+     */
+    @RestrictTo(LIBRARY)
+    public void assertIsValid() {
+        if (!isValid()) {
+            throw new IllegalStateException("Invalid style, missing bundle key " + getStyleKey());
+        }
+    }
+
+    /**
+     * Allows the subclass to define their own style key by implementing this method.
+     */
+    @NonNull
+    protected abstract String getStyleKey();
+
+    /**
+     * Base builder class for the {@link BundledStyle}.
+     *
+     * @param <T> represents the type that this builder can build.
+     */
+    public abstract static class Builder<T extends BundledStyle> {
+
+        @NonNull
+        protected final Bundle mBundle = new Bundle();
+
+        protected Builder(@NonNull String style) {
+            mBundle.putBoolean(style, true);
+        }
+
+        /**
+         * Returns a subclass of {@link BundledStyle} built by this builder.
+         */
+        @NonNull
+        public abstract T build();
+    }
+}
diff --git a/autofill/autofill/src/main/java/androidx/autofill/inline/common/ImageViewStyle.java b/autofill/autofill/src/main/java/androidx/autofill/inline/common/ImageViewStyle.java
new file mode 100644
index 0000000..c1de846
--- /dev/null
+++ b/autofill/autofill/src/main/java/androidx/autofill/inline/common/ImageViewStyle.java
@@ -0,0 +1,122 @@
+/*
+ * 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.autofill.inline.common;
+
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.core.util.Preconditions;
+
+/**
+ * Specifies the style for an  {@link ImageView}.
+ */
+@RequiresApi(api = Build.VERSION_CODES.Q) //TODO(b/147116534): Update to R.
+public final class ImageViewStyle extends ViewStyle {
+    private static final String TAG = "ImageViewStyle";
+
+    private static final String KEY_IMAGE_VIEW_STYLE = "image_view_style";
+    private static final String KEY_IMAGE_SCALE_TYPE = "image_scale_type";
+
+    /**
+     * This is made public so it can be used by the renderer to converted the received bundle to
+     * a style. It does not validate the provided bundle. {@link #isValid()} or
+     * {@link #assertIsValid()} can be used for validation.
+     *
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public ImageViewStyle(@NonNull Bundle bundle) {
+        super(bundle);
+    }
+
+    /**
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    @NonNull
+    @Override
+    protected String getStyleKey() {
+        return KEY_IMAGE_VIEW_STYLE;
+    }
+
+    /**
+     * Applies the specified style on the {@code imageView}.
+     *
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public void applyStyleOnImageViewIfValid(@NonNull ImageView imageView) {
+        if (!isValid()) {
+            return;
+        }
+        super.applyStyleOnViewIfValid(imageView);
+        if (mBundle.containsKey(KEY_IMAGE_SCALE_TYPE)) {
+            String scaleTypeString = mBundle.getString(KEY_IMAGE_SCALE_TYPE);
+            if (scaleTypeString != null) {
+                try {
+                    imageView.setScaleType(ImageView.ScaleType.valueOf(scaleTypeString));
+                } catch (IllegalArgumentException e) {
+                    Log.w(TAG, "Cannot recognize the scale type: " + scaleTypeString);
+                }
+            }
+        }
+    }
+
+    /**
+     * Builder for the {@link ImageViewStyle}.
+     */
+    public static final class Builder extends BaseBuilder<ImageViewStyle, Builder> {
+
+        public Builder() {
+            super(KEY_IMAGE_VIEW_STYLE);
+        }
+
+        /**
+         * @hide
+         */
+        @RestrictTo(RestrictTo.Scope.LIBRARY)
+        @NonNull
+        @Override
+        protected Builder getThis() {
+            return this;
+        }
+
+        /**
+         * Sets the scale type of the image view.
+         *
+         * @param scaleType The desired scaling mode.
+         * @see ImageView#setScaleType(ImageView.ScaleType)
+         */
+        @NonNull
+        public Builder setScaleType(@NonNull ImageView.ScaleType scaleType) {
+            Preconditions.checkNotNull(scaleType, "scaleType should not be null");
+            mBundle.putString(KEY_IMAGE_SCALE_TYPE, scaleType.name());
+            return this;
+        }
+
+        @NonNull
+        @Override
+        public ImageViewStyle build() {
+            return new ImageViewStyle(mBundle);
+        }
+    }
+}
diff --git a/autofill/autofill/src/main/java/androidx/autofill/inline/common/TextViewStyle.java b/autofill/autofill/src/main/java/androidx/autofill/inline/common/TextViewStyle.java
new file mode 100644
index 0000000..8ddce3d
--- /dev/null
+++ b/autofill/autofill/src/main/java/androidx/autofill/inline/common/TextViewStyle.java
@@ -0,0 +1,156 @@
+/*
+ * 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.autofill.inline.common;
+
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.core.util.Preconditions;
+
+/**
+ * Specifies the style for a {@link TextView}.
+ */
+@RequiresApi(api = Build.VERSION_CODES.Q) //TODO(b/147116534): Update to R.
+public final class TextViewStyle extends ViewStyle {
+
+    private static final String KEY_TEXT_VIEW_STYLE = "text_view_style";
+    private static final String KEY_TEXT_SIZE = "text_size";
+    private static final String KEY_TEXT_COLOR = "text_color";
+    private static final String KEY_TEXT_FONT_FAMILY = "text_font_family";
+    private static final String KEY_TEXT_FONT_STYLE = "text_font_style";
+
+    /**
+     * This is made public so it can be used by the renderer to converted the received bundle to
+     * a style. It does not validate the provided bundle. {@link #isValid()} or
+     * {@link #assertIsValid()} can be used for validation.
+     *
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public TextViewStyle(@NonNull Bundle bundle) {
+        super(bundle);
+    }
+
+    /**
+     * Applies the specified style on the {@code textView}.
+     *
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public void applyStyleOnTextViewIfValid(@NonNull TextView textView) {
+        if (!isValid()) {
+            return;
+        }
+        super.applyStyleOnViewIfValid(textView);
+        if (mBundle.containsKey(KEY_TEXT_COLOR)) {
+            textView.setTextColor(mBundle.getInt(KEY_TEXT_COLOR));
+        }
+        if (mBundle.containsKey(KEY_TEXT_SIZE)) {
+            textView.setTextSize(mBundle.getFloat(KEY_TEXT_SIZE));
+        }
+        if (mBundle.containsKey(KEY_TEXT_FONT_FAMILY)) {
+            final String fontFamily = mBundle.getString(KEY_TEXT_FONT_FAMILY);
+            if (!TextUtils.isEmpty(fontFamily)) {
+                textView.setTypeface(
+                        Typeface.create(fontFamily, mBundle.getInt(KEY_TEXT_FONT_STYLE)));
+            }
+        }
+    }
+
+    /**
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    @NonNull
+    @Override
+    protected String getStyleKey() {
+        return KEY_TEXT_VIEW_STYLE;
+    }
+
+    /**
+     * Builder for the {@link TextViewStyle}.
+     */
+    public static final class Builder extends BaseBuilder<TextViewStyle, Builder> {
+        public Builder() {
+            super(KEY_TEXT_VIEW_STYLE);
+        }
+
+        /**
+         * @hide
+         */
+        @RestrictTo(RestrictTo.Scope.LIBRARY)
+        @NonNull
+        @Override
+        protected Builder getThis() {
+            return this;
+        }
+
+        /**
+         * Specifies the text size, in sp.
+         *
+         * @param textSize The scaled pixel size.
+         * @see TextView#setTextSize(float)
+         */
+        @NonNull
+        public Builder setTextSize(float textSize) {
+            mBundle.putFloat(KEY_TEXT_SIZE, textSize);
+            return this;
+        }
+
+        /**
+         * Specifies the text color.
+         *
+         * @param textColor A color value in the form 0xAARRGGBB.
+         * @see TextView#setTextColor(int)
+         */
+        @NonNull
+        public Builder setTextColor(@ColorInt int textColor) {
+            mBundle.putInt(KEY_TEXT_COLOR, textColor);
+            return this;
+        }
+
+        /**
+         * Specifies the text font family and style. If the font family can not be found/loaded from
+         * the renderer process, it may fallback to the default system font.
+         *
+         * @param fontFamily the font family for the type face
+         * @param fontStyle  the style for the type face.
+         * @see Typeface#create(String, int)
+         * @see TextView#setTypeface(Typeface, int)
+         */
+        @NonNull
+        public Builder setTypeface(@NonNull String fontFamily, int fontStyle) {
+            Preconditions.checkNotNull(fontFamily, "fontFamily should not be null");
+            mBundle.putString(KEY_TEXT_FONT_FAMILY, fontFamily);
+            mBundle.putInt(KEY_TEXT_FONT_STYLE, fontStyle);
+            return this;
+        }
+
+        @NonNull
+        @Override
+        public TextViewStyle build() {
+            return new TextViewStyle(mBundle);
+        }
+    }
+}
diff --git a/autofill/autofill/src/main/java/androidx/autofill/inline/common/ViewStyle.java b/autofill/autofill/src/main/java/androidx/autofill/inline/common/ViewStyle.java
new file mode 100644
index 0000000..d37225a
--- /dev/null
+++ b/autofill/autofill/src/main/java/androidx/autofill/inline/common/ViewStyle.java
@@ -0,0 +1,217 @@
+/*
+ * 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.autofill.inline.common;
+
+import android.graphics.drawable.Icon;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.core.util.Preconditions;
+
+/**
+ * Specifies the style for a {@link View} or a {@link android.view.ViewGroup}.
+ */
+@RequiresApi(api = Build.VERSION_CODES.Q) //TODO(b/147116534): Update to R.
+public class ViewStyle extends BundledStyle {
+
+    private static final String KEY_VIEW_STYLE = "view_style";
+
+    private static final String KEY_BACKGROUND = "background";
+    private static final String KEY_BACKGROUND_COLOR = "background_color";
+    private static final String KEY_PADDING = "padding";
+    private static final String KEY_LAYOUT_MARGIN = "layout_margin";
+
+    /**
+     * This is made public so it can be used by the renderer to converted the received bundle to
+     * a style. It does not validate the provided bundle. {@link #isValid()} or
+     * {@link #assertIsValid()} can be used for validation.
+     *
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public ViewStyle(@NonNull Bundle bundle) {
+        super(bundle);
+    }
+
+    /**
+     * Applies the specified style on the {@code view}.
+     *
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public void applyStyleOnViewIfValid(@NonNull View view) {
+        if (!isValid()) {
+            return;
+        }
+        if (mBundle.containsKey(KEY_BACKGROUND)) {
+            Icon background = mBundle.getParcelable(KEY_BACKGROUND);
+            if (background != null) {
+                view.setBackground(background.loadDrawable(view.getContext()));
+            }
+        }
+        if (mBundle.containsKey(KEY_BACKGROUND_COLOR)) {
+            int color = mBundle.getInt(KEY_BACKGROUND_COLOR);
+            view.setBackgroundColor(color);
+        }
+        if (mBundle.containsKey(KEY_PADDING)) {
+            int[] padding = mBundle.getIntArray(KEY_PADDING);
+            if (padding != null && padding.length == 4) {
+                view.setPadding(padding[0], padding[1], padding[2], padding[3]);
+            }
+        }
+        if (mBundle.containsKey(KEY_LAYOUT_MARGIN)) {
+            int[] layoutMargin = mBundle.getIntArray(KEY_LAYOUT_MARGIN);
+            if (layoutMargin != null && layoutMargin.length == 4) {
+                ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
+                if (layoutParams == null) {
+                    layoutParams = new ViewGroup.MarginLayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.MATCH_PARENT);
+                } else if (!(layoutParams instanceof ViewGroup.MarginLayoutParams)) {
+                    layoutParams = new ViewGroup.MarginLayoutParams(layoutParams);
+                }
+                ((ViewGroup.MarginLayoutParams) layoutParams).setMargins(layoutMargin[0],
+                        layoutMargin[1], layoutMargin[2], layoutMargin[3]);
+                view.setLayoutParams(layoutParams);
+            }
+        }
+    }
+
+    /**
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    @NonNull
+    @Override
+    protected String getStyleKey() {
+        return KEY_VIEW_STYLE;
+    }
+
+    /**
+     * An abstract builder class for any subclass of {@link ViewStyle}.
+     *
+     * @param <T> represents the type this builder can build.
+     * @param <B> represents the subclass of {@link ViewStyle.BaseBuilder}.
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public abstract static class BaseBuilder<T extends ViewStyle,
+            B extends BaseBuilder<T, B>> extends BundledStyle.Builder<T> {
+
+        protected BaseBuilder(@NonNull String style) {
+            super(style);
+        }
+
+        /**
+         * Returns {@code this} with the actual type of the subclass, so the setter methods can
+         * be chained.
+         */
+        @NonNull
+        protected abstract B getThis();
+
+        /**
+         * Sets the background.
+         *
+         * @param icon The icon to use as the background
+         * @see android.graphics.drawable.Icon#loadDrawable(android.content.Context)
+         * @see android.view.View#setBackground(android.graphics.drawable.Drawable)
+         */
+        @NonNull
+        public B setBackground(@NonNull Icon icon) {
+            Preconditions.checkNotNull(icon, "background icon should not be null");
+            mBundle.putParcelable(KEY_BACKGROUND, icon);
+            return getThis();
+        }
+
+        /**
+         * Sets the background color, it will always override the {@link #setBackground(Icon)},
+         * regardless of which set method is call first.
+         *
+         * @param color the color of the background
+         * @see android.view.View#setBackgroundColor(int)
+         */
+        @NonNull
+        public B setBackgroundColor(@ColorInt int color) {
+            mBundle.putInt(KEY_BACKGROUND_COLOR, color);
+            return getThis();
+        }
+
+        /**
+         * Sets the padding.
+         *
+         * @param left   the left padding in pixels
+         * @param top    the top padding in pixels
+         * @param right  the right padding in pixels
+         * @param bottom the bottom padding in pixels
+         * @see android.view.View#setPadding(int, int, int, int)
+         */
+        @NonNull
+        public B setPadding(int left, int top, int right, int bottom) {
+            mBundle.putIntArray(KEY_PADDING, new int[]{left, top, right, bottom});
+            return getThis();
+        }
+
+        /**
+         * Sets the layout margin through the view's layout param.
+         *
+         * @param left   the left margin size
+         * @param top    the top margin size
+         * @param right  the right margin size
+         * @param bottom the bottom margin size
+         * @see android.view.ViewGroup.MarginLayoutParams#setMargins(int, int, int, int)
+         * @see android.view.View#setLayoutParams(android.view.ViewGroup.LayoutParams)
+         */
+        @NonNull
+        public B setLayoutMargin(int left, int top, int right,
+                int bottom) {
+            mBundle.putIntArray(KEY_LAYOUT_MARGIN, new int[]{left, top, right, bottom});
+            return getThis();
+        }
+    }
+
+    /**
+     * Builder for the {@link ViewStyle}.
+     */
+    public static final class Builder extends BaseBuilder<ViewStyle, Builder> {
+
+        public Builder() {
+            super(KEY_VIEW_STYLE);
+        }
+
+        /**
+         * @hide
+         */
+        @RestrictTo(RestrictTo.Scope.LIBRARY)
+        @NonNull
+        @Override
+        protected Builder getThis() {
+            return this;
+        }
+
+        @Override
+        @NonNull
+        public ViewStyle build() {
+            return new ViewStyle(mBundle);
+        }
+    }
+}
diff --git a/benchmark/common/src/androidTest/java/androidx/benchmark/MetricCaptureTest.kt b/benchmark/common/src/androidTest/java/androidx/benchmark/MetricCaptureTest.kt
new file mode 100644
index 0000000..f7b1caa
--- /dev/null
+++ b/benchmark/common/src/androidTest/java/androidx/benchmark/MetricCaptureTest.kt
@@ -0,0 +1,83 @@
+/*
+ * 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.benchmark
+
+import androidx.test.filters.SmallTest
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@SmallTest
+@RunWith(JUnit4::class)
+class AllocationCountCaptureTest {
+    class Allocator {
+        init {
+            count++
+        }
+
+        companion object {
+            private var count = 0
+
+            fun allocate(numberToAllocate: Int) {
+                count = 0
+                repeat(numberToAllocate) {
+                    Allocator()
+                }
+                assertEquals(numberToAllocate, count)
+            }
+        }
+    }
+
+    @Test
+    fun simple() {
+        AllocationCountCapture().verifyMedian(100..110) {
+            Allocator.allocate(100)
+        }
+    }
+
+    @Test
+    fun pauseResume() {
+        AllocationCountCapture().verifyMedian(100..110) {
+            Allocator.allocate(100)
+
+            capturePaused()
+            // these 1000 allocations shouldn't be counted, capture is paused!
+            Allocator.allocate(1000)
+            captureResumed()
+        }
+    }
+}
+
+/**
+ * Measure many times, and verify the median.
+ *
+ * This is done to reduce variance, e.g. from random background allocations
+ */
+private fun MetricCapture.verifyMedian(expected: IntRange, block: MetricCapture.() -> Unit) {
+    val results = List(200) {
+        captureStart()
+        block()
+        captureStop()
+    }.toLongArray()
+    val median = Stats(results, name).median
+    if (median !in expected) {
+        throw AssertionError(
+            "observed median $median, expected $expected, saw: " + results.joinToString()
+        )
+    }
+}
diff --git a/benchmark/common/src/main/java/androidx/benchmark/BenchmarkState.kt b/benchmark/common/src/main/java/androidx/benchmark/BenchmarkState.kt
index e6f3f59..9a5e7b8 100644
--- a/benchmark/common/src/main/java/androidx/benchmark/BenchmarkState.kt
+++ b/benchmark/common/src/main/java/androidx/benchmark/BenchmarkState.kt
@@ -18,6 +18,7 @@
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.app.Instrumentation
 import android.os.Build
 import android.os.Bundle
 import android.os.Debug
@@ -495,9 +496,20 @@
         return status
     }
 
-    private fun sendStatus(testName: String) {
+    private fun Instrumentation.addResultsCompat(bundle: Bundle) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            addResults(bundle)
+        } else {
+            // Before addResults() was added in the platform, we use sendStatus(). The constant '2'
+            // comes from IInstrumentationResultParser.StatusCodes.IN_PROGRESS, and signals the
+            // test infra that this is an "additional result" bundle, equivalent to addResults()
+            sendStatus(/* resultCode = */ 2, /* results = */ bundle)
+        }
+    }
+
+    private fun reportResultBundle(testName: String) {
         val bundle = getFullStatusReport(key = testName, includeStats = Arguments.outputEnable)
-        InstrumentationRegistry.getInstrumentation().sendStatus(Activity.RESULT_OK, bundle)
+        InstrumentationRegistry.getInstrumentation().addResultsCompat(bundle)
     }
 
     private fun sleepIfThermalThrottled(sleepSeconds: Long) = when {
@@ -523,7 +535,7 @@
     ) {
         checkState() // this method is triggered externally
         val fullTestName = "$PREFIX$simpleClassName.$methodName"
-        sendStatus(fullTestName)
+        reportResultBundle(fullTestName)
 
         ResultWriter.appendReport(
             getReport(
diff --git a/benchmark/common/src/main/java/androidx/benchmark/MetricCapture.kt b/benchmark/common/src/main/java/androidx/benchmark/MetricCapture.kt
index 6fdf204..997e295 100644
--- a/benchmark/common/src/main/java/androidx/benchmark/MetricCapture.kt
+++ b/benchmark/common/src/main/java/androidx/benchmark/MetricCapture.kt
@@ -16,8 +16,9 @@
 
 package androidx.benchmark
 
-internal abstract class MetricCapture {
+import android.os.Debug
 
+internal abstract class MetricCapture {
     abstract val name: String
 
     /**
@@ -58,16 +59,14 @@
 }
 
 internal class TimeCapture : MetricCapture() {
-
+    override val name: String = "timeNs"
     private var currentStarted = 0L
     private var currentPausedStarted = 0L
     private var currentTotalPaused = 0L
 
-    override var name: String = "timeNs"
-
     override fun captureStart() {
-        currentStarted = System.nanoTime()
         currentTotalPaused = 0
+        currentStarted = System.nanoTime()
     }
 
     override fun captureStop(): Long {
@@ -82,3 +81,30 @@
         currentTotalPaused += System.nanoTime() - currentPausedStarted
     }
 }
+
+@Suppress("DEPRECATION")
+internal class AllocationCountCapture : MetricCapture() {
+    override val name = "allocationCount"
+    private var currentPausedStarted = 0
+    private var currentTotalPaused = 0
+
+    override fun captureStart() {
+        currentTotalPaused = 0
+        Debug.startAllocCounting()
+    }
+
+    override fun captureStop(): Long {
+        Debug.stopAllocCounting()
+        return (Debug.getGlobalAllocCount() - currentTotalPaused).toLong()
+    }
+
+    override fun capturePaused() {
+        // Note - can't start/stop allocation counting to pause/resume, since that would clear
+        // the current counter (and is likely more disruptive than just querying count)
+        currentPausedStarted = Debug.getGlobalAllocCount()
+    }
+
+    override fun captureResumed() {
+        currentTotalPaused += Debug.getGlobalAllocCount() - currentPausedStarted
+    }
+}
diff --git a/biometric/biometric/src/main/res/values-af/strings.xml b/biometric/biometric/src/main/res/values-af/strings.xml
index 5189734..68f829e 100644
--- a/biometric/biometric/src/main/res/values-af/strings.xml
+++ b/biometric/biometric/src/main/res/values-af/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Raak die vingerafdruksensor"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nie herken nie"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Hulpboodskapgebied"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Vingerafdrukhardeware is nie beskikbaar nie."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Geen vingerafdrukke is geregistreer nie."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Hierdie toetstel het nie \'n vingerafdruksensor nie"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Vingerafdrukhandeling is deur gebruiker gekanselleer."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Te veel pogings. Probeer later weer."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Onbekende fout"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Gebruiker het stawing gekanselleer."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Gebruik wagwoord"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Raak die vingerafdruksensor"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nie herken nie"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Hulpboodskapgebied"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Vingerafdrukhardeware is nie beskikbaar nie."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Geen vingerafdrukke is geregistreer nie."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Hierdie toetstel het nie \'n vingerafdruksensor nie"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Vingerafdrukhandeling is deur gebruiker gekanselleer."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Te veel pogings. Probeer later weer."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Onbekende fout"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Gebruiker het stawing gekanselleer."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Gebruik wagwoord"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-am/strings.xml b/biometric/biometric/src/main/res/values-am/strings.xml
index 27e992a..201bdd0 100644
--- a/biometric/biometric/src/main/res/values-am/strings.xml
+++ b/biometric/biometric/src/main/res/values-am/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"የጣት አሻራ ዳሳሹን ይንኩ"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"አልታወቀም"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"የእገዛ መልዕክት አካባቢ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"የጣት አሻራ ሃርድዌር የለም።"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"ምንም የጣት አሻራዎች አልተመዘገቡም።"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"ይህ መሣሪያ የጣት አሻራ ዳሳሽ የለውም"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"የጣት አሻራ ክወና በተጠቃሚ ተሰርዟል።"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"በጣም ብዙ ሙከራዎች። እባክዎ ቆይተው እንደገና ይሞክሩ።"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"ያልታወቀ ስህተት"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"ማረጋገጫ በተጠቃሚ ተሰርዟል።"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"የይለፍ ቃል ተጠቀም"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"የጣት አሻራ ዳሳሹን ይንኩ"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"አልታወቀም"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"የእገዛ መልዕክት አካባቢ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"የጣት አሻራ ሃርድዌር የለም።"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"ምንም የጣት አሻራዎች አልተመዘገቡም።"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"ይህ መሣሪያ የጣት አሻራ ዳሳሽ የለውም"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"የጣት አሻራ ክወና በተጠቃሚ ተሰርዟል።"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"በጣም ብዙ ሙከራዎች። እባክዎ ቆይተው እንደገና ይሞክሩ።"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"ያልታወቀ ስህተት"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"ማረጋገጫ በተጠቃሚ ተሰርዟል።"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"የይለፍ ቃል ተጠቀም"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ar/strings.xml b/biometric/biometric/src/main/res/values-ar/strings.xml
index 23259a3..b1c268a 100644
--- a/biometric/biometric/src/main/res/values-ar/strings.xml
+++ b/biometric/biometric/src/main/res/values-ar/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"المس زر استشعار بصمة الإصبع"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"لم يتم التعرف عليها."</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"منطقة رسالة المساعدة"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"جهاز بصمة الإصبع غير متاح."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"ليست هناك بصمات إصبع مسجَّلة."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"لا يحتوي هذا الجهاز على جهاز استشعار بصمات الأصابع."</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"تم إلغاء تشغيل بصمة الإصبع بواسطة المستخدم."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"تم إجراء محاولات كثيرة جدًا. يُرجى المحاولة مرة أخرى لاحقًا."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"خطأ غير معروف"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"ألغى المستخدم المصادقة."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"استخدام كلمة المرور"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"المس زر استشعار بصمة الإصبع"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"لم يتم التعرف عليها."</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"منطقة رسالة المساعدة"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"جهاز بصمة الإصبع غير متاح."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"ليست هناك بصمات إصبع مسجَّلة."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"لا يحتوي هذا الجهاز على جهاز استشعار بصمات الأصابع."</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"تم إلغاء تشغيل بصمة الإصبع بواسطة المستخدم."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"تم إجراء محاولات كثيرة جدًا. يُرجى المحاولة مرة أخرى لاحقًا."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"خطأ غير معروف"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"ألغى المستخدم المصادقة."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"استخدام كلمة المرور"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-as/strings.xml b/biometric/biometric/src/main/res/values-as/strings.xml
index bd6d7d4..5f8e3cf 100644
--- a/biometric/biometric/src/main/res/values-as/strings.xml
+++ b/biometric/biometric/src/main/res/values-as/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰটো স্পৰ্শ কৰক"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"চিনাক্ত কৰিব পৰা নাই"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"সহায় বাৰ্তাৰ ক্ষেত্ৰ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"ফিংগাৰপ্ৰিণ্ট হাৰ্ডৱেৰ নাই।"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"কোনো ফিংগাৰপ্ৰিণ্ট যোগ কৰা নহ\'ল।"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"এই ডিভাইচটোত ফিংগাৰপ্ৰিণ্ট ছেন্সৰ নাই"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"ব্যৱহাৰকাৰীয়ে ফিংগাৰপ্ৰিণ্টৰ দ্বাৰা বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ কাৰ্য বাতিল কৰিছে।"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"অতি বেছি চেষ্টা অনুগ্ৰহ কৰি পিছত আকৌ চেষ্টা কৰক।"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"অজ্ঞাত আসোঁৱাহ"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ ব্যৱহাৰকাৰীয়ে বাতিল কৰিছে।"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"পাছৱৰ্ড ব্যৱহাৰ কৰক"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰটো স্পৰ্শ কৰক"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"চিনাক্ত কৰিব পৰা নাই"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"সহায় বাৰ্তাৰ ক্ষেত্ৰ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"ফিংগাৰপ্ৰিণ্ট হাৰ্ডৱেৰ নাই।"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"কোনো ফিংগাৰপ্ৰিণ্ট যোগ কৰা নহ\'ল।"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"এই ডিভাইচটোত ফিংগাৰপ্ৰিণ্ট ছেন্সৰ নাই"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"ব্যৱহাৰকাৰীয়ে ফিংগাৰপ্ৰিণ্টৰ দ্বাৰা বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ কাৰ্য বাতিল কৰিছে।"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"অতি বেছি চেষ্টা অনুগ্ৰহ কৰি পিছত আকৌ চেষ্টা কৰক।"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"অজ্ঞাত আসোঁৱাহ"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ ব্যৱহাৰকাৰীয়ে বাতিল কৰিছে।"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"পাছৱৰ্ড ব্যৱহাৰ কৰক"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-az/strings.xml b/biometric/biometric/src/main/res/values-az/strings.xml
index 5528524..ebd7e3a 100644
--- a/biometric/biometric/src/main/res/values-az/strings.xml
+++ b/biometric/biometric/src/main/res/values-az/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Barmaq izi sensoruna klikləyin"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Tanınmır"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Yardım mesajı bölməsi"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Barmaq izi avadanlığı əlçatan deyil."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Barmaq izi qeydə alınmayıb."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Bu cihazda barmaq izi sensoru yoxdur"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Barmaq izi əməliyyatı istifadəçi tərəfindən ləğv edildi."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Həddən çox cəhd oldu. Sonra sınayın."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Naməlum xəta"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"İstifadəçi doğrulamanı ləğv edib."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Parol istifadə edin"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Barmaq izi sensoruna klikləyin"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Tanınmır"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Yardım mesajı bölməsi"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Barmaq izi avadanlığı əlçatan deyil."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Barmaq izi qeydə alınmayıb."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Bu cihazda barmaq izi sensoru yoxdur"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Barmaq izi əməliyyatı istifadəçi tərəfindən ləğv edildi."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Həddən çox cəhd oldu. Sonra sınayın."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Naməlum xəta"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"İstifadəçi doğrulamanı ləğv edib."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Parol istifadə edin"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-b+sr+Latn/strings.xml b/biometric/biometric/src/main/res/values-b+sr+Latn/strings.xml
index c575e510..3c0bef42 100644
--- a/biometric/biometric/src/main/res/values-b+sr+Latn/strings.xml
+++ b/biometric/biometric/src/main/res/values-b+sr+Latn/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Dodirn. senzor za otisak prsta"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nije prepoznat"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Oblast poruke za pomoć"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardver za otiske prstiju nije dostupan."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nije registrovan nijedan otisak prsta."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Ovaj uređaj nema senzor za otisak prsta"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Korisnik je otkazao radnju sa otiskom prsta."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Previše pokušaja. Probajte ponovo kasnije."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Nepoznata greška"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Korisnik je otkazao potvrdu identiteta."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Koristite lozinku"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Dodirn. senzor za otisak prsta"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nije prepoznat"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Oblast poruke za pomoć"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardver za otiske prstiju nije dostupan."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nije registrovan nijedan otisak prsta."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Ovaj uređaj nema senzor za otisak prsta"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Korisnik je otkazao radnju sa otiskom prsta."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Previše pokušaja. Probajte ponovo kasnije."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Nepoznata greška"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Korisnik je otkazao potvrdu identiteta."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Koristite lozinku"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-be/strings.xml b/biometric/biometric/src/main/res/values-be/strings.xml
index 270a679..1f8940a 100644
--- a/biometric/biometric/src/main/res/values-be/strings.xml
+++ b/biometric/biometric/src/main/res/values-be/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Дакраніцеся да сканера адбіткаў пальцаў"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Не распазнана"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Поле даведачнага паведамлення"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Апаратныя сродкі для зняцця адбіткаў пальцаў недаступныя."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Адбіткі пальцаў не зарэгістраваны."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"На гэтай прыладзе няма сканера адбіткаў пальцаў"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Аўтэнтыфікацыя па адбітках пальцаў скасавана карыстальнікам."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Занадта шмат спроб. Паўтарыце спробу пазней."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Невядомая памылка"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Аўтэнтыфікацыя скасавана карыстальнікам."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Выкарыстаць пароль"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Дакраніцеся да сканера адбіткаў пальцаў"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Не распазнана"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Поле даведачнага паведамлення"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Апаратныя сродкі для зняцця адбіткаў пальцаў недаступныя."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Адбіткі пальцаў не зарэгістраваны."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"На гэтай прыладзе няма сканера адбіткаў пальцаў"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Аўтэнтыфікацыя па адбітках пальцаў скасавана карыстальнікам."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Занадта шмат спроб. Паўтарыце спробу пазней."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Невядомая памылка"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Аўтэнтыфікацыя скасавана карыстальнікам."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Выкарыстаць пароль"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-bg/strings.xml b/biometric/biometric/src/main/res/values-bg/strings.xml
index a953739..1fab759 100644
--- a/biometric/biometric/src/main/res/values-bg/strings.xml
+++ b/biometric/biometric/src/main/res/values-bg/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Докоснете сензора за отпечатъци"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Не е разпознато"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Област за помощно съобщение"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Хардуерът за отпечатъци не е налице."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Няма регистрирани отпечатъци."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Това устройство няма сензор за отпечатъци"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Операцията за удостоверяване чрез отпечатък бе анулирана от потребителя."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Твърде много опити. Моля, опитайте отново по-късно."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Неизвестна грешка"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Удостоверяването е анулирано от потребителя."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Използване на парола"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Докоснете сензора за отпечатъци"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Не е разпознато"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Област за помощно съобщение"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Хардуерът за отпечатъци не е налице."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Няма регистрирани отпечатъци."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Това устройство няма сензор за отпечатъци"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Операцията за удостоверяване чрез отпечатък бе анулирана от потребителя."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Твърде много опити. Моля, опитайте отново по-късно."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Неизвестна грешка"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Удостоверяването е анулирано от потребителя."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Използване на парола"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-bn/strings.xml b/biometric/biometric/src/main/res/values-bn/strings.xml
index c48c9dd..98e2fda 100644
--- a/biometric/biometric/src/main/res/values-bn/strings.xml
+++ b/biometric/biometric/src/main/res/values-bn/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"আঙ্গুলের ছাপের সেন্সর টাচ করুন"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"শনাক্ত করা যায়নি"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"সহায়তার মেসেজ দেখানোর জায়গা"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"আঙ্গুলের ছাপ নেওয়ার হার্ডওয়্যার উপলভ্য নয়।"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"কোনও আঙ্গুলের ছাপ নথিভুক্ত নেই।"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"এই ডিভাইসে আঙ্গুলের ছাপ নেওয়ার সেন্সর নেই"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"ব্যবহারকারী আঙ্গুলের ছাপ নেওয়ার অপারেশনটি বাতিল করেছেন।"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"অনেকবার চেষ্টা করেছেন। পরে আবার চেষ্টা করুন।"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"অজানা সমস্যা"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"যাচাইকরণ প্রক্রিয়াটি ব্যবহারকারী বাতিল করেছেন।"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"পাসওয়ার্ড ব্যবহার করুন"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"আঙ্গুলের ছাপের সেন্সর টাচ করুন"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"শনাক্ত করা যায়নি"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"সহায়তার মেসেজ দেখানোর জায়গা"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"আঙ্গুলের ছাপ নেওয়ার হার্ডওয়্যার উপলভ্য নয়।"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"কোনও আঙ্গুলের ছাপ নথিভুক্ত নেই।"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"এই ডিভাইসে আঙ্গুলের ছাপ নেওয়ার সেন্সর নেই"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"ব্যবহারকারী আঙ্গুলের ছাপ নেওয়ার অপারেশনটি বাতিল করেছেন।"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"অনেকবার চেষ্টা করেছেন। পরে আবার চেষ্টা করুন।"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"অজানা সমস্যা"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"যাচাইকরণ প্রক্রিয়াটি ব্যবহারকারী বাতিল করেছেন।"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"পাসওয়ার্ড ব্যবহার করুন"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-bs/strings.xml b/biometric/biometric/src/main/res/values-bs/strings.xml
index 44aefdd..80dee22 100644
--- a/biometric/biometric/src/main/res/values-bs/strings.xml
+++ b/biometric/biometric/src/main/res/values-bs/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Dodirnite senzor za otisak prsta"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nije prepoznato"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Prostor za poruku za pomoć"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardver za otisak prsta nije dostupan."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nije prijavljen nijedan otisak prsta."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Ovaj uređaj nema senzor za otisak prsta"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Korisnik je otkazao radnju s otiskom prsta."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Previše pokušaja. Pokušajte ponovo kasnije."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Nepoznata greška"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Korisnik je otkazao autentifikaciju."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Koristi lozinku"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Dodirnite senzor za otisak prsta"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nije prepoznato"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Prostor za poruku za pomoć"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardver za otisak prsta nije dostupan."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nije prijavljen nijedan otisak prsta."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Ovaj uređaj nema senzor za otisak prsta"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Korisnik je otkazao radnju s otiskom prsta."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Previše pokušaja. Pokušajte ponovo kasnije."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Nepoznata greška"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Korisnik je otkazao autentifikaciju."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Koristi lozinku"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ca/strings.xml b/biometric/biometric/src/main/res/values-ca/strings.xml
index 8b5adf4..8307899 100644
--- a/biometric/biometric/src/main/res/values-ca/strings.xml
+++ b/biometric/biometric/src/main/res/values-ca/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Toca sensor d\'empremtes"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"No s\'ha reconegut"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Àrea de missatge d\'ajuda"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"El maquinari per a empremtes dactilars no està disponible."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"No s\'ha registrat cap empremta digital."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Aquest dispositiu no té sensor d\'empremtes dactilars"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"L\'usuari ha cancel·lat l\'operació d\'empremta digital."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Massa intents. Torna-ho a provar més tard."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Error desconegut"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"L\'usuari ha cancel·lat l\'autenticació."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Utilitza la contrasenya"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Toca sensor d\'empremtes"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"No s\'ha reconegut"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Àrea de missatge d\'ajuda"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"El maquinari per a empremtes dactilars no està disponible."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"No s\'ha registrat cap empremta digital."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Aquest dispositiu no té sensor d\'empremtes dactilars"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"L\'usuari ha cancel·lat l\'operació d\'empremta digital."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Massa intents. Torna-ho a provar més tard."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Error desconegut"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"L\'usuari ha cancel·lat l\'autenticació."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Utilitza la contrasenya"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-cs/strings.xml b/biometric/biometric/src/main/res/values-cs/strings.xml
index ce8495b..374ff80 100644
--- a/biometric/biometric/src/main/res/values-cs/strings.xml
+++ b/biometric/biometric/src/main/res/values-cs/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Dotkněte se snímače otisků prstů"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nerozpoznáno"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Oblast pro zprávu nápovědy"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Není k dispozici hardware ke snímání otisků prstů."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nejsou zaregistrovány žádné otisky prstů."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Toto zařízení nemá snímač otisků prstů"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Uživatel operaci s otiskem prstu zrušil."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Příliš mnoho pokusů. Zkuste to později."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Neznámá chyba"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Ověření bylo zrušeno uživatelem."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Použít heslo"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Dotkněte se snímače otisků prstů"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nerozpoznáno"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Oblast pro zprávu nápovědy"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Není k dispozici hardware ke snímání otisků prstů."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nejsou zaregistrovány žádné otisky prstů."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Toto zařízení nemá snímač otisků prstů"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Uživatel operaci s otiskem prstu zrušil."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Příliš mnoho pokusů. Zkuste to později."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Neznámá chyba"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Ověření bylo zrušeno uživatelem."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Použít heslo"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-da/strings.xml b/biometric/biometric/src/main/res/values-da/strings.xml
index 02fb374..a2b6878 100644
--- a/biometric/biometric/src/main/res/values-da/strings.xml
+++ b/biometric/biometric/src/main/res/values-da/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Sæt finger på fingeraftrykslæser"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Ikke genkendt"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Område med hjælpemeddelelse"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardwaren til fingeraftryk er ikke tilgængelig."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Der er ikke registreret nogen fingeraftryk."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Denne enhed har ingen fingeraftrykslæser"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Fingeraftrykshandlingen blev annulleret af brugeren."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Der var for mange forsøg Prøv igen senere."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Ukendt fejl"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Godkendelsen er annulleret af brugeren."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Brug adgangskode"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Sæt finger på fingeraftrykslæser"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Ikke genkendt"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Område med hjælpemeddelelse"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardwaren til fingeraftryk er ikke tilgængelig."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Der er ikke registreret nogen fingeraftryk."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Denne enhed har ingen fingeraftrykslæser"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Fingeraftrykshandlingen blev annulleret af brugeren."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Der var for mange forsøg Prøv igen senere."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Ukendt fejl"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Godkendelsen er annulleret af brugeren."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Brug adgangskode"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-de/strings.xml b/biometric/biometric/src/main/res/values-de/strings.xml
index 7ad7971..146e2fb 100644
--- a/biometric/biometric/src/main/res/values-de/strings.xml
+++ b/biometric/biometric/src/main/res/values-de/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Fingerabdrucksensor berühren"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nicht erkannt"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Bereich für die Hilfemeldung"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Fingerabdruckhardware nicht verfügbar."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Keine Fingerabdrücke erfasst."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Dieses Gerät hat keinen Fingerabdrucksensor"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Vorgang der Fingerabdruckauthentifizierung vom Nutzer abgebrochen."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Zu viele Versuche. Versuche es bitte später noch einmal."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Unbekannter Fehler"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Authentifizierung vom Nutzer abgebrochen."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Passwort nutzen"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Fingerabdrucksensor berühren"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nicht erkannt"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Bereich für die Hilfemeldung"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Fingerabdruckhardware nicht verfügbar."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Keine Fingerabdrücke erfasst."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Dieses Gerät hat keinen Fingerabdrucksensor"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Vorgang der Fingerabdruckauthentifizierung vom Nutzer abgebrochen."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Zu viele Versuche. Versuche es bitte später noch einmal."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Unbekannter Fehler"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Authentifizierung vom Nutzer abgebrochen."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Passwort nutzen"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-el/strings.xml b/biometric/biometric/src/main/res/values-el/strings.xml
index 5dac890..c61b868 100644
--- a/biometric/biometric/src/main/res/values-el/strings.xml
+++ b/biometric/biometric/src/main/res/values-el/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Αγγίξτε τον αισθ. δακτ. αποτ."</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Δεν αναγνωρίστηκε"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Περιοχή μηνυμάτων βοήθειας"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Ο εξοπλισμός δακτυλικού αποτυπώματος δεν είναι διαθέσιμος."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Δεν έχουν καταχωριστεί δακτυλικά αποτυπώματα."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Αυτή η συσκευή δεν διαθέτει αισθητήρα δακτυλικού αποτυπώματος"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Η λειτουργία δακτυλικού αποτυπώματος ακυρώθηκε από τον χρήστη."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Υπερβολικά πολλές προσπάθειες. Δοκιμάστε ξανά αργότερα."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Άγνωστο σφάλμα"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Ο έλεγχος ταυτότητας ακυρώθηκε από τον χρήστη."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Χρήση κωδικού πρόσβασης"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Αγγίξτε τον αισθ. δακτ. αποτ."</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Δεν αναγνωρίστηκε"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Περιοχή μηνυμάτων βοήθειας"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Ο εξοπλισμός δακτυλικού αποτυπώματος δεν είναι διαθέσιμος."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Δεν έχουν καταχωριστεί δακτυλικά αποτυπώματα."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Αυτή η συσκευή δεν διαθέτει αισθητήρα δακτυλικού αποτυπώματος"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Η λειτουργία δακτυλικού αποτυπώματος ακυρώθηκε από τον χρήστη."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Υπερβολικά πολλές προσπάθειες. Δοκιμάστε ξανά αργότερα."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Άγνωστο σφάλμα"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Ο έλεγχος ταυτότητας ακυρώθηκε από τον χρήστη."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Χρήση κωδικού πρόσβασης"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-en-rAU/strings.xml b/biometric/biometric/src/main/res/values-en-rAU/strings.xml
index 630925b..7c4a7a5 100644
--- a/biometric/biometric/src/main/res/values-en-rAU/strings.xml
+++ b/biometric/biometric/src/main/res/values-en-rAU/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Touch the fingerprint sensor"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Not recognised"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Help message area"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Fingerprint hardware not available."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"No fingerprints enrolled."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"This device does not have a fingerprint sensor"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Fingerprint operation cancelled by user."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Too many attempts. Please try again later."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Unknown error"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Authentication cancelled by user."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Use password"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Touch the fingerprint sensor"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Not recognised"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Help message area"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Fingerprint hardware not available."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"No fingerprints enrolled."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"This device does not have a fingerprint sensor"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Fingerprint operation cancelled by user."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Too many attempts. Please try again later."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Unknown error"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Authentication cancelled by user."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Use password"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-en-rCA/strings.xml b/biometric/biometric/src/main/res/values-en-rCA/strings.xml
index 630925b..7c4a7a5 100644
--- a/biometric/biometric/src/main/res/values-en-rCA/strings.xml
+++ b/biometric/biometric/src/main/res/values-en-rCA/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Touch the fingerprint sensor"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Not recognised"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Help message area"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Fingerprint hardware not available."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"No fingerprints enrolled."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"This device does not have a fingerprint sensor"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Fingerprint operation cancelled by user."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Too many attempts. Please try again later."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Unknown error"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Authentication cancelled by user."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Use password"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Touch the fingerprint sensor"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Not recognised"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Help message area"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Fingerprint hardware not available."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"No fingerprints enrolled."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"This device does not have a fingerprint sensor"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Fingerprint operation cancelled by user."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Too many attempts. Please try again later."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Unknown error"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Authentication cancelled by user."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Use password"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-en-rGB/strings.xml b/biometric/biometric/src/main/res/values-en-rGB/strings.xml
index 630925b..7c4a7a5 100644
--- a/biometric/biometric/src/main/res/values-en-rGB/strings.xml
+++ b/biometric/biometric/src/main/res/values-en-rGB/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Touch the fingerprint sensor"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Not recognised"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Help message area"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Fingerprint hardware not available."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"No fingerprints enrolled."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"This device does not have a fingerprint sensor"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Fingerprint operation cancelled by user."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Too many attempts. Please try again later."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Unknown error"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Authentication cancelled by user."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Use password"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Touch the fingerprint sensor"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Not recognised"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Help message area"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Fingerprint hardware not available."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"No fingerprints enrolled."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"This device does not have a fingerprint sensor"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Fingerprint operation cancelled by user."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Too many attempts. Please try again later."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Unknown error"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Authentication cancelled by user."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Use password"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-en-rIN/strings.xml b/biometric/biometric/src/main/res/values-en-rIN/strings.xml
index 630925b..7c4a7a5 100644
--- a/biometric/biometric/src/main/res/values-en-rIN/strings.xml
+++ b/biometric/biometric/src/main/res/values-en-rIN/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Touch the fingerprint sensor"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Not recognised"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Help message area"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Fingerprint hardware not available."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"No fingerprints enrolled."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"This device does not have a fingerprint sensor"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Fingerprint operation cancelled by user."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Too many attempts. Please try again later."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Unknown error"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Authentication cancelled by user."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Use password"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Touch the fingerprint sensor"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Not recognised"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Help message area"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Fingerprint hardware not available."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"No fingerprints enrolled."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"This device does not have a fingerprint sensor"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Fingerprint operation cancelled by user."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Too many attempts. Please try again later."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Unknown error"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Authentication cancelled by user."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Use password"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-en-rXC/strings.xml b/biometric/biometric/src/main/res/values-en-rXC/strings.xml
index 8d46166..0296f23 100644
--- a/biometric/biometric/src/main/res/values-en-rXC/strings.xml
+++ b/biometric/biometric/src/main/res/values-en-rXC/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎Touch the fingerprint sensor‎‏‎‎‏‎"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎Not recognized‎‏‎‎‏‎"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‎Help message area‎‏‎‎‏‎"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎Fingerprint hardware not available.‎‏‎‎‏‎"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎No fingerprints enrolled.‎‏‎‎‏‎"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎This device does not have a fingerprint sensor‎‏‎‎‏‎"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎Fingerprint operation canceled by user.‎‏‎‎‏‎"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎Too many attempts. Please try again later.‎‏‎‎‏‎"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎Unknown error‎‏‎‎‏‎"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎Authentication canceled by user.‎‏‎‎‏‎"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎Use password‎‏‎‎‏‎"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎Touch the fingerprint sensor‎‏‎‎‏‎"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎Not recognized‎‏‎‎‏‎"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎Help message area‎‏‎‎‏‎"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎Fingerprint hardware not available.‎‏‎‎‏‎"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎No fingerprints enrolled.‎‏‎‎‏‎"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎This device does not have a fingerprint sensor‎‏‎‎‏‎"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎Fingerprint operation canceled by user.‎‏‎‎‏‎"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎Too many attempts. Please try again later.‎‏‎‎‏‎"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎Unknown error‎‏‎‎‏‎"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎Authentication canceled by user.‎‏‎‎‏‎"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎Use password‎‏‎‎‏‎"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-es-rUS/strings.xml b/biometric/biometric/src/main/res/values-es-rUS/strings.xml
index bc8482b..b3b0295 100644
--- a/biometric/biometric/src/main/res/values-es-rUS/strings.xml
+++ b/biometric/biometric/src/main/res/values-es-rUS/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Toca el sensor de huellas dig."</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"No se reconoció"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Área de mensajes de ayuda"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"El hardware para detectar huellas digitales no está disponible."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"No se registraron huellas digitales."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Este dispositivo no tiene sensor de huellas digitales"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"El usuario canceló la operación de huella digital."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Demasiados intentos. Vuelve a intentarlo más tarde."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Error desconocido"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"El usuario canceló la autenticación."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Usar contraseña"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Toca el sensor de huellas dig."</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"No se reconoció"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Área de mensajes de ayuda"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"El hardware para detectar huellas digitales no está disponible."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"No se registraron huellas digitales."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Este dispositivo no tiene sensor de huellas digitales"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"El usuario canceló la operación de huella digital."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Demasiados intentos. Vuelve a intentarlo más tarde."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Error desconocido"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"El usuario canceló la autenticación."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Usar contraseña"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-es/strings.xml b/biometric/biometric/src/main/res/values-es/strings.xml
index 64a9677..b609328 100644
--- a/biometric/biometric/src/main/res/values-es/strings.xml
+++ b/biometric/biometric/src/main/res/values-es/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Toca sensor huellas digitales"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"No se reconoce"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Área de mensaje de ayuda"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"El hardware de huella digital no está disponible."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"No se ha registrado ninguna huella digital."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"El dispositivo no tiene ningún sensor de huellas digitales"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"El usuario ha cancelado la operación de huella digital."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Has realizado demasiados intentos. Vuelve a probar más tarde."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Error desconocido"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"El usuario ha cancelado la autenticación."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Usar contraseña"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Toca sensor huellas digitales"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"No se reconoce"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Área de mensaje de ayuda"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"El hardware de huella digital no está disponible."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"No se ha registrado ninguna huella digital."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"El dispositivo no tiene ningún sensor de huellas digitales"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"El usuario ha cancelado la operación de huella digital."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Has realizado demasiados intentos. Vuelve a probar más tarde."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Error desconocido"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"El usuario ha cancelado la autenticación."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Usar contraseña"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-et/strings.xml b/biometric/biometric/src/main/res/values-et/strings.xml
index 458218d..896ff59 100644
--- a/biometric/biometric/src/main/res/values-et/strings.xml
+++ b/biometric/biometric/src/main/res/values-et/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Puudutage sõrmejäljeandurit"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Ei tuvastatud"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Abisõnumi ala"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Sõrmejälje riistvara pole saadaval."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Ühtegi sõrmejälge pole registreeritud."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Selles seadmes pole sõrmejäljeandurit"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Kasutaja tühistas sõrmejälje kasutamise."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Liiga palju katseid. Proovige hiljem uuesti."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Tundmatu viga"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Kasutaja tühistas autentimise."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Kasuta parooli"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Puudutage sõrmejäljeandurit"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Ei tuvastatud"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Abisõnumi ala"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Sõrmejälje riistvara pole saadaval."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Ühtegi sõrmejälge pole registreeritud."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Selles seadmes pole sõrmejäljeandurit"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Kasutaja tühistas sõrmejälje kasutamise."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Liiga palju katseid. Proovige hiljem uuesti."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Tundmatu viga"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Kasutaja tühistas autentimise."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Kasuta parooli"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-eu/strings.xml b/biometric/biometric/src/main/res/values-eu/strings.xml
index ff16218..6c82907 100644
--- a/biometric/biometric/src/main/res/values-eu/strings.xml
+++ b/biometric/biometric/src/main/res/values-eu/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Sakatu hatz-marken sentsorea"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Ez da ezagutu"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Laguntza-mezuaren eremua"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hatz-marken hardwarea ez dago erabilgarri."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Ez da erregistratu hatz-markarik."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Gailu honek ez du hatz-marken sentsorerik"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Erabiltzaileak bertan behera utzi du hatz-marka bidezko eragiketa."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Saiakera gehiegi egin dira. Saiatu berriro geroago."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Errore ezezaguna"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Erabiltzaileak bertan behera utzi du autentifikazioa"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Erabili pasahitza"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Sakatu hatz-marken sentsorea"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Ez da ezagutu"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Laguntza-mezuaren eremua"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hatz-marken hardwarea ez dago erabilgarri."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Ez da erregistratu hatz-markarik."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Gailu honek ez du hatz-marken sentsorerik"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Erabiltzaileak bertan behera utzi du hatz-marka bidezko eragiketa."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Saiakera gehiegi egin dira. Saiatu berriro geroago."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Errore ezezaguna"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Erabiltzaileak bertan behera utzi du autentifikazioa"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Erabili pasahitza"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-fa/strings.xml b/biometric/biometric/src/main/res/values-fa/strings.xml
index 06558cd..c923c1a 100644
--- a/biometric/biometric/src/main/res/values-fa/strings.xml
+++ b/biometric/biometric/src/main/res/values-fa/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"حسگر اثر انگشت را لمس کنید"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"شناسایی نشد"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"بخش پیام راهنما"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"سخت‌افزار اثر انگشت در دسترس نیست."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"اثر انگشتی ثبت نشده است."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"این دستگاه حسگر اثر انگشت ندارد"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"کاربر عملیات اثر انگشت را لغو کرد"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"تعداد تلاش‌ها بیش از حد مجاز است. لطفاً بعداً دوباره امتحان کنید."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"خطای ناشناس"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"کاربر احراز هویت را لغو کرد."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"استفاده از گذرواژه"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"حسگر اثر انگشت را لمس کنید"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"شناسایی نشد"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"بخش پیام راهنما"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"سخت‌افزار اثر انگشت در دسترس نیست."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"اثر انگشتی ثبت نشده است."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"این دستگاه حسگر اثر انگشت ندارد"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"کاربر عملیات اثر انگشت را لغو کرد"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"تعداد تلاش‌ها بیش از حد مجاز است. لطفاً بعداً دوباره امتحان کنید."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"خطای ناشناس"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"کاربر احراز هویت را لغو کرد."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"استفاده از گذرواژه"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-fi/strings.xml b/biometric/biometric/src/main/res/values-fi/strings.xml
index 13c1440..d94baaf 100644
--- a/biometric/biometric/src/main/res/values-fi/strings.xml
+++ b/biometric/biometric/src/main/res/values-fi/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Kosketa sormenjälkitunnistinta"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Ei tunnistettu"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Ohjeviestialue"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Sormenjälkilaitteisto ei ole käytettävissä."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Sormenjälkiä ei ole lisätty."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Laitteessa ei ole sormenjälkitunnistinta."</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Käyttäjä peruutti sormenjälkitoiminnon."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Liian monta epäonnistunutta yritystä. Yritä myöhemmin uudelleen."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Tuntematon virhe"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Käyttäjä peruutti todennuksen."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Käytä salasanaa"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Kosketa sormenjälkitunnistinta"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Ei tunnistettu"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Ohjeviestialue"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Sormenjälkilaitteisto ei ole käytettävissä."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Sormenjälkiä ei ole lisätty."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Laitteessa ei ole sormenjälkitunnistinta."</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Käyttäjä peruutti sormenjälkitoiminnon."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Liian monta epäonnistunutta yritystä. Yritä myöhemmin uudelleen."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Tuntematon virhe"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Käyttäjä peruutti todennuksen."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Käytä salasanaa"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-fr-rCA/strings.xml b/biometric/biometric/src/main/res/values-fr-rCA/strings.xml
index da5a5af..fade2f5 100644
--- a/biometric/biometric/src/main/res/values-fr-rCA/strings.xml
+++ b/biometric/biometric/src/main/res/values-fr-rCA/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Touch. capteur empr. digitales"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Doigt non reconnu"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Zone de message d\'aide"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Le matériel de lecture d\'empreintes digitales n\'est pas accessible."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Aucune empreinte digitale enregistrée."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Cet appareil ne possède pas de capteur d\'empreintes digitales"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"L\'opération d\'authentification par empreinte digitale a été annulée par l\'utilisateur."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Trop de tentatives. Veuillez réessayer plus tard."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Erreur inconnue"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"L\'authentification a été annulée par l\'utilisateur."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Utiliser le mot de passe"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Touch. capteur empr. digitales"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Doigt non reconnu"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Zone de message d\'aide"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Le matériel de lecture d\'empreintes digitales n\'est pas accessible."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Aucune empreinte digitale enregistrée."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Cet appareil ne possède pas de capteur d\'empreintes digitales"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"L\'opération d\'authentification par empreinte digitale a été annulée par l\'utilisateur."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Trop de tentatives. Veuillez réessayer plus tard."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Erreur inconnue"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"L\'authentification a été annulée par l\'utilisateur."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Utiliser le mot de passe"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-fr/strings.xml b/biometric/biometric/src/main/res/values-fr/strings.xml
index 03bc80a..ea3b995 100644
--- a/biometric/biometric/src/main/res/values-fr/strings.xml
+++ b/biometric/biometric/src/main/res/values-fr/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Appuyez sur lecteur d\'empreinte"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Non reconnue"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Zone de message d\'aide"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Matériel de lecture d\'empreinte digitale indisponible."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Aucune empreinte digitale enregistrée."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Aucun lecteur d\'empreinte digitale n\'est installé sur cet appareil"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Opération d\'authentification par empreinte digitale annulée par l\'utilisateur."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Tentatives trop nombreuses. Veuillez réessayer plus tard."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Erreur inconnue"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Authentification annulée par l\'utilisateur."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Utiliser un mot de passe"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Appuyez sur lecteur d\'empreinte"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Non reconnue"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Zone de message d\'aide"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Matériel de lecture d\'empreinte digitale indisponible."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Aucune empreinte digitale enregistrée."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Aucun lecteur d\'empreinte digitale n\'est installé sur cet appareil"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Opération d\'authentification par empreinte digitale annulée par l\'utilisateur."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Tentatives trop nombreuses. Veuillez réessayer plus tard."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Erreur inconnue"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Authentification annulée par l\'utilisateur."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Utiliser un mot de passe"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-gl/strings.xml b/biometric/biometric/src/main/res/values-gl/strings.xml
index 29beea4..433456d 100644
--- a/biometric/biometric/src/main/res/values-gl/strings.xml
+++ b/biometric/biometric/src/main/res/values-gl/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Toca o sensor de impresión dixital"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Non se recoñeceu"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Área de mensaxes de axuda"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"O hardware de impresión dixital non está dispoñible."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Non se rexistraron impresións dixitais."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Este dispositivo non ten sensor de impresión dixital"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"O usuario cancelou a operación da impresión dixital."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Tentáchelo demasiadas veces. Proba de novo máis tarde."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Produciuse un erro descoñecido"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"O usuario cancelou a autenticación."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Usar contrasinal"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Toca o sensor de impresión dixital"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Non se recoñeceu"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Área de mensaxes de axuda"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"O hardware de impresión dixital non está dispoñible."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Non se rexistraron impresións dixitais."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Este dispositivo non ten sensor de impresión dixital"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"O usuario cancelou a operación da impresión dixital."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Tentáchelo demasiadas veces. Proba de novo máis tarde."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Produciuse un erro descoñecido"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"O usuario cancelou a autenticación."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Usar contrasinal"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-gu/strings.xml b/biometric/biometric/src/main/res/values-gu/strings.xml
index 2bde808..a94f21c 100644
--- a/biometric/biometric/src/main/res/values-gu/strings.xml
+++ b/biometric/biometric/src/main/res/values-gu/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"ફિંગરપ્રિન્ટના સેન્સરને સ્પર્શ કરો"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"ઓળખાયેલ નથી"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"સહાય સંદેશનું ક્ષેત્ર"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"ફિંગરપ્રિન્ટ હાર્ડવેર ઉપલબ્ધ નથી."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"કોઈ ફિંગરપ્રિન્ટની નોંધણી કરવામાં આવી નથી."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"આ ડિવાઇસમાં કોઈ ફિંગરપ્રિન્ટ સેન્સર નથી"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"ફિંગરપ્રિન્ટ ચકાસવાની પ્રક્રિયા વપરાશકર્તાએ રદ કરી."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"ખૂબ વધારે પ્રયત્નો કર્યા. કૃપા કરીને પછીથી ફરી પ્રયાસ કરો."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"અજાણી ભૂલ"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"વપરાશકર્તાએ પ્રમાણીકરણ રદ કર્યું."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"પાસવર્ડનો ઉપયોગ કરો"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"ફિંગરપ્રિન્ટના સેન્સરને સ્પર્શ કરો"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"ઓળખાયેલ નથી"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"સહાય સંદેશનું ક્ષેત્ર"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"ફિંગરપ્રિન્ટ હાર્ડવેર ઉપલબ્ધ નથી."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"કોઈ ફિંગરપ્રિન્ટની નોંધણી કરવામાં આવી નથી."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"આ ડિવાઇસમાં કોઈ ફિંગરપ્રિન્ટ સેન્સર નથી"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"ફિંગરપ્રિન્ટ ચકાસવાની પ્રક્રિયા વપરાશકર્તાએ રદ કરી."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"ખૂબ વધારે પ્રયત્નો કર્યા. કૃપા કરીને પછીથી ફરી પ્રયાસ કરો."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"અજાણી ભૂલ"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"વપરાશકર્તાએ પ્રમાણીકરણ રદ કર્યું."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"પાસવર્ડનો ઉપયોગ કરો"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-hi/strings.xml b/biometric/biometric/src/main/res/values-hi/strings.xml
index 520bfa2..ea1e043 100644
--- a/biometric/biometric/src/main/res/values-hi/strings.xml
+++ b/biometric/biometric/src/main/res/values-hi/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"फ़िंगरप्रिंट सेंसर को छुएं"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"पहचान नहीं हो पाई"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"सहायता का मैसेज दिखाने की जगह"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"फ़िंगरप्रिंट हार्डवेयर मौजूद नहीं है."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"कोई फ़िंगरप्रिंट रजिस्टर नहीं किया गया है."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"इस डिवाइस में फ़िंगरप्रिंट सेंसर नहीं है"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"उपयोगकर्ता ने फिंगरप्रिंट की पुष्टि की कार्रवाई रद्द कर दी है."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"कई बार कोशिश की जा चुकी है. कृपया बाद में फिर से कोशिश करें."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"अनजान गड़बड़ी"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"उपयोगकर्ता ने पुष्टि करने की प्रक्रिया रद्द की."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"पासवर्ड का इस्तेमाल करें"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"फ़िंगरप्रिंट सेंसर को छुएं"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"पहचान नहीं हो पाई"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"सहायता का मैसेज दिखाने की जगह"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"फ़िंगरप्रिंट हार्डवेयर मौजूद नहीं है."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"कोई फ़िंगरप्रिंट रजिस्टर नहीं किया गया है."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"इस डिवाइस में फ़िंगरप्रिंट सेंसर नहीं है"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"उपयोगकर्ता ने फिंगरप्रिंट की पुष्टि की कार्रवाई रद्द कर दी है."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"कई बार कोशिश की जा चुकी है. कृपया बाद में फिर से कोशिश करें."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"अनजान गड़बड़ी"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"उपयोगकर्ता ने पुष्टि करने की प्रक्रिया रद्द की."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"पासवर्ड का इस्तेमाल करें"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-hr/strings.xml b/biometric/biometric/src/main/res/values-hr/strings.xml
index c41fcce..d44a1714 100644
--- a/biometric/biometric/src/main/res/values-hr/strings.xml
+++ b/biometric/biometric/src/main/res/values-hr/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Dodirnite senzor otiska prsta"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nije prepoznat"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Područje poruke za pomoć"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardver za otisak prsta nije dostupan."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nije registriran nijedan otisak prsta."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Ovaj uređaj nema senzor otiska prsta"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Radnju s otiskom prsta otkazao je korisnik."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Previše pokušaja. Pokušajte ponovno kasnije."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Nepoznata pogreška"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Korisnik je otkazao autentifikaciju."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Koristite zaporku"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Dodirnite senzor otiska prsta"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nije prepoznat"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Područje poruke za pomoć"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardver za otisak prsta nije dostupan."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nije registriran nijedan otisak prsta."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Ovaj uređaj nema senzor otiska prsta"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Radnju s otiskom prsta otkazao je korisnik."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Previše pokušaja. Pokušajte ponovno kasnije."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Nepoznata pogreška"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Korisnik je otkazao autentifikaciju."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Koristite zaporku"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-hu/strings.xml b/biometric/biometric/src/main/res/values-hu/strings.xml
index a4387dd..a20bdf1 100644
--- a/biometric/biometric/src/main/res/values-hu/strings.xml
+++ b/biometric/biometric/src/main/res/values-hu/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Érintse meg az ujjlenyomat-érzékelőt"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nem ismerhető fel"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Súgószöveg területe"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Az ujjlenyomathoz szükséges hardverhez nem lehet hozzáférni."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nincsenek regisztrált ujjlenyomatok."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Ez az eszköz nem rendelkezik ujjlenyomat-érzékelővel"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Az ujjlenyomattal kapcsolatos műveletet a felhasználó megszakította."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Túl sok próbálkozás. Próbálja újra később."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Ismeretlen hiba"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"A hitelesítést megszakította a felhasználó."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Jelszó használata"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Érintse meg az ujjlenyomat-érzékelőt"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nem ismerhető fel"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Súgószöveg területe"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Az ujjlenyomathoz szükséges hardverhez nem lehet hozzáférni."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nincsenek regisztrált ujjlenyomatok."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Ez az eszköz nem rendelkezik ujjlenyomat-érzékelővel"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Az ujjlenyomattal kapcsolatos műveletet a felhasználó megszakította."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Túl sok próbálkozás. Próbálja újra később."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Ismeretlen hiba"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"A hitelesítést megszakította a felhasználó."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Jelszó használata"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-hy/strings.xml b/biometric/biometric/src/main/res/values-hy/strings.xml
index 84ffe5f..bdc384e 100644
--- a/biometric/biometric/src/main/res/values-hy/strings.xml
+++ b/biometric/biometric/src/main/res/values-hy/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Հպեք մատնահետքի սկաներին"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Չհաջողվեց ճանաչել"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Օգնության հաղորդագրության դաշտ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Մատնահետքերի սարքն անհասանելի է:"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Գրանցված մատնահետքեր չկան:"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Սարքը չունի մատնահետքերի սկաներ"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Մատնահետքով նույնականացման գործողությունը չեղարկվել է օգտատիրոջ կողմից:"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Չափից շատ փորձեր եք կատարել: Փորձեք ավելի ուշ:"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Անհայտ սխալ"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Օգտատերը չեղարկել է նույնականացումը։"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Օգտագործել գաղտնաբառ"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Հպեք մատնահետքի սկաներին"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Չհաջողվեց ճանաչել"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Օգնության հաղորդագրության դաշտ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Մատնահետքերի սարքն անհասանելի է:"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Գրանցված մատնահետքեր չկան:"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Սարքը չունի մատնահետքերի սկաներ"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Մատնահետքով նույնականացման գործողությունը չեղարկվել է օգտատիրոջ կողմից:"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Չափից շատ փորձեր եք կատարել: Փորձեք ավելի ուշ:"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Անհայտ սխալ"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Օգտատերը չեղարկել է նույնականացումը։"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Օգտագործել գաղտնաբառ"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-in/strings.xml b/biometric/biometric/src/main/res/values-in/strings.xml
index 8ff3b89..1e0e966 100644
--- a/biometric/biometric/src/main/res/values-in/strings.xml
+++ b/biometric/biometric/src/main/res/values-in/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Sentuh sensor sidik jari"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Tidak dikenali"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Area pesan bantuan"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardware sidik jari tidak tersedia."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Tidak ada sidik jari yang terdaftar."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Perangkat ini tidak memiliki sensor sidik jari"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Operasi sidik jari dibatalkan oleh pengguna."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Terlalu banyak upaya yang gagal. Coba lagi nanti."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Error tidak diketahui"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Autentikasi dibatalkan oleh pengguna."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Gunakan sandi"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Sentuh sensor sidik jari"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Tidak dikenali"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Area pesan bantuan"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardware sidik jari tidak tersedia."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Tidak ada sidik jari yang terdaftar."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Perangkat ini tidak memiliki sensor sidik jari"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Operasi sidik jari dibatalkan oleh pengguna."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Terlalu banyak upaya yang gagal. Coba lagi nanti."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Error tidak diketahui"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Autentikasi dibatalkan oleh pengguna."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Gunakan sandi"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-is/strings.xml b/biometric/biometric/src/main/res/values-is/strings.xml
index 03c5c71..6e89768 100644
--- a/biometric/biometric/src/main/res/values-is/strings.xml
+++ b/biometric/biometric/src/main/res/values-is/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Snertu fingrafaralesarann"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Þekktist ekki"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Svæði hjálparskilaboða"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Fingrafarsvélbúnaður ekki til staðar."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Engin fingraför hafa verið skráð."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Þetta tæki er ekki með fingrafaralesara"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Notandi hætti við að nota fingrafar."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Of margar tilraunir. Reyndu aftur síðar."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Óþekkt villa"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Notandi hætti við auðkenningu."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Nota aðgangsorð"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Snertu fingrafaralesarann"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Þekktist ekki"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Svæði hjálparskilaboða"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Fingrafarsvélbúnaður ekki til staðar."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Engin fingraför hafa verið skráð."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Þetta tæki er ekki með fingrafaralesara"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Notandi hætti við að nota fingrafar."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Of margar tilraunir. Reyndu aftur síðar."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Óþekkt villa"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Notandi hætti við auðkenningu."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Nota aðgangsorð"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-it/strings.xml b/biometric/biometric/src/main/res/values-it/strings.xml
index ae14998..49943c6 100644
--- a/biometric/biometric/src/main/res/values-it/strings.xml
+++ b/biometric/biometric/src/main/res/values-it/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Tocca sensore impronte"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Non riconosciuta"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Area dei messaggi di assistenza"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardware per l\'impronta non disponibile."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nessuna impronta digitale registrata."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Questo dispositivo non è dotato di sensore di impronte"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Operazione di autenticazione dell\'impronta annullata dall\'utente."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"È stato effettuato un numero eccessivo di tentativi. Riprova più tardi."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Errore sconosciuto"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Autenticazione annullata dall\'utente."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Utilizza password"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Tocca sensore impronte"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Non riconosciuta"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Area dei messaggi di assistenza"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardware per l\'impronta non disponibile."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nessuna impronta digitale registrata."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Questo dispositivo non è dotato di sensore di impronte"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Operazione di autenticazione dell\'impronta annullata dall\'utente."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"È stato effettuato un numero eccessivo di tentativi. Riprova più tardi."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Errore sconosciuto"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Autenticazione annullata dall\'utente."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Utilizza password"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-iw/strings.xml b/biometric/biometric/src/main/res/values-iw/strings.xml
index e4c9f1b..a5ad814 100644
--- a/biometric/biometric/src/main/res/values-iw/strings.xml
+++ b/biometric/biometric/src/main/res/values-iw/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"יש לגעת בחיישן טביעות האצבע"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"לא זוהתה"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"אזור הודעת עזרה"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"החומרה בשביל טביעת אצבע אינה זמינה."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"לא נרשמו טביעות אצבע."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"במכשיר זה אין חיישן טביעות אצבע"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"פעולת טביעת האצבע בוטלה בידי המשתמש."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"ניסית יותר מדי פעמים. יש לנסות שוב מאוחר יותר."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"שגיאה לא ידועה"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"האימות בוטל על ידי המשתמש."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"שימוש בסיסמה"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"יש לגעת בחיישן טביעות האצבע"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"לא זוהתה"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"אזור הודעת עזרה"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"החומרה בשביל טביעת אצבע אינה זמינה."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"לא נרשמו טביעות אצבע."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"במכשיר זה אין חיישן טביעות אצבע"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"פעולת טביעת האצבע בוטלה בידי המשתמש."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"ניסית יותר מדי פעמים. יש לנסות שוב מאוחר יותר."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"שגיאה לא ידועה"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"האימות בוטל על ידי המשתמש."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"שימוש בסיסמה"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ja/strings.xml b/biometric/biometric/src/main/res/values-ja/strings.xml
index 6bb95ad..cf101e01 100644
--- a/biometric/biometric/src/main/res/values-ja/strings.xml
+++ b/biometric/biometric/src/main/res/values-ja/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"指紋認証センサーをタップ"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"認識されませんでした"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"ヘルプ メッセージ領域"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"指紋認証ハードウェアは使用できません。"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"指紋が登録されていません。"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"このデバイスには指紋認証センサーがありません"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"指紋認証操作がユーザーによりキャンセルされました。"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"入力回数が上限を超えました。しばらくしてからもう一度お試しください。"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"不明なエラーです"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"認証はユーザーによりキャンセルされました。"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"パスワードを使用"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"指紋認証センサーをタップ"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"認識されませんでした"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"ヘルプ メッセージ領域"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"指紋認証ハードウェアは使用できません。"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"指紋が登録されていません。"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"このデバイスには指紋認証センサーがありません"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"指紋認証操作がユーザーによりキャンセルされました。"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"入力回数が上限を超えました。しばらくしてからもう一度お試しください。"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"不明なエラーです"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"認証はユーザーによりキャンセルされました。"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"パスワードを使用"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ka/strings.xml b/biometric/biometric/src/main/res/values-ka/strings.xml
index 35ea0bd..4fc3bf1 100644
--- a/biometric/biometric/src/main/res/values-ka/strings.xml
+++ b/biometric/biometric/src/main/res/values-ka/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"შეეხეთ თითის ანაბეჭდის სენსორს"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"არ არის ამოცნობილი"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"დამხმარე შეტყობინების არე"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"თითის ანაბეჭდის აპარატურა მიუწვდომელია."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"თითის ანაბეჭდები არ არის რეგისტრირებული."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"ამ მოწყობილობას არ აქვს თითის ანაბეჭდის სენსორი"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"თითის ანაბეჭდის ოპერაცია გააუქმა მომხმარებელმა."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"მეტისმეტად ბევრი მცდელობა იყო. გთხოვთ, ცადოთ მოგვიანებით."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"უცნობი შეცდომა"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"ავტორიზაცია გააუქმა მომხმარებელმა."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"პაროლის გამოყენება"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"შეეხეთ თითის ანაბეჭდის სენსორს"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"არ არის ამოცნობილი"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"დამხმარე შეტყობინების არე"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"თითის ანაბეჭდის აპარატურა მიუწვდომელია."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"თითის ანაბეჭდები არ არის რეგისტრირებული."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"ამ მოწყობილობას არ აქვს თითის ანაბეჭდის სენსორი"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"თითის ანაბეჭდის ოპერაცია გააუქმა მომხმარებელმა."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"მეტისმეტად ბევრი მცდელობა იყო. გთხოვთ, ცადოთ მოგვიანებით."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"უცნობი შეცდომა"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"ავტორიზაცია გააუქმა მომხმარებელმა."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"პაროლის გამოყენება"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-kk/strings.xml b/biometric/biometric/src/main/res/values-kk/strings.xml
index a3d0490..5ec7b3e 100644
--- a/biometric/biometric/src/main/res/values-kk/strings.xml
+++ b/biometric/biometric/src/main/res/values-kk/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Саусақ ізін оқу сканерін түртіңіз"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Танылмады"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Анықтама хабары аумағы"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Саусақ ізі жабдығы қолжетімді емес."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Саусақ іздері тіркелмеген."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Бұл құрылғыда саусақ ізін оқу сканері жоқ"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Пайдаланушы саусақ ізі операциясынан бас тартты."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Тым көп әрекет жасалды. Кейінірек қайталап көріңіз."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Белгісіз қате"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Пайдаланушы аутентификациядан бас тартты."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Құпия сөзді пайдалану"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Саусақ ізін оқу сканерін түртіңіз"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Танылмады"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Анықтама хабары аумағы"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Саусақ ізі жабдығы қолжетімді емес."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Саусақ іздері тіркелмеген."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Бұл құрылғыда саусақ ізін оқу сканері жоқ"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Пайдаланушы саусақ ізі операциясынан бас тартты."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Тым көп әрекет жасалды. Кейінірек қайталап көріңіз."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Белгісіз қате"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Пайдаланушы аутентификациядан бас тартты."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Құпия сөзді пайдалану"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-km/strings.xml b/biometric/biometric/src/main/res/values-km/strings.xml
index bccfa6f..566474f 100644
--- a/biometric/biometric/src/main/res/values-km/strings.xml
+++ b/biometric/biometric/src/main/res/values-km/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"ប៉ះ​ឧបករណ៍​ចាប់ស្នាម​ម្រាមដៃ"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"មិនអាចសម្គាល់បានទេ"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"តំបន់សារ​ជំនួយ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"មិន​អាច​ប្រើហាតវែរ​ស្នាមម្រាមដៃបាន​ទេ។"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"មិន​មាន​ការ​ថតបញ្ចូល​ស្នាម​ម្រាមដៃទេ។"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"ឧបករណ៍នេះ​មិនមាន​ឧបករណ៍ចាប់​ស្នាមម្រាមដៃទេ"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"ប្រតិបត្តិការ​ស្នាម​ម្រាម​ដៃ​ត្រូវ​បាន​បោះ​បង់​ដោយ​អ្នក​ប្រើប្រាស់។"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"ផ្ទៀងផ្ទាត់​មិនត្រឹមត្រូវ​ច្រើនដងពេក​។ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅ​ពេល​ក្រោយ​។"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"មាន​បញ្ហា​ដែល​មិន​ស្គាល់"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"អ្នកប្រើប្រាស់​បានបោះបង់​ការផ្ទៀងផ្ទាត់ហើយ។"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"ប្រើពាក្យសម្ងាត់"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"ប៉ះ​ឧបករណ៍​ចាប់ស្នាម​ម្រាមដៃ"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"មិនអាចសម្គាល់បានទេ"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"តំបន់សារ​ជំនួយ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"មិន​អាច​ប្រើហាតវែរ​ស្នាមម្រាមដៃបាន​ទេ។"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"មិន​មាន​ការ​ថតបញ្ចូល​ស្នាម​ម្រាមដៃទេ។"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"ឧបករណ៍នេះ​មិនមាន​ឧបករណ៍ចាប់​ស្នាមម្រាមដៃទេ"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"ប្រតិបត្តិការ​ស្នាម​ម្រាម​ដៃ​ត្រូវ​បាន​បោះ​បង់​ដោយ​អ្នក​ប្រើប្រាស់។"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"ផ្ទៀងផ្ទាត់​មិនត្រឹមត្រូវ​ច្រើនដងពេក​។ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅ​ពេល​ក្រោយ​។"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"មាន​បញ្ហា​ដែល​មិន​ស្គាល់"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"អ្នកប្រើប្រាស់​បានបោះបង់​ការផ្ទៀងផ្ទាត់ហើយ។"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"ប្រើពាក្យសម្ងាត់"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-kn/strings.xml b/biometric/biometric/src/main/res/values-kn/strings.xml
index 268ad3e..100b95b 100644
--- a/biometric/biometric/src/main/res/values-kn/strings.xml
+++ b/biometric/biometric/src/main/res/values-kn/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್‌‌ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"ಗುರುತಿಸಲಾಗಿಲ್ಲ"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"ಸಹಾಯ ಸಂದೇಶ ಪ್ರದೇಶ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಹಾರ್ಡ್‌ವೇರ್‌ ಲಭ್ಯವಿಲ್ಲ."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"ಯಾವುದೇ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಅನ್ನು ನೋಂದಣಿ ಮಾಡಿಲ್ಲ."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"ಈ ಸಾಧನವು ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಸೆನ್ಸರ್ ಅನ್ನು ಹೊಂದಿಲ್ಲ"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"ಬಳಕೆದಾರರು ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ರದ್ದುಪಡಿಸಿದ್ದಾರೆ."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"ಹಲವು ಬಾರಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"ಅಪರಿಚಿತ ದೋಷ"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"ಬಳಕೆದಾರರು ದೃಢೀಕರಣವನ್ನು ರದ್ದುಗೊಳಿಸಿದ್ದಾರೆ."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"ಪಾಸ್‌ವರ್ಡ್ ಬಳಸಿ"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್‌‌ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"ಗುರುತಿಸಲಾಗಿಲ್ಲ"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"ಸಹಾಯ ಸಂದೇಶ ಪ್ರದೇಶ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಹಾರ್ಡ್‌ವೇರ್‌ ಲಭ್ಯವಿಲ್ಲ."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"ಯಾವುದೇ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಅನ್ನು ನೋಂದಣಿ ಮಾಡಿಲ್ಲ."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"ಈ ಸಾಧನವು ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಸೆನ್ಸರ್ ಅನ್ನು ಹೊಂದಿಲ್ಲ"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"ಬಳಕೆದಾರರು ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ರದ್ದುಪಡಿಸಿದ್ದಾರೆ."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"ಹಲವು ಬಾರಿ ಪ್ರಯತ್ನಿಸಿರುವಿರಿ ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"ಅಪರಿಚಿತ ದೋಷ"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"ಬಳಕೆದಾರರು ದೃಢೀಕರಣವನ್ನು ರದ್ದುಗೊಳಿಸಿದ್ದಾರೆ."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"ಪಾಸ್‌ವರ್ಡ್ ಬಳಸಿ"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ko/strings.xml b/biometric/biometric/src/main/res/values-ko/strings.xml
index d350c76..757ca8d 100644
--- a/biometric/biometric/src/main/res/values-ko/strings.xml
+++ b/biometric/biometric/src/main/res/values-ko/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"지문 센서를 터치하세요."</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"인식할 수 없음"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"도움말 메시지 영역"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"지문 인식 하드웨어를 사용할 수 없습니다."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"등록된 지문이 없습니다."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"기기에 지문 센서가 없습니다."</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"사용자가 지문 인식 작업을 취소했습니다."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"시도 횟수가 너무 많습니다. 나중에 다시 시도해 주세요."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"알 수 없는 오류"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"사용자가 인증을 취소했습니다."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"비밀번호 사용"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"지문 센서를 터치하세요."</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"인식할 수 없음"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"도움말 메시지 영역"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"지문 인식 하드웨어를 사용할 수 없습니다."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"등록된 지문이 없습니다."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"기기에 지문 센서가 없습니다."</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"사용자가 지문 인식 작업을 취소했습니다."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"시도 횟수가 너무 많습니다. 나중에 다시 시도해 주세요."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"알 수 없는 오류"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"사용자가 인증을 취소했습니다."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"비밀번호 사용"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ky/strings.xml b/biometric/biometric/src/main/res/values-ky/strings.xml
index ff61915..e0e17ee 100644
--- a/biometric/biometric/src/main/res/values-ky/strings.xml
+++ b/biometric/biometric/src/main/res/values-ky/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Манжа изинин сенсорун басыңыз"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Таанылган жок"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Жардам билдирүүсү"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Манжа изинин аппараттык камсыздоосу жеткиликтүү эмес."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Бир да манжа изи катталган эмес."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Бул түзмөктө манжа изинин сенсору жок"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Манжа изи менен аныктыгын текшерүүнү колдонуучу жокко чыгарды."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Өтө көп жолу аракет кылдыңыз. Кийинчерээк кайра кайталап көрүңүз."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Белгисиз ката"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Аутентификацияны колдонуучу жокко чыгарды."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Сырсөз колдонуу"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Манжа изинин сенсорун басыңыз"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Таанылган жок"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Жардам билдирүүсү"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Манжа изинин аппараттык камсыздоосу жеткиликтүү эмес."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Бир да манжа изи катталган эмес."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Бул түзмөктө манжа изинин сенсору жок"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Манжа изи менен аныктыгын текшерүүнү колдонуучу жокко чыгарды."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Өтө көп жолу аракет кылдыңыз. Кийинчерээк кайра кайталап көрүңүз."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Белгисиз ката"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Аутентификацияны колдонуучу жокко чыгарды."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Сырсөз колдонуу"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-lo/strings.xml b/biometric/biometric/src/main/res/values-lo/strings.xml
index c7b64fb..a137eb9 100644
--- a/biometric/biometric/src/main/res/values-lo/strings.xml
+++ b/biometric/biometric/src/main/res/values-lo/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"ແຕະເຊັນເຊີລາຍນິ້ວມື"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"ບໍ່ຮັບຮູ້"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"ພື້ນທີ່ຂໍ້ຄວາມຊ່ວຍເຫຼືອ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"ບໍ່​ມີ​ຮາດ​ແວລາຍ​ນີ້ວ​ມື​ທີ່ສາມາດໃຊ້ໄດ້."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"ບໍ່ມີການລົງທະບຽນລາຍນິ້ວມື."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"ອຸປະກອນນີ້ບໍ່ມີເຊັນເຊີລາຍນິ້ວມື"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"ຜູ້ໃຊ້ໄດ້ຍົກເລີກຄຳສັ່ງລາຍນິ້ວມືແລ້ວ."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"ມີຄວາມພະຍາຍາມຫຼາຍເທື່ອເກີນໄປ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"ຄວາມຜິດພາດທີ່ບໍ່ຮູ້ຈັກ"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"ຜູ້ໃຊ້ຍົກເລີກການພິສູດຢືນຢັນແລ້ວ."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"ໃຊ້ລະຫັດຜ່ານ"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"ແຕະເຊັນເຊີລາຍນິ້ວມື"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"ບໍ່ຮັບຮູ້"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"ພື້ນທີ່ຂໍ້ຄວາມຊ່ວຍເຫຼືອ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"ບໍ່​ມີ​ຮາດ​ແວລາຍ​ນີ້ວ​ມື​ທີ່ສາມາດໃຊ້ໄດ້."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"ບໍ່ມີການລົງທະບຽນລາຍນິ້ວມື."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"ອຸປະກອນນີ້ບໍ່ມີເຊັນເຊີລາຍນິ້ວມື"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"ຜູ້ໃຊ້ໄດ້ຍົກເລີກຄຳສັ່ງລາຍນິ້ວມືແລ້ວ."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"ມີຄວາມພະຍາຍາມຫຼາຍເທື່ອເກີນໄປ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"ຄວາມຜິດພາດທີ່ບໍ່ຮູ້ຈັກ"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"ຜູ້ໃຊ້ຍົກເລີກການພິສູດຢືນຢັນແລ້ວ."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"ໃຊ້ລະຫັດຜ່ານ"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-lt/strings.xml b/biometric/biometric/src/main/res/values-lt/strings.xml
index e2500b1..fd900f5 100644
--- a/biometric/biometric/src/main/res/values-lt/strings.xml
+++ b/biometric/biometric/src/main/res/values-lt/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Palieskite piršto antspaudo jutiklį"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Neatpažinta"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Pagalbos pranešimo sritis"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Piršto antspaudo aparatinė įranga nepasiekiama."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Neužregistruota jokių kontrolinių kodų."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Šiame įrenginyje nėra piršto antspaudo jutiklio"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Piršto antspaudo operaciją atšaukė naudotojas."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Per daug bandymų. Vėliau bandykite dar kartą."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Nežinoma klaida"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Autentifikavimą atšaukė naudotojas."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Naudoti slaptažodį"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Palieskite piršto antspaudo jutiklį"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Neatpažinta"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Pagalbos pranešimo sritis"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Piršto antspaudo aparatinė įranga nepasiekiama."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Neužregistruota jokių kontrolinių kodų."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Šiame įrenginyje nėra piršto antspaudo jutiklio"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Piršto antspaudo operaciją atšaukė naudotojas."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Per daug bandymų. Vėliau bandykite dar kartą."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Nežinoma klaida"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Autentifikavimą atšaukė naudotojas."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Naudoti slaptažodį"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-lv/strings.xml b/biometric/biometric/src/main/res/values-lv/strings.xml
index 78c5396..5d856b9 100644
--- a/biometric/biometric/src/main/res/values-lv/strings.xml
+++ b/biometric/biometric/src/main/res/values-lv/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Pieskarieties pirksta nospieduma sensoram"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nav atpazīts"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Palīdzības ziņojuma apgabals"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Pirksta nospieduma aparatūra nav pieejama."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nav reģistrēts neviens pirksta nospiedums."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Šajā ierīcē nav pirksta nospieduma sensora"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Lietotājs atcēla pirksta nospieduma darbību."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Pārāk daudz mēģinājumu. Lūdzu, vēlāk mēģiniet vēlreiz."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Nezināma kļūda"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Lietotājs atcēla autentificēšanu."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Izmantot paroli"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Pieskarieties pirksta nospieduma sensoram"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nav atpazīts"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Palīdzības ziņojuma apgabals"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Pirksta nospieduma aparatūra nav pieejama."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nav reģistrēts neviens pirksta nospiedums."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Šajā ierīcē nav pirksta nospieduma sensora"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Lietotājs atcēla pirksta nospieduma darbību."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Pārāk daudz mēģinājumu. Lūdzu, vēlāk mēģiniet vēlreiz."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Nezināma kļūda"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Lietotājs atcēla autentificēšanu."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Izmantot paroli"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-mk/strings.xml b/biometric/biometric/src/main/res/values-mk/strings.xml
index bccbaf1..189c57d 100644
--- a/biometric/biometric/src/main/res/values-mk/strings.xml
+++ b/biometric/biometric/src/main/res/values-mk/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Допрете го сенз. за отпечатоци"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Непознат"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Поле за пораки за помош"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Нема достапен хардвер за отпечатоци."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Нема запишани отпечатоци."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Уредов нема сензор за отпечатоци"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Корисникот ја откажа потврдата со отпечаток."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Премногу обиди. Обидете се повторно подоцна."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Непозната грешка"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Проверката е откажана од корисникот."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Употребете ја лозинката"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Допрете го сенз. за отпечатоци"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Непознат"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Поле за пораки за помош"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Нема достапен хардвер за отпечатоци."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Нема запишани отпечатоци."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Уредов нема сензор за отпечатоци"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Корисникот ја откажа потврдата со отпечаток."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Премногу обиди. Обидете се повторно подоцна."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Непозната грешка"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Проверката е откажана од корисникот."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Употребете ја лозинката"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ml/strings.xml b/biometric/biometric/src/main/res/values-ml/strings.xml
index 7b6bdae..7ad583f 100644
--- a/biometric/biometric/src/main/res/values-ml/strings.xml
+++ b/biometric/biometric/src/main/res/values-ml/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"ഫിംഗർപ്രിന്റ് സെൻസർ സ്‌പർശിക്കുക"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"തിരിച്ചറിഞ്ഞില്ല"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"സഹായ സന്ദേശ ഏരിയ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"ഫിംഗർപ്രിന്റ് ഹാർഡ്‌വെയർ ലഭ്യമല്ല."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"ഫിംഗർപ്രിന്റുകളൊന്നും എൻറോൾ ചെയ്‌തിട്ടില്ല."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"ഈ ഉപകരണത്തിൽ ഫിംഗർപ്രിന്റ് സെൻസർ ഇല്ല"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"ഫിംഗർപ്രിന്റിന്റെ പ്രവർത്തനം ഉപയോക്താവ് റദ്ദാക്കി."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"നിരവധി ശ്രമങ്ങൾ. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"അജ്ഞാത പിശക്"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"പരിശോധിച്ചുറപ്പിക്കൽ ഉപയോക്താവ് റദ്ദാക്കി."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"പാസ്‌വേഡ് ഉപയോഗിക്കുക"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"ഫിംഗർപ്രിന്റ് സെൻസർ സ്‌പർശിക്കുക"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"തിരിച്ചറിഞ്ഞില്ല"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"സഹായ സന്ദേശ ഏരിയ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"ഫിംഗർപ്രിന്റ് ഹാർഡ്‌വെയർ ലഭ്യമല്ല."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"ഫിംഗർപ്രിന്റുകളൊന്നും എൻറോൾ ചെയ്‌തിട്ടില്ല."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"ഈ ഉപകരണത്തിൽ ഫിംഗർപ്രിന്റ് സെൻസർ ഇല്ല"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"ഫിംഗർപ്രിന്റിന്റെ പ്രവർത്തനം ഉപയോക്താവ് റദ്ദാക്കി."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"നിരവധി ശ്രമങ്ങൾ. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"അജ്ഞാത പിശക്"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"പരിശോധിച്ചുറപ്പിക്കൽ ഉപയോക്താവ് റദ്ദാക്കി."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"പാസ്‌വേഡ് ഉപയോഗിക്കുക"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-mn/strings.xml b/biometric/biometric/src/main/res/values-mn/strings.xml
index 107a3ca..f013c37 100644
--- a/biometric/biometric/src/main/res/values-mn/strings.xml
+++ b/biometric/biometric/src/main/res/values-mn/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Хурууны хээ мэдрэгчид хүрнэ үү"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Таниагүй"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Туслах мессежний хэсэг"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Хурууны хээний төхөөрөмж боломжгүй байна."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Бүртгүүлсэн хурууны хээ алга байна."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Энэ төхөөрөмжид хурууны хээ мэдрэгч алга байна"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Хэрэглэгч хурууны хээний баталгаажуулалтыг болиулсан байна."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Хэт олон удаа оролдлоо. Та дараа дахин оролдоно уу."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Тодорхойгүй алдаа гарлаа"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Хэрэглэгч нотолгоог цуцалсан."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Нууц үг ашиглах"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Хурууны хээ мэдрэгчид хүрнэ үү"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Таниагүй"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Туслах мессежний хэсэг"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Хурууны хээний төхөөрөмж боломжгүй байна."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Бүртгүүлсэн хурууны хээ алга байна."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Энэ төхөөрөмжид хурууны хээ мэдрэгч алга байна"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Хэрэглэгч хурууны хээний баталгаажуулалтыг болиулсан байна."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Хэт олон удаа оролдлоо. Та дараа дахин оролдоно уу."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Тодорхойгүй алдаа гарлаа"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Хэрэглэгч нотолгоог цуцалсан."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Нууц үг ашиглах"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-mr/strings.xml b/biometric/biometric/src/main/res/values-mr/strings.xml
index 248cb18..dbdf2e3 100644
--- a/biometric/biometric/src/main/res/values-mr/strings.xml
+++ b/biometric/biometric/src/main/res/values-mr/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"फिंगरप्रिंट सेन्सरला स्पर्श करा"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"ओळखले नाही"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"मदत मेसेज परिसर"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"फिंगरप्रिंट हार्डवेअर उपलब्‍ध नाही."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"कोणत्याही फिंगरप्रिंटची नोंद झाली नाही."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"या डिव्हाइसवर फिंगरप्रिंट सेन्सर नाही"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"वापरकर्त्याने फिंगरप्रिंट ऑपरेशन रद्द केले."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"खूप जास्त प्रयत्न. कृपया नंतर पुन्हा प्रयत्न करा."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"अज्ञात एरर"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"वापरकर्त्याने ऑथेंटिकेशन रद्द केले आहे."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"पासवर्ड वापरा"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"फिंगरप्रिंट सेन्सरला स्पर्श करा"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"ओळखले नाही"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"मदत मेसेज परिसर"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"फिंगरप्रिंट हार्डवेअर उपलब्‍ध नाही."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"कोणत्याही फिंगरप्रिंटची नोंद झाली नाही."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"या डिव्हाइसवर फिंगरप्रिंट सेन्सर नाही"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"वापरकर्त्याने फिंगरप्रिंट ऑपरेशन रद्द केले."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"खूप जास्त प्रयत्न. कृपया नंतर पुन्हा प्रयत्न करा."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"अज्ञात एरर"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"वापरकर्त्याने ऑथेंटिकेशन रद्द केले आहे."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"पासवर्ड वापरा"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ms/strings.xml b/biometric/biometric/src/main/res/values-ms/strings.xml
index 765da8b..cfbaf9d 100644
--- a/biometric/biometric/src/main/res/values-ms/strings.xml
+++ b/biometric/biometric/src/main/res/values-ms/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Sentuh penderia cap jari"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Tidak dikenali"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Bahagian mesej bantuan"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Perkakasan cap jari tidak tersedia."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Tiada cap jari didaftarkan."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Peranti ini tiada penderia cap jari"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Pengendalian cap jari dibatalkan oleh pengguna."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Terlalu banyak percubaan. Sila cuba sebentar lagi."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Ralat tidak diketahui"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Pengesahan dibatalkan oleh pengguna."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Guna kata laluan"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Sentuh penderia cap jari"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Tidak dikenali"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Bahagian mesej bantuan"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Perkakasan cap jari tidak tersedia."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Tiada cap jari didaftarkan."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Peranti ini tiada penderia cap jari"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Pengendalian cap jari dibatalkan oleh pengguna."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Terlalu banyak percubaan. Sila cuba sebentar lagi."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Ralat tidak diketahui"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Pengesahan dibatalkan oleh pengguna."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Guna kata laluan"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-my/strings.xml b/biometric/biometric/src/main/res/values-my/strings.xml
index 7ad87d9..74ff481 100644
--- a/biometric/biometric/src/main/res/values-my/strings.xml
+++ b/biometric/biometric/src/main/res/values-my/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"လက်ဗွေအာရုံခံကိရိယာကို တို့ပါ"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"မသိ"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"အကူအညီမက်ဆေ့ဂျ် နေရာ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"လက်ဗွေစက်ပစ္စည်း မရနိုင်ပါ။"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"မည်သည့် လက်ဗွေကိုမျှ ထည့်သွင်းမထားပါ။"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"ဤစက်ပစ္စည်းတွင် လက်ဗွေအာရုံခံကိရိယာ မရှိပါ"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"လက်ဗွေဖြင့် အထောက်အထားစိစစ်ခြင်းကို အသုံးပြုသူက ပယ်ဖျက်ထားသည်။"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"အကြိမ်များစွာ စမ်းပြီးပါပြီ။ နောက်မှ ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"အမျိုးအမည်မသိ အမှား"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"အသုံးပြုသူက အထောက်အထားစိစစ်ခြင်းကို ပယ်ဖျက်ထားသည်။"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"စကားဝှက်သုံးရန်"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"လက်ဗွေအာရုံခံကိရိယာကို တို့ပါ"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"မသိ"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"အကူအညီမက်ဆေ့ဂျ် နေရာ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"လက်ဗွေစက်ပစ္စည်း မရနိုင်ပါ။"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"မည်သည့် လက်ဗွေကိုမျှ ထည့်သွင်းမထားပါ။"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"ဤစက်ပစ္စည်းတွင် လက်ဗွေအာရုံခံကိရိယာ မရှိပါ"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"လက်ဗွေဖြင့် အထောက်အထားစိစစ်ခြင်းကို အသုံးပြုသူက ပယ်ဖျက်ထားသည်။"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"အကြိမ်များစွာ စမ်းပြီးပါပြီ။ နောက်မှ ထပ်စမ်းကြည့်ပါ။"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"အမျိုးအမည်မသိ အမှား"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"အသုံးပြုသူက အထောက်အထားစိစစ်ခြင်းကို ပယ်ဖျက်ထားသည်။"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"စကားဝှက်သုံးရန်"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-nb/strings.xml b/biometric/biometric/src/main/res/values-nb/strings.xml
index 4a6967d..7f5a9d0 100644
--- a/biometric/biometric/src/main/res/values-nb/strings.xml
+++ b/biometric/biometric/src/main/res/values-nb/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Trykk på fingeravtrykkssensoren"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Ikke gjenkjent"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Område for hjelpemelding"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Maskinvare for fingeravtrykk er ikke tilgjengelig."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Ingen fingeravtrykk er registrert."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Denne enheten har ikke fingeravtrykkssensor"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Fingeravtrykk-operasjonen ble avbrutt av brukeren."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Du har gjort for mange forsøk. Prøv på nytt senere."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Ukjent feil"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Autentiseringen ble avbrutt av brukeren."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Bruk passord"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Trykk på fingeravtrykkssensoren"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Ikke gjenkjent"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Område for hjelpemelding"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Maskinvare for fingeravtrykk er ikke tilgjengelig."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Ingen fingeravtrykk er registrert."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Denne enheten har ikke fingeravtrykkssensor"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Fingeravtrykk-operasjonen ble avbrutt av brukeren."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Du har gjort for mange forsøk. Prøv på nytt senere."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Ukjent feil"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Autentiseringen ble avbrutt av brukeren."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Bruk passord"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ne/strings.xml b/biometric/biometric/src/main/res/values-ne/strings.xml
index 76fd2b3..6bb5232 100644
--- a/biometric/biometric/src/main/res/values-ne/strings.xml
+++ b/biometric/biometric/src/main/res/values-ne/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"फिंगरप्रिन्ट सेन्सरमा छुनुहोस्‌"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"पहिचान भएन"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"मद्दतसम्बन्धी सन्देशको क्षेत्र"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"फिंगरप्रिन्ट हार्डवेयर उपलब्ध छैन।"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"कुनै पनि फिंगरप्रिन्ट दर्ता गरिएको छैन।"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"यो यन्त्रमा कुनै फिंगरप्रिन्ट सेन्सर छैन"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"प्रयोगकर्ताले फिंगरप्रिन्टसम्बन्धी कारबाही रद्द गर्नुभयो।"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"अत्यधिक पटक प्रयासहरू गरिए। कृपया पछि फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"अज्ञात त्रुटि"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"प्रयोगकर्ताले प्रमाणीकरण सेवा रद्द गर्नुभयो।"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"पासवर्ड प्रयोग गर्नुहोस्"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"फिंगरप्रिन्ट सेन्सरमा छुनुहोस्‌"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"पहिचान भएन"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"मद्दतसम्बन्धी सन्देशको क्षेत्र"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"फिंगरप्रिन्ट हार्डवेयर उपलब्ध छैन।"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"कुनै पनि फिंगरप्रिन्ट दर्ता गरिएको छैन।"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"यो यन्त्रमा कुनै फिंगरप्रिन्ट सेन्सर छैन"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"प्रयोगकर्ताले फिंगरप्रिन्टसम्बन्धी कारबाही रद्द गर्नुभयो।"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"अत्यधिक पटक प्रयासहरू गरिए। कृपया पछि फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"अज्ञात त्रुटि"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"प्रयोगकर्ताले प्रमाणीकरण सेवा रद्द गर्नुभयो।"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"पासवर्ड प्रयोग गर्नुहोस्"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-nl/strings.xml b/biometric/biometric/src/main/res/values-nl/strings.xml
index 934b51d..541ef9b 100644
--- a/biometric/biometric/src/main/res/values-nl/strings.xml
+++ b/biometric/biometric/src/main/res/values-nl/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Raak de vingerafdruksensor aan"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Niet herkend"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Gebied voor Help-berichten"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardware voor vingerafdruk niet beschikbaar."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Geen vingerafdrukken geregistreerd."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Dit apparaat heeft geen vingerafdruksensor"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Vingerafdrukverificatie geannuleerd door gebruiker."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Te veel pogingen. Probeer het later opnieuw."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Onbekende fout"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Verificatie geannuleerd door gebruiker."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Wachtwoord gebruiken"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Raak de vingerafdruksensor aan"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Niet herkend"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Gebied voor Help-berichten"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardware voor vingerafdruk niet beschikbaar."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Geen vingerafdrukken geregistreerd."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Dit apparaat heeft geen vingerafdruksensor"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Vingerafdrukverificatie geannuleerd door gebruiker."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Te veel pogingen. Probeer het later opnieuw."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Onbekende fout"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Verificatie geannuleerd door gebruiker."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Wachtwoord gebruiken"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-or/strings.xml b/biometric/biometric/src/main/res/values-or/strings.xml
index 96b6edb..7c4f075 100644
--- a/biometric/biometric/src/main/res/values-or/strings.xml
+++ b/biometric/biometric/src/main/res/values-or/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"ଟିପଚିହ୍ନ ସେନସର୍‌କୁ ଛୁଅଁନ୍ତୁ"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"ଚିହ୍ନଟ ହେଲାନାହିଁ"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"ସହାୟତା ମେସେଜ୍ କ୍ଷେତ୍ର"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"ଟିପଚିହ୍ନ ହାର୍ଡୱେର୍‍ ଉପଲବ୍ଧ ନାହିଁ।"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"କୌଣସି ଆଙ୍ଗୁଠି ଚିହ୍ନ ପଞ୍ଜୀକୃତ ହୋଇନାହିଁ।"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"ଏହି ଡିଭାଇସ୍‌ରେ ଟିପଚିହ୍ନ ସେନସର୍‌ ନାହିଁ"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"ଟିପଚିହ୍ନ କାର୍ଯ୍ୟ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଦ୍ୱାରା ବାତିଲ୍ କରାଯାଇଛି।"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"ବହୁତ ଅଧିକ ପ୍ରଚେଷ୍ଟା। ଦୟାକରି ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"ଅଜଣା ତ୍ରୁଟି"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଦ୍ୱାରା ପ୍ରାମାଣିକତା ବାତିଲ୍ କରାଯାଇଛି।"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"ପାସ୍‌ୱାର୍ଡ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"ଟିପଚିହ୍ନ ସେନସର୍‌କୁ ଛୁଅଁନ୍ତୁ"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"ଚିହ୍ନଟ ହେଲାନାହିଁ"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"ସହାୟତା ମେସେଜ୍ କ୍ଷେତ୍ର"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"ଟିପଚିହ୍ନ ହାର୍ଡୱେର୍‍ ଉପଲବ୍ଧ ନାହିଁ।"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"କୌଣସି ଆଙ୍ଗୁଠି ଚିହ୍ନ ପଞ୍ଜୀକୃତ ହୋଇନାହିଁ।"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"ଏହି ଡିଭାଇସ୍‌ରେ ଟିପଚିହ୍ନ ସେନସର୍‌ ନାହିଁ"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"ଟିପଚିହ୍ନ କାର୍ଯ୍ୟ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଦ୍ୱାରା ବାତିଲ୍ କରାଯାଇଛି।"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"ବହୁତ ଅଧିକ ପ୍ରଚେଷ୍ଟା। ଦୟାକରି ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"ଅଜଣା ତ୍ରୁଟି"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଦ୍ୱାରା ପ୍ରାମାଣିକତା ବାତିଲ୍ କରାଯାଇଛି।"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"ପାସ୍‌ୱାର୍ଡ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-pa/strings.xml b/biometric/biometric/src/main/res/values-pa/strings.xml
index 5bc162b..152122b 100644
--- a/biometric/biometric/src/main/res/values-pa/strings.xml
+++ b/biometric/biometric/src/main/res/values-pa/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"ਪਛਾਣ ਨਹੀਂ ਹੋਈ"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"ਮਦਦ ਸੁਨੇਹਾ ਖੇਤਰ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਹਾਰਡਵੇਅਰ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"ਕੋਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਰਜ ਨਹੀਂ ਕੀਤਾ ਗਿਆ।"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"ਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨਹੀਂ ਹੈ"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੇ ਪੁਸ਼ਟੀਕਰਨ ਦੀ ਕਾਰਵਾਈ ਵਰਤੋਂਕਾਰ ਵੱਲੋਂ ਰੱਦ ਕੀਤੀ ਗਈ।"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"ਬਹੁਤ ਜ਼ਿਆਦਾ ਕੋਸ਼ਿਸ਼ਾਂ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"ਅਗਿਆਤ ਗੜਬੜ"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"ਵਰਤੋਂਕਾਰ ਵੱਲੋਂ ਪ੍ਰਮਾਣੀਕਰਨ ਨੂੰ ਰੱਦ ਕੀਤਾ ਗਿਆ।"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"ਪਾਸਵਰਡ ਵਰਤੋ"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"ਪਛਾਣ ਨਹੀਂ ਹੋਈ"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"ਮਦਦ ਸੁਨੇਹਾ ਖੇਤਰ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਹਾਰਡਵੇਅਰ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"ਕੋਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਰਜ ਨਹੀਂ ਕੀਤਾ ਗਿਆ।"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"ਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨਹੀਂ ਹੈ"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੇ ਪੁਸ਼ਟੀਕਰਨ ਦੀ ਕਾਰਵਾਈ ਵਰਤੋਂਕਾਰ ਵੱਲੋਂ ਰੱਦ ਕੀਤੀ ਗਈ।"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"ਬਹੁਤ ਜ਼ਿਆਦਾ ਕੋਸ਼ਿਸ਼ਾਂ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"ਅਗਿਆਤ ਗੜਬੜ"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"ਵਰਤੋਂਕਾਰ ਵੱਲੋਂ ਪ੍ਰਮਾਣੀਕਰਨ ਨੂੰ ਰੱਦ ਕੀਤਾ ਗਿਆ।"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"ਪਾਸਵਰਡ ਵਰਤੋ"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-pl/strings.xml b/biometric/biometric/src/main/res/values-pl/strings.xml
index e441b16..e28c694 100644
--- a/biometric/biometric/src/main/res/values-pl/strings.xml
+++ b/biometric/biometric/src/main/res/values-pl/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Dotknij czytnika linii papilarnych"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nie rozpoznano"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Obszar komunikatu pomocy"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Czytnik linii papilarnych nie jest dostępny."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nie zarejestrowano odcisków palców."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"To urządzenie nie jest wyposażone w czytnik linii papilarnych"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Odczyt odcisku palca został anulowany przez użytkownika."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Zbyt wiele prób. Spróbuj ponownie później."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Nieznany błąd"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Użytkownik anulował uwierzytelnianie."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Użyj hasła"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Dotknij czytnika linii papilarnych"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nie rozpoznano"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Obszar komunikatu pomocy"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Czytnik linii papilarnych nie jest dostępny."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nie zarejestrowano odcisków palców."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"To urządzenie nie jest wyposażone w czytnik linii papilarnych"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Odczyt odcisku palca został anulowany przez użytkownika."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Zbyt wiele prób. Spróbuj ponownie później."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Nieznany błąd"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Użytkownik anulował uwierzytelnianie."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Użyj hasła"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-pt-rBR/strings.xml b/biometric/biometric/src/main/res/values-pt-rBR/strings.xml
index e782c2a..b3809d9 100644
--- a/biometric/biometric/src/main/res/values-pt-rBR/strings.xml
+++ b/biometric/biometric/src/main/res/values-pt-rBR/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Toque no sensor de digital"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Não reconhecido"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Área da mensagem de ajuda"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardware de impressão digital não disponível."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nenhuma impressão digital registrada."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Este dispositivo não tem um sensor de impressão digital"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Operação de impressão digital cancelada pelo usuário."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Muitas tentativas. Tente novamente mais tarde."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Erro desconhecido"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Autenticação cancelada pelo usuário."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Usar senha"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Toque no sensor de digital"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Não reconhecido"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Área da mensagem de ajuda"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardware de impressão digital não disponível."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nenhuma impressão digital registrada."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Este dispositivo não tem um sensor de impressão digital"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Operação de impressão digital cancelada pelo usuário."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Muitas tentativas. Tente novamente mais tarde."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Erro desconhecido"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Autenticação cancelada pelo usuário."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Usar senha"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-pt-rPT/strings.xml b/biometric/biometric/src/main/res/values-pt-rPT/strings.xml
index c968f68..1a9f7c8 100644
--- a/biometric/biometric/src/main/res/values-pt-rPT/strings.xml
+++ b/biometric/biometric/src/main/res/values-pt-rPT/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Toque no sensor de impressões digitais"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Não reconhecida."</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Área da mensagem de ajuda"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardware de impressão digital não disponível."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nenhuma impressão digital registada."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Este dispositivo não tem sensor de impressões digitais."</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Operação de impressão digital cancelada pelo utilizador."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Demasiadas tentativas. Tente novamente mais tarde."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Erro desconhecido."</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Autenticação cancelada pelo utilizador."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Utilizar palavra-passe"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Toque no sensor de impressões digitais"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Não reconhecida."</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Área da mensagem de ajuda"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardware de impressão digital não disponível."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nenhuma impressão digital registada."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Este dispositivo não tem sensor de impressões digitais."</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Operação de impressão digital cancelada pelo utilizador."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Demasiadas tentativas. Tente novamente mais tarde."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Erro desconhecido."</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Autenticação cancelada pelo utilizador."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Utilizar palavra-passe"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-pt/strings.xml b/biometric/biometric/src/main/res/values-pt/strings.xml
index e782c2a..b3809d9 100644
--- a/biometric/biometric/src/main/res/values-pt/strings.xml
+++ b/biometric/biometric/src/main/res/values-pt/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Toque no sensor de digital"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Não reconhecido"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Área da mensagem de ajuda"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardware de impressão digital não disponível."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nenhuma impressão digital registrada."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Este dispositivo não tem um sensor de impressão digital"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Operação de impressão digital cancelada pelo usuário."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Muitas tentativas. Tente novamente mais tarde."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Erro desconhecido"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Autenticação cancelada pelo usuário."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Usar senha"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Toque no sensor de digital"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Não reconhecido"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Área da mensagem de ajuda"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardware de impressão digital não disponível."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nenhuma impressão digital registrada."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Este dispositivo não tem um sensor de impressão digital"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Operação de impressão digital cancelada pelo usuário."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Muitas tentativas. Tente novamente mais tarde."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Erro desconhecido"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Autenticação cancelada pelo usuário."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Usar senha"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ro/strings.xml b/biometric/biometric/src/main/res/values-ro/strings.xml
index 3807b56..d8038c7 100644
--- a/biometric/biometric/src/main/res/values-ro/strings.xml
+++ b/biometric/biometric/src/main/res/values-ro/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Atingeți senzorul de amprentă"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nu este recunoscut"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Zona mesajelor de ajutor"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardware-ul pentru amprentă nu este disponibil."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nu au fost înregistrate amprente digitale."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Acest dispozitiv nu are senzor de amprentă"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Operațiunea privind amprenta a fost anulată de utilizator."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Prea multe încercări. Încercați din nou mai târziu."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Eroare necunoscută"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Autentificarea a fost anulată de utilizator."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Folosiți parola"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Atingeți senzorul de amprentă"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nu este recunoscut"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Zona mesajelor de ajutor"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardware-ul pentru amprentă nu este disponibil."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nu au fost înregistrate amprente digitale."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Acest dispozitiv nu are senzor de amprentă"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Operațiunea privind amprenta a fost anulată de utilizator."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Prea multe încercări. Încercați din nou mai târziu."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Eroare necunoscută"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Autentificarea a fost anulată de utilizator."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Folosiți parola"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ru/strings.xml b/biometric/biometric/src/main/res/values-ru/strings.xml
index fced37c..2866a3b 100644
--- a/biometric/biometric/src/main/res/values-ru/strings.xml
+++ b/biometric/biometric/src/main/res/values-ru/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Коснитесь сканера отпечатков."</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Не распознано"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Справочное сообщение"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Сканер отпечатков пальцев недоступен."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Нет отсканированных отпечатков пальцев."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"На этом устройстве нет сканера отпечатков пальцев."</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Операция с отпечатком пальца отменена пользователем."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Слишком много попыток входа. Попробуйте ещё раз позже."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Неизвестная ошибка"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Аутентификация отменена пользователем."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Ввести пароль"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Коснитесь сканера отпечатков."</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Не распознано"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Справочное сообщение"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Сканер отпечатков пальцев недоступен."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Нет отсканированных отпечатков пальцев."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"На этом устройстве нет сканера отпечатков пальцев."</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Операция с отпечатком пальца отменена пользователем."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Слишком много попыток входа. Попробуйте ещё раз позже."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Неизвестная ошибка"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Аутентификация отменена пользователем."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Ввести пароль"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-si/strings.xml b/biometric/biometric/src/main/res/values-si/strings.xml
index fdf2601..adbd701 100644
--- a/biometric/biometric/src/main/res/values-si/strings.xml
+++ b/biometric/biometric/src/main/res/values-si/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"හඳුනා නොගන්නා ලදී"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"උදවු පණිවිඩ ප්‍රදේශය"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"ඇඟිලි සලකුණු දෘඪාංගය ලද නොහැකිය."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"ඇඟිලි සලකුණු ඇතුළත් කර නොමැත."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"මෙම උපාංගයේ ඇඟිලි සලකුණු සංවේදකයක් නොමැත"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"පරිශීලක විසින් ඇඟිලි සලකුණු මෙහෙයුම අවසන් කරන ලදී."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"උත්සාහ ඉතා වැඩියි. පසුව නැවත උත්සාහ කරන්න."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"නොදන්නා දෝෂයකි"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"පරිශීලකයා විසින් සත්‍යාපනය අවලංගු කරන ලදි."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"මුරපදය භාවිත කරන්න"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"හඳුනා නොගන්නා ලදී"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"උදවු පණිවිඩ ප්‍රදේශය"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"ඇඟිලි සලකුණු දෘඪාංගය ලද නොහැකිය."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"ඇඟිලි සලකුණු ඇතුළත් කර නොමැත."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"මෙම උපාංගයේ ඇඟිලි සලකුණු සංවේදකයක් නොමැත"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"පරිශීලක විසින් ඇඟිලි සලකුණු මෙහෙයුම අවසන් කරන ලදී."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"උත්සාහ ඉතා වැඩියි. පසුව නැවත උත්සාහ කරන්න."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"නොදන්නා දෝෂයකි"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"පරිශීලකයා විසින් සත්‍යාපනය අවලංගු කරන ලදි."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"මුරපදය භාවිත කරන්න"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-sk/strings.xml b/biometric/biometric/src/main/res/values-sk/strings.xml
index 359d41d..20fc2e1 100644
--- a/biometric/biometric/src/main/res/values-sk/strings.xml
+++ b/biometric/biometric/src/main/res/values-sk/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Dotknite sa senzora odtlačkov prstov"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nerozpoznané"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Oblasť správy pomocníka"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardvér na snímanie odtlačku prsta nie je k dispozícii."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Neregistrovali ste žiadne odtlačky prstov."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Toto zariadenie nemá senzor odtlačkov prstov"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Overenie odtlačku prsta zrušil používateľ."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Príliš veľa pokusov. Skúste to znova neskôr."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Neznáma chyba"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Overenie zrušil používateľ."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Použiť heslo"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Dotknite sa senzora odtlačkov prstov"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nerozpoznané"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Oblasť správy pomocníka"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardvér na snímanie odtlačku prsta nie je k dispozícii."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Neregistrovali ste žiadne odtlačky prstov."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Toto zariadenie nemá senzor odtlačkov prstov"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Overenie odtlačku prsta zrušil používateľ."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Príliš veľa pokusov. Skúste to znova neskôr."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Neznáma chyba"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Overenie zrušil používateľ."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Použiť heslo"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-sl/strings.xml b/biometric/biometric/src/main/res/values-sl/strings.xml
index 5635ef4..c3572d0 100644
--- a/biometric/biometric/src/main/res/values-sl/strings.xml
+++ b/biometric/biometric/src/main/res/values-sl/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Dotaknite se tipala prst. odt."</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Ni prepoznano"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Območje sporočila pomoči"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Strojna oprema za prstne odtise ni na voljo."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Ni prijavljenih prstnih odtisov."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Ta naprava nima tipala prstnih odtisov"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Dejanje s prstnim odtisom je preklical uporabnik."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Preveč poskusov. Poskusite znova pozneje."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Neznana napaka"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Preverjanje pristnosti je preklical uporabnik."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Uporaba gesla"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Dotaknite se tipala prst. odt."</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Ni prepoznano"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Območje sporočila pomoči"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Strojna oprema za prstne odtise ni na voljo."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Ni prijavljenih prstnih odtisov."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Ta naprava nima tipala prstnih odtisov"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Dejanje s prstnim odtisom je preklical uporabnik."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Preveč poskusov. Poskusite znova pozneje."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Neznana napaka"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Preverjanje pristnosti je preklical uporabnik."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Uporaba gesla"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-sq/strings.xml b/biometric/biometric/src/main/res/values-sq/strings.xml
index f7f0652..a2a41e1 100644
--- a/biometric/biometric/src/main/res/values-sq/strings.xml
+++ b/biometric/biometric/src/main/res/values-sq/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Prek sensorin e gjurmës së gishtit"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Nuk njihet"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Zona e mesazhit të ndihmës"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hardueri i gjurmës së gishtit nuk mundësohet."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Nuk ka asnjë gjurmë gishti të regjistruar."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Kjo pajisje nuk ka një sensor të gjurmës së gishtit"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Veprimi i gjurmës së gishtit u anulua nga përdoruesi."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Janë bërë shumë përpjekje. Provo përsëri më vonë."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Gabim i panjohur"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Vërtetimi u anulua nga përdoruesi."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Përdor fjalëkalimin"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Prek sensorin e gjurmës së gishtit"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Nuk njihet"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Zona e mesazhit të ndihmës"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hardueri i gjurmës së gishtit nuk mundësohet."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Nuk ka asnjë gjurmë gishti të regjistruar."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Kjo pajisje nuk ka një sensor të gjurmës së gishtit"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Veprimi i gjurmës së gishtit u anulua nga përdoruesi."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Janë bërë shumë përpjekje. Provo përsëri më vonë."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Gabim i panjohur"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Vërtetimi u anulua nga përdoruesi."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Përdor fjalëkalimin"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-sr/strings.xml b/biometric/biometric/src/main/res/values-sr/strings.xml
index 66b6d3e..3752170 100644
--- a/biometric/biometric/src/main/res/values-sr/strings.xml
+++ b/biometric/biometric/src/main/res/values-sr/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Додирн. сензор за отисак прста"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Није препознат"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Област поруке за помоћ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Хардвер за отиске прстију није доступан."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Није регистрован ниједан отисак прста."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Овај уређај нема сензор за отисак прста"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Корисник је отказао радњу са отиском прста."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Превише покушаја. Пробајте поново касније."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Непозната грешка"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Корисник је отказао потврду идентитета."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Користите лозинку"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Додирн. сензор за отисак прста"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Није препознат"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Област поруке за помоћ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Хардвер за отиске прстију није доступан."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Није регистрован ниједан отисак прста."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Овај уређај нема сензор за отисак прста"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Корисник је отказао радњу са отиском прста."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Превише покушаја. Пробајте поново касније."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Непозната грешка"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Корисник је отказао потврду идентитета."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Користите лозинку"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-sv/strings.xml b/biometric/biometric/src/main/res/values-sv/strings.xml
index 0018453..a93a574 100644
--- a/biometric/biometric/src/main/res/values-sv/strings.xml
+++ b/biometric/biometric/src/main/res/values-sv/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Tryck på fingeravtryckssensorn"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Identifierades inte"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Område för hjälpmeddelande"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Det finns ingen maskinvara för fingeravtryck."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Inga fingeravtryck har registrerats."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Enheten har ingen fingeravtryckssensor"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Fingeravtrycksåtgärden avbröts av användaren."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"För många försök. Försök igen senare."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Okänt fel"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Användaren har avbrutit autentiseringen."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Använd lösenord"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Tryck på fingeravtryckssensorn"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Identifierades inte"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Område för hjälpmeddelande"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Det finns ingen maskinvara för fingeravtryck."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Inga fingeravtryck har registrerats."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Enheten har ingen fingeravtryckssensor"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Fingeravtrycksåtgärden avbröts av användaren."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"För många försök. Försök igen senare."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Okänt fel"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Användaren har avbrutit autentiseringen."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Använd lösenord"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-sw/strings.xml b/biometric/biometric/src/main/res/values-sw/strings.xml
index d28044b..b32e995 100644
--- a/biometric/biometric/src/main/res/values-sw/strings.xml
+++ b/biometric/biometric/src/main/res/values-sw/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Gusa kitambua alama ya kidole"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Haitambuliwi"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Sehemu ya ujumbe wa usaidizi"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Maunzi ya alama ya kidole hayapatikani."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Hakuna alama za vidole zilizojumuishwa."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Kifaa hiki hakina kitambua alama ya kidole"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Mtumiaji ameghairi uthibitishaji wa alama ya kidole."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Umejaribu mara nyingi mno. Tafadhali jaribu tena baadaye."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Hitilafu isiyojulikana"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Uthibitishaji umeghairiwa na mtumiaji."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Tumia nenosiri"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Gusa kitambua alama ya kidole"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Haitambuliwi"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Sehemu ya ujumbe wa usaidizi"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Maunzi ya alama ya kidole hayapatikani."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Hakuna alama za vidole zilizojumuishwa."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Kifaa hiki hakina kitambua alama ya kidole"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Mtumiaji ameghairi uthibitishaji wa alama ya kidole."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Umejaribu mara nyingi mno. Tafadhali jaribu tena baadaye."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Hitilafu isiyojulikana"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Uthibitishaji umeghairiwa na mtumiaji."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Tumia nenosiri"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ta/strings.xml b/biometric/biometric/src/main/res/values-ta/strings.xml
index b7e777e..9b3c80f 100644
--- a/biometric/biometric/src/main/res/values-ta/strings.xml
+++ b/biometric/biometric/src/main/res/values-ta/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"கைரேகை சென்சாரைத் தொடுக"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"பொருந்தவில்லை"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"உதவிச் செய்திக்கான பகுதி"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"கைரேகை வன்பொருள் இல்லை."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"கைரேகைப் பதிவுகள் எதுவுமில்லை."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"இந்தச் சாதனத்தில் கைரேகை சென்சார் இல்லை"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"கைரேகைச் சரிபார்ப்பு பயனரால் ரத்துசெய்யப்பட்டது."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"பலமுறை முயன்றுவிட்டீர்கள். பிறகு முயலவும்."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"அறியப்படாத பிழை"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"பயனரால் அங்கீகரிப்பு ரத்துசெய்யப்பட்டது."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"கடவுச்சொல்லைப் பயன்படுத்து"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"கைரேகை சென்சாரைத் தொடுக"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"பொருந்தவில்லை"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"உதவிச் செய்திக்கான பகுதி"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"கைரேகை வன்பொருள் இல்லை."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"கைரேகைப் பதிவுகள் எதுவுமில்லை."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"இந்தச் சாதனத்தில் கைரேகை சென்சார் இல்லை"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"கைரேகைச் சரிபார்ப்பு பயனரால் ரத்துசெய்யப்பட்டது."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"பலமுறை முயன்றுவிட்டீர்கள். பிறகு முயலவும்."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"அறியப்படாத பிழை"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"பயனரால் அங்கீகரிப்பு ரத்துசெய்யப்பட்டது."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"கடவுச்சொல்லைப் பயன்படுத்து"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-te/strings.xml b/biometric/biometric/src/main/res/values-te/strings.xml
index 72e1711..b66cb57 100644
--- a/biometric/biometric/src/main/res/values-te/strings.xml
+++ b/biometric/biometric/src/main/res/values-te/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"వేలిముద్ర సెన్సార్‌ను తాకండి"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"గుర్తించబడలేదు"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"సహాయ సందేశ ప్రాంతం"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"వేలిముద్ర హార్డ్‌వేర్ అందుబాటులో లేదు."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"వేలిముద్రలు నమోదు చేయబడలేదు."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"ఈ పరికరంలో వేలిముద్ర సెన్సార్ లేదు"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"వేలిముద్ర చర్యని వినియోగదారు రద్దు చేసారు."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"చాలా ఎక్కువ ప్రయత్నాలు చేసారు. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"తెలియని ఎర్రర్"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"వినియోగదారు ద్వారా ప్రామాణీకరణ రద్దు చేయబడింది"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"పాస్‌వర్డ్‌ను ఉపయోగించు"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"వేలిముద్ర సెన్సార్‌ను తాకండి"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"గుర్తించబడలేదు"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"సహాయ సందేశ ప్రాంతం"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"వేలిముద్ర హార్డ్‌వేర్ అందుబాటులో లేదు."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"వేలిముద్రలు నమోదు చేయబడలేదు."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"ఈ పరికరంలో వేలిముద్ర సెన్సార్ లేదు"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"వేలిముద్ర చర్యని వినియోగదారు రద్దు చేసారు."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"చాలా ఎక్కువ ప్రయత్నాలు చేసారు. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"తెలియని ఎర్రర్"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"వినియోగదారు ద్వారా ప్రామాణీకరణ రద్దు చేయబడింది"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"పాస్‌వర్డ్‌ను ఉపయోగించు"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-th/strings.xml b/biometric/biometric/src/main/res/values-th/strings.xml
index 42b94d5..12919fc 100644
--- a/biometric/biometric/src/main/res/values-th/strings.xml
+++ b/biometric/biometric/src/main/res/values-th/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"แตะเซ็นเซอร์ลายนิ้วมือ"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"ไม่รู้จัก"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"พื้นที่ข้อความช่วยเหลือ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"ฮาร์ดแวร์ลายนิ้วมือไม่พร้อมใช้งาน"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"ไม่มีลายนิ้วมือที่ลงทะเบียน"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"อุปกรณ์นี้ไม่มีเซ็นเซอร์ลายนิ้วมือ"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"ผู้ใช้ยกเลิกการทำงานของลายนิ้วมือ"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"ลองหลายครั้งเกินไป โปรดลองอีกครั้งภายหลัง"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"ข้อผิดพลาดที่ไม่รู้จัก"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"ผู้ใช้ยกเลิกการตรวจสอบสิทธิ์"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"ใช้รหัสผ่าน"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"แตะเซ็นเซอร์ลายนิ้วมือ"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"ไม่รู้จัก"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"พื้นที่ข้อความช่วยเหลือ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"ฮาร์ดแวร์ลายนิ้วมือไม่พร้อมใช้งาน"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"ไม่มีลายนิ้วมือที่ลงทะเบียน"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"อุปกรณ์นี้ไม่มีเซ็นเซอร์ลายนิ้วมือ"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"ผู้ใช้ยกเลิกการทำงานของลายนิ้วมือ"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"ลองหลายครั้งเกินไป โปรดลองอีกครั้งภายหลัง"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"ข้อผิดพลาดที่ไม่รู้จัก"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"ผู้ใช้ยกเลิกการตรวจสอบสิทธิ์"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"ใช้รหัสผ่าน"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-tl/strings.xml b/biometric/biometric/src/main/res/values-tl/strings.xml
index 9758e87..52457e3 100644
--- a/biometric/biometric/src/main/res/values-tl/strings.xml
+++ b/biometric/biometric/src/main/res/values-tl/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Pindutin ang fingerprint sensor"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Hindi nakilala"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Lugar ng mensahe ng tulong"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Hindi available ang hardware na ginagamitan ng fingerprint."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Walang naka-enroll na fingerprint."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Walang sensor para sa fingerprint ang device na ito"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Kinansela ng user ang operasyon sa fingerprint."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Masyadong maraming pagsubok. Pakisubukan ulit sa ibang pagkakataon."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Hindi alam na error"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Kinansela ng user ang pag-authenticate."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Gamitin ang password"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Pindutin ang fingerprint sensor"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Hindi nakilala"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Lugar ng mensahe ng tulong"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Hindi available ang hardware na ginagamitan ng fingerprint."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Walang naka-enroll na fingerprint."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Walang sensor para sa fingerprint ang device na ito"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Kinansela ng user ang operasyon sa fingerprint."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Masyadong maraming pagsubok. Pakisubukan ulit sa ibang pagkakataon."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Hindi alam na error"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Kinansela ng user ang pag-authenticate."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Gamitin ang password"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-tr/strings.xml b/biometric/biometric/src/main/res/values-tr/strings.xml
index 949db1ca..3303f86 100644
--- a/biometric/biometric/src/main/res/values-tr/strings.xml
+++ b/biometric/biometric/src/main/res/values-tr/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Parmak izi sensörüne dokunun"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Tanınmadı"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Yardım mesajı alanı"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Parmak izi donanımı kullanılamıyor."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Parmak izi kaydedilmedi."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Bu cihazda parmak izi sensörü yok"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Parmak izi işlemi kullanıcı tarafından iptal edildi."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Çok fazla deneme yapıldı. Lütfen daha sonra tekrar deneyin."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Bilinmeyen hata"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Kimlik doğrulama kullanıcı tarafından iptal edildi."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Şifre kullan"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Parmak izi sensörüne dokunun"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Tanınmadı"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Yardım mesajı alanı"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Parmak izi donanımı kullanılamıyor."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Parmak izi kaydedilmedi."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Bu cihazda parmak izi sensörü yok"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Parmak izi işlemi kullanıcı tarafından iptal edildi."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Çok fazla deneme yapıldı. Lütfen daha sonra tekrar deneyin."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Bilinmeyen hata"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Kimlik doğrulama kullanıcı tarafından iptal edildi."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Şifre kullan"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-uk/strings.xml b/biometric/biometric/src/main/res/values-uk/strings.xml
index a587e53..845af00 100644
--- a/biometric/biometric/src/main/res/values-uk/strings.xml
+++ b/biometric/biometric/src/main/res/values-uk/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Торкніться сканера відбитків пальців"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Не розпізнано"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Область довідкового повідомлення"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Сканер відбитків пальців недоступний."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Відбитки пальців не зареєстровано."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"На цьому пристрої немає сканера відбитків пальців"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Користувач скасував дію з відбитком пальця."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Забагато спроб. Зачекайте."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Невідома помилка"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Автентифікацію скасовано користувачем."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Ввести пароль"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Торкніться сканера відбитків пальців"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Не розпізнано"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Область довідкового повідомлення"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Сканер відбитків пальців недоступний."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Відбитки пальців не зареєстровано."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"На цьому пристрої немає сканера відбитків пальців"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Користувач скасував дію з відбитком пальця."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Забагато спроб. Зачекайте."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Невідома помилка"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Автентифікацію скасовано користувачем."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Ввести пароль"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-ur/strings.xml b/biometric/biometric/src/main/res/values-ur/strings.xml
index dea96a7..54442ba 100644
--- a/biometric/biometric/src/main/res/values-ur/strings.xml
+++ b/biometric/biometric/src/main/res/values-ur/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"فنگر پرنٹ سینسر کو ٹچ کریں"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"شناخت نہیں ہو سکی"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"مدد کے پیغام کا علاقہ"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"فنگر پرنٹ ہارڈ ویئر دستیاب نہیں ہے۔"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"کوئی فنگر پرنٹ مندرج نہیں ہے۔"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"اس آلہ میں فنگر پرنٹ سینسر نہیں ہے"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"صارف نے فنگر پرنٹ کی کارروائی منسوخ کر دی۔"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"کافی زیادہ کوششیں۔ براہ کرم بعد میں دوبارہ کوشش کریں۔"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"نامعلوم خرابی"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"صارف نے تصدیق کو منسوخ کر دیا۔"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"پاس ورڈ استعمال کریں"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"فنگر پرنٹ سینسر کو ٹچ کریں"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"شناخت نہیں ہو سکی"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"مدد کے پیغام کا علاقہ"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"فنگر پرنٹ ہارڈ ویئر دستیاب نہیں ہے۔"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"کوئی فنگر پرنٹ مندرج نہیں ہے۔"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"اس آلہ میں فنگر پرنٹ سینسر نہیں ہے"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"صارف نے فنگر پرنٹ کی کارروائی منسوخ کر دی۔"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"کافی زیادہ کوششیں۔ براہ کرم بعد میں دوبارہ کوشش کریں۔"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"نامعلوم خرابی"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"صارف نے تصدیق کو منسوخ کر دیا۔"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"پاس ورڈ استعمال کریں"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-uz/strings.xml b/biometric/biometric/src/main/res/values-uz/strings.xml
index 98e8681..eb5a758 100644
--- a/biometric/biometric/src/main/res/values-uz/strings.xml
+++ b/biometric/biometric/src/main/res/values-uz/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Barmoq izi skaneriga tegining"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Aniqlanmadi"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Yordam xabari"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Barmoq izi skaneri ish holatida emas."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Hech qanday barmoq izi qayd qilinmagan."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Bu qurilmada barmoq izi skaneri yo‘q"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Barmoq izi amali foydalanuvchi tomonidan bekor qilindi"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Juda koʻp urinish amalga oshirildi. Keyinroq qaytadan urining."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Notanish xato"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Autentifikatsiya foydalanuvchi tomonidan bekor qilindi"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Paroldan foydalanish"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Barmoq izi skaneriga tegining"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Aniqlanmadi"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Yordam xabari"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Barmoq izi skaneri ish holatida emas."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Hech qanday barmoq izi qayd qilinmagan."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Bu qurilmada barmoq izi skaneri yo‘q"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Barmoq izi amali foydalanuvchi tomonidan bekor qilindi"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Juda koʻp urinish amalga oshirildi. Keyinroq qaytadan urining."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Notanish xato"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Autentifikatsiya foydalanuvchi tomonidan bekor qilindi"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Paroldan foydalanish"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-vi/strings.xml b/biometric/biometric/src/main/res/values-vi/strings.xml
index e34ab77..8b3f701 100644
--- a/biometric/biometric/src/main/res/values-vi/strings.xml
+++ b/biometric/biometric/src/main/res/values-vi/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Chạm vào cảm biến vân tay"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Không nhận dạng được"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Vùng thông báo trợ giúp"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Không dùng được phần cứng vân tay."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Chưa đăng ký vân tay."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Thiết bị này không có cảm biến vân tay"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Người dùng đã hủy thao tác dùng dấu vân tay."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Bạn đã thử quá nhiều lần. Vui lòng thử lại sau."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Lỗi không xác định"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Người dùng đã hủy thao tác xác thực."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Dùng mật khẩu"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Chạm vào cảm biến vân tay"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Không nhận dạng được"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Vùng thông báo trợ giúp"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Không dùng được phần cứng vân tay."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Chưa đăng ký vân tay."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Thiết bị này không có cảm biến vân tay"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Người dùng đã hủy thao tác dùng dấu vân tay."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Bạn đã thử quá nhiều lần. Vui lòng thử lại sau."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Lỗi không xác định"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Người dùng đã hủy thao tác xác thực."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Dùng mật khẩu"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-zh-rCN/strings.xml b/biometric/biometric/src/main/res/values-zh-rCN/strings.xml
index 1437f81..73ab18c1 100644
--- a/biometric/biometric/src/main/res/values-zh-rCN/strings.xml
+++ b/biometric/biometric/src/main/res/values-zh-rCN/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"请轻触指纹传感器"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"无法识别"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"帮助消息区域"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"指纹硬件无法使用。"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"未注册任何指纹。"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"此设备没有指纹传感器"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"用户取消了指纹操作。"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"尝试次数过多,请稍后重试。"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"未知错误"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"用户已取消身份验证。"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"使用密码"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"请轻触指纹传感器"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"无法识别"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"帮助消息区域"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"指纹硬件无法使用。"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"未注册任何指纹。"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"此设备没有指纹传感器"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"用户取消了指纹操作。"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"尝试次数过多,请稍后重试。"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"未知错误"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"用户已取消身份验证。"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"使用密码"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-zh-rHK/strings.xml b/biometric/biometric/src/main/res/values-zh-rHK/strings.xml
index 0f7671c..5bc74eb 100644
--- a/biometric/biometric/src/main/res/values-zh-rHK/strings.xml
+++ b/biometric/biometric/src/main/res/values-zh-rHK/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"請輕觸指紋感應器"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"未能識別"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"說明訊息區域"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"無法使用指紋硬件。"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"尚未註冊任何指紋。"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"此裝置沒有指紋感應器"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"使用者已取消指紋操作。"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"嘗試次數過多。請稍後再試。"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"不明錯誤"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"使用者已取消驗證。"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"使用密碼"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"請輕觸指紋感應器"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"未能識別"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"說明訊息區域"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"無法使用指紋硬件。"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"尚未註冊任何指紋。"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"此裝置沒有指紋感應器"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"使用者已取消指紋操作。"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"嘗試次數過多。請稍後再試。"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"不明錯誤"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"使用者已取消驗證。"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"使用密碼"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-zh-rTW/strings.xml b/biometric/biometric/src/main/res/values-zh-rTW/strings.xml
index 7068bd7..e67126e 100644
--- a/biometric/biometric/src/main/res/values-zh-rTW/strings.xml
+++ b/biometric/biometric/src/main/res/values-zh-rTW/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"請輕觸指紋感應器"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"無法辨識"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"說明訊息區域"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"指紋硬體無法使用。"</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"未登錄任何指紋。"</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"這個裝置沒有指紋感應器"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"使用者已取消指紋驗證作業。"</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"嘗試次數過多,請稍後再試。"</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"不明的錯誤"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"使用者已取消驗證作業。"</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"使用密碼"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"請輕觸指紋感應器"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"無法辨識"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"說明訊息區域"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"指紋硬體無法使用。"</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"未登錄任何指紋。"</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"這個裝置沒有指紋感應器"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"使用者已取消指紋驗證作業。"</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"嘗試次數過多,請稍後再試。"</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"不明的錯誤"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"使用者已取消驗證作業。"</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"使用密碼"</string>
 </resources>
diff --git a/biometric/biometric/src/main/res/values-zu/strings.xml b/biometric/biometric/src/main/res/values-zu/strings.xml
index 964e369..e2a7e4d 100644
--- a/biometric/biometric/src/main/res/values-zu/strings.xml
+++ b/biometric/biometric/src/main/res/values-zu/strings.xml
@@ -17,15 +17,15 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fingerprint_dialog_touch_sensor" msgid="5354590751262189738">"Thinta inzwa yezigxivizo zeminwe"</string>
-    <string name="fingerprint_not_recognized" msgid="5491287833813257925">"Akwaziwa"</string>
-    <string name="accessibility_fingerprint_dialog_help_area" msgid="6241458715391513061">"Indawo yosizo lomlayezo"</string>
-    <string name="fingerprint_error_hw_not_available" msgid="3976825677335166260">"Izingxenyekazi zekhompuyutha zezigxivizo zeminwe azitholakali."</string>
-    <string name="fingerprint_error_no_fingerprints" msgid="3350805046152877040">"Azikho izigxivizo zeminwe ezibhalisiwe."</string>
-    <string name="fingerprint_error_hw_not_present" msgid="1176237289575184578">"Le divayisi ayinayo inzwa yezigxivizo zeminwe"</string>
-    <string name="fingerprint_error_user_canceled" msgid="3421037373085129417">"Umsebenzi wezigxivizo zeminwe ukhanselwe umsebenzisi."</string>
-    <string name="fingerprint_error_lockout" msgid="1651062876313169162">"Imizamo eminingi kakhulu. Sicela uzame futhi ngokuhamba kwesikhathi."</string>
-    <string name="default_error_msg" msgid="7497355367608150274">"Iphutha elingaziwe"</string>
-    <string name="generic_error_user_canceled" msgid="7474799539658018076">"Ukugunyaza kukhanselwe umsebenzisi."</string>
-    <string name="confirm_device_credential_password" msgid="4296851028928624518">"Sebenzisa iphasiwedi"</string>
+    <string name="fingerprint_dialog_touch_sensor" msgid="1072308044213194243">"Thinta inzwa yezigxivizo zeminwe"</string>
+    <string name="fingerprint_not_recognized" msgid="3873359464293253009">"Akwaziwa"</string>
+    <string name="accessibility_fingerprint_dialog_help_area" msgid="549244739212894678">"Indawo yosizo lomlayezo"</string>
+    <string name="fingerprint_error_hw_not_available" msgid="8216738333501875566">"Izingxenyekazi zekhompuyutha zezigxivizo zeminwe azitholakali."</string>
+    <string name="fingerprint_error_no_fingerprints" msgid="7520712796891883488">"Azikho izigxivizo zeminwe ezibhalisiwe."</string>
+    <string name="fingerprint_error_hw_not_present" msgid="6306988885793029438">"Le divayisi ayinayo inzwa yezigxivizo zeminwe"</string>
+    <string name="fingerprint_error_user_canceled" msgid="7627716295344353987">"Umsebenzi wezigxivizo zeminwe ukhanselwe umsebenzisi."</string>
+    <string name="fingerprint_error_lockout" msgid="7291787166416782245">"Imizamo eminingi kakhulu. Sicela uzame futhi ngokuhamba kwesikhathi."</string>
+    <string name="default_error_msg" msgid="4776854077120974966">"Iphutha elingaziwe"</string>
+    <string name="generic_error_user_canceled" msgid="7309881387583143581">"Ukugunyaza kukhanselwe umsebenzisi."</string>
+    <string name="confirm_device_credential_password" msgid="5912733858573823945">"Sebenzisa iphasiwedi"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-af/strings.xml b/browser/browser/src/main/res/values-af/strings.xml
index e59ccd1..599e05e 100644
--- a/browser/browser/src/main/res/values-af/strings.xml
+++ b/browser/browser/src/main/res/values-af/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Maak in blaaier oop"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopieer skakel"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Deel skakel"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Skakel is na knipbord gekopieer"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Maak in blaaier oop"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopieer skakel"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Deel skakel"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Skakel is na knipbord gekopieer"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-am/strings.xml b/browser/browser/src/main/res/values-am/strings.xml
index d5c7fb4..b75f4aea 100644
--- a/browser/browser/src/main/res/values-am/strings.xml
+++ b/browser/browser/src/main/res/values-am/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"በአሳሽ ውስጥ ክፈት"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"አገናኝ ቅዳ"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"አገናኝ አጋራ"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"አገናኝ ወደ ቅንጥብ ሰሌዳ ተቀድቷል"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"በአሳሽ ውስጥ ክፈት"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"አገናኝ ቅዳ"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"አገናኝ አጋራ"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"አገናኝ ወደ ቅንጥብ ሰሌዳ ተቀድቷል"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ar/strings.xml b/browser/browser/src/main/res/values-ar/strings.xml
index 649645f..9863e36 100644
--- a/browser/browser/src/main/res/values-ar/strings.xml
+++ b/browser/browser/src/main/res/values-ar/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"فتح في المتصفح"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"نسخ الرابط"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"مشاركة الرابط"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"تم نسخ الرابط إلى الحافظة."</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"فتح في المتصفح"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"نسخ الرابط"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"مشاركة الرابط"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"تم نسخ الرابط إلى الحافظة."</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-as/strings.xml b/browser/browser/src/main/res/values-as/strings.xml
index 23b6bca..6e100a1 100644
--- a/browser/browser/src/main/res/values-as/strings.xml
+++ b/browser/browser/src/main/res/values-as/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ব্ৰাউজাৰত খোলক"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"লিংক প্ৰতিলিপি কৰক"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"লিংক শ্বেয়াৰ কৰক"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"লিংক ক্লিপব’ৰ্ডত প্ৰতিলিপি কৰা হ’ল"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ব্ৰাউজাৰত খোলক"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"লিংক প্ৰতিলিপি কৰক"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"লিংক শ্বেয়াৰ কৰক"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"লিংক ক্লিপব’ৰ্ডত প্ৰতিলিপি কৰা হ’ল"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-az/strings.xml b/browser/browser/src/main/res/values-az/strings.xml
index e3d1ae5..fa161510 100644
--- a/browser/browser/src/main/res/values-az/strings.xml
+++ b/browser/browser/src/main/res/values-az/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Brauzerdə açın"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Linki kopyalayın"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Linki paylaşın"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link buferə kopyalandı"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Brauzerdə açın"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Linki kopyalayın"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Linki paylaşın"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link buferə kopyalandı"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-b+sr+Latn/strings.xml b/browser/browser/src/main/res/values-b+sr+Latn/strings.xml
index 1af7e1e..b695dfd 100644
--- a/browser/browser/src/main/res/values-b+sr+Latn/strings.xml
+++ b/browser/browser/src/main/res/values-b+sr+Latn/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Otvori u pregledaču"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopiraj link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Deli link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link je kopiran u privremenu memoriju"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Otvori u pregledaču"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopiraj link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Deli link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link je kopiran u privremenu memoriju"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-be/strings.xml b/browser/browser/src/main/res/values-be/strings.xml
index 087969c..1c5d0e2 100644
--- a/browser/browser/src/main/res/values-be/strings.xml
+++ b/browser/browser/src/main/res/values-be/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Адкрыць у браўзеры"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Скапіраваць спасылку"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Абагуліць спасылку"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Спасылка скапіравана ў буфер абмену"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Адкрыць у браўзеры"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Скапіраваць спасылку"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Абагуліць спасылку"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Спасылка скапіравана ў буфер абмену"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-bg/strings.xml b/browser/browser/src/main/res/values-bg/strings.xml
index 2b0eb5f..c3387f18 100644
--- a/browser/browser/src/main/res/values-bg/strings.xml
+++ b/browser/browser/src/main/res/values-bg/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Отваряне в браузър"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Копиране на връзката"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Споделяне на връзката"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Връзката е копирана в буферната памет"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Отваряне в браузър"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Копиране на връзката"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Споделяне на връзката"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Връзката е копирана в буферната памет"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-bn/strings.xml b/browser/browser/src/main/res/values-bn/strings.xml
index 5644768..e42ce0d 100644
--- a/browser/browser/src/main/res/values-bn/strings.xml
+++ b/browser/browser/src/main/res/values-bn/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ব্রাউজারে খুলুন"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"লিঙ্ক কপি করুন"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"লিঙ্ক শেয়ার করুন"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"লিঙ্ক ক্লিপবোর্ডে কপি করা হয়েছে"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ব্রাউজারে খুলুন"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"লিঙ্ক কপি করুন"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"লিঙ্ক শেয়ার করুন"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"লিঙ্ক ক্লিপবোর্ডে কপি করা হয়েছে"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-bs/strings.xml b/browser/browser/src/main/res/values-bs/strings.xml
index 08a68e5..f5880a4 100644
--- a/browser/browser/src/main/res/values-bs/strings.xml
+++ b/browser/browser/src/main/res/values-bs/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Otvori u pregledniku"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopiraj link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Dijeli link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link je kopiran u međumemoriju"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Otvori u pregledniku"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopiraj link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Dijeli link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link je kopiran u međumemoriju"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ca/strings.xml b/browser/browser/src/main/res/values-ca/strings.xml
index eec60c9..b3fedf7 100644
--- a/browser/browser/src/main/res/values-ca/strings.xml
+++ b/browser/browser/src/main/res/values-ca/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Obre al navegador"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copia l\'enllaç"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Comparteix l\'enllaç"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"S\'ha copiat l\'enllaç al porta-retalls"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Obre al navegador"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copia l\'enllaç"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Comparteix l\'enllaç"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"S\'ha copiat l\'enllaç al porta-retalls"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-cs/strings.xml b/browser/browser/src/main/res/values-cs/strings.xml
index f877d4c..6227da2 100644
--- a/browser/browser/src/main/res/values-cs/strings.xml
+++ b/browser/browser/src/main/res/values-cs/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Otevřít v prohlížeči"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopírovat odkaz"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Sdílet odkaz"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Odkaz zkopírován do schránky"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Otevřít v prohlížeči"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopírovat odkaz"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Sdílet odkaz"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Odkaz zkopírován do schránky"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-da/strings.xml b/browser/browser/src/main/res/values-da/strings.xml
index 9df467b..cda2f5d 100644
--- a/browser/browser/src/main/res/values-da/strings.xml
+++ b/browser/browser/src/main/res/values-da/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Åbn i browser"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopiér link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Del link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Linket er kopieret til udklipsholderen"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Åbn i browser"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopiér link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Del link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Linket er kopieret til udklipsholderen"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-de/strings.xml b/browser/browser/src/main/res/values-de/strings.xml
index 775b002..0c50fee 100644
--- a/browser/browser/src/main/res/values-de/strings.xml
+++ b/browser/browser/src/main/res/values-de/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Im Browser öffnen"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Link kopieren"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Link teilen"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link in Zwischenablage kopiert"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Im Browser öffnen"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Link kopieren"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Link teilen"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link in Zwischenablage kopiert"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-el/strings.xml b/browser/browser/src/main/res/values-el/strings.xml
index 69b36794..b8764f0 100644
--- a/browser/browser/src/main/res/values-el/strings.xml
+++ b/browser/browser/src/main/res/values-el/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Άνοιγμα σε πρόγραμμα περιήγησης"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Αντιγραφή συνδέσμου"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Κοινοποίηση συνδέσμου"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Ο σύνδεσμος αντιγράφηκε στο πρόχειρο"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Άνοιγμα σε πρόγραμμα περιήγησης"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Αντιγραφή συνδέσμου"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Κοινοποίηση συνδέσμου"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Ο σύνδεσμος αντιγράφηκε στο πρόχειρο"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-en-rAU/strings.xml b/browser/browser/src/main/res/values-en-rAU/strings.xml
index ea0b092..70fd721 100644
--- a/browser/browser/src/main/res/values-en-rAU/strings.xml
+++ b/browser/browser/src/main/res/values-en-rAU/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Open in browser"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copy link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Share link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link copied to clipboard"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Open in browser"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copy link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Share link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link copied to clipboard"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-en-rCA/strings.xml b/browser/browser/src/main/res/values-en-rCA/strings.xml
index ea0b092..70fd721 100644
--- a/browser/browser/src/main/res/values-en-rCA/strings.xml
+++ b/browser/browser/src/main/res/values-en-rCA/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Open in browser"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copy link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Share link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link copied to clipboard"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Open in browser"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copy link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Share link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link copied to clipboard"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-en-rGB/strings.xml b/browser/browser/src/main/res/values-en-rGB/strings.xml
index ea0b092..70fd721 100644
--- a/browser/browser/src/main/res/values-en-rGB/strings.xml
+++ b/browser/browser/src/main/res/values-en-rGB/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Open in browser"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copy link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Share link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link copied to clipboard"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Open in browser"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copy link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Share link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link copied to clipboard"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-en-rIN/strings.xml b/browser/browser/src/main/res/values-en-rIN/strings.xml
index ea0b092..70fd721 100644
--- a/browser/browser/src/main/res/values-en-rIN/strings.xml
+++ b/browser/browser/src/main/res/values-en-rIN/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Open in browser"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copy link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Share link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link copied to clipboard"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Open in browser"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copy link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Share link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link copied to clipboard"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-en-rXC/strings.xml b/browser/browser/src/main/res/values-en-rXC/strings.xml
index bd2eb9f..8c57bb5 100644
--- a/browser/browser/src/main/res/values-en-rXC/strings.xml
+++ b/browser/browser/src/main/res/values-en-rXC/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎Open in browser‎‏‎‎‏‎"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎Copy link‎‏‎‎‏‎"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‎Share link‎‏‎‎‏‎"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎Link copied to clipboard‎‏‎‎‏‎"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎Open in browser‎‏‎‎‏‎"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‏‏‎Copy link‎‏‎‎‏‎"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎Share link‎‏‎‎‏‎"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎Link copied to clipboard‎‏‎‎‏‎"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-es-rUS/strings.xml b/browser/browser/src/main/res/values-es-rUS/strings.xml
index 22197c9..a50c42b 100644
--- a/browser/browser/src/main/res/values-es-rUS/strings.xml
+++ b/browser/browser/src/main/res/values-es-rUS/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Abrir en el navegador"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copiar vínculo"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Compartir vínculo"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Se copió el vínculo al portapapeles"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Abrir en el navegador"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copiar vínculo"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Compartir vínculo"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Se copió el vínculo al portapapeles"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-es/strings.xml b/browser/browser/src/main/res/values-es/strings.xml
index 8eeb751..3f317fb 100644
--- a/browser/browser/src/main/res/values-es/strings.xml
+++ b/browser/browser/src/main/res/values-es/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Abrir en el navegador"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copiar enlace"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Compartir enlace"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Enlace copiado en el portapapeles"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Abrir en el navegador"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copiar enlace"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Compartir enlace"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Enlace copiado en el portapapeles"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-et/strings.xml b/browser/browser/src/main/res/values-et/strings.xml
index 42a6eae..40b3b70 100644
--- a/browser/browser/src/main/res/values-et/strings.xml
+++ b/browser/browser/src/main/res/values-et/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Ava brauseris"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopeeri link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Jaga linki"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link kopeeriti lõikelauale"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Ava brauseris"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopeeri link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Jaga linki"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link kopeeriti lõikelauale"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-eu/strings.xml b/browser/browser/src/main/res/values-eu/strings.xml
index 8d89547..38fc717 100644
--- a/browser/browser/src/main/res/values-eu/strings.xml
+++ b/browser/browser/src/main/res/values-eu/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Ireki arakatzailean"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopiatu esteka"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Partekatu esteka"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Arbelean kopiatu da esteka"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Ireki arakatzailean"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopiatu esteka"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Partekatu esteka"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Arbelean kopiatu da esteka"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-fa/strings.xml b/browser/browser/src/main/res/values-fa/strings.xml
index 2cfea67..5cec382 100644
--- a/browser/browser/src/main/res/values-fa/strings.xml
+++ b/browser/browser/src/main/res/values-fa/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"بازکردن در مرورگر"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"کپی پیوند"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"هم‌رسانی پیوند"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"پیوند در بریده‌دان کپی شد"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"بازکردن در مرورگر"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"کپی پیوند"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"هم‌رسانی پیوند"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"پیوند در بریده‌دان کپی شد"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-fi/strings.xml b/browser/browser/src/main/res/values-fi/strings.xml
index cb34407..0314aeb 100644
--- a/browser/browser/src/main/res/values-fi/strings.xml
+++ b/browser/browser/src/main/res/values-fi/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Avaa selaimessa"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopioi linkki"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Jaa linkki"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Linkki kopioitu leikepöydälle"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Avaa selaimessa"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopioi linkki"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Jaa linkki"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Linkki kopioitu leikepöydälle"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-fr-rCA/strings.xml b/browser/browser/src/main/res/values-fr-rCA/strings.xml
index 43eee31..10ed540 100644
--- a/browser/browser/src/main/res/values-fr-rCA/strings.xml
+++ b/browser/browser/src/main/res/values-fr-rCA/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Ouvrir dans le navigateur"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copier le lien"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Partager le lien"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Lien copié dans le presse-papiers"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Ouvrir dans le navigateur"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copier le lien"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Partager le lien"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Lien copié dans le presse-papiers"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-fr/strings.xml b/browser/browser/src/main/res/values-fr/strings.xml
index 3569c1c..3b8103a 100644
--- a/browser/browser/src/main/res/values-fr/strings.xml
+++ b/browser/browser/src/main/res/values-fr/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Ouvrir dans un navigateur"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copier le lien"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Partager le lien"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Lien copié dans le presse-papiers"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Ouvrir dans un navigateur"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copier le lien"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Partager le lien"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Lien copié dans le presse-papiers"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-gl/strings.xml b/browser/browser/src/main/res/values-gl/strings.xml
index 7e45ef2..594f767 100644
--- a/browser/browser/src/main/res/values-gl/strings.xml
+++ b/browser/browser/src/main/res/values-gl/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Abrir no navegador"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copiar ligazón"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Compartir ligazón"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Copiouse a ligazón no portapapeis"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Abrir no navegador"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copiar ligazón"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Compartir ligazón"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Copiouse a ligazón no portapapeis"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-gu/strings.xml b/browser/browser/src/main/res/values-gu/strings.xml
index fe498b0..ae949b6 100644
--- a/browser/browser/src/main/res/values-gu/strings.xml
+++ b/browser/browser/src/main/res/values-gu/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"બ્રાઉઝરમાં ખોલો"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"લિંક કૉપિ કરો"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"લિંક શેર કરો"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"ક્લિપબોર્ડ પર લિંક કૉપિ કરી"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"બ્રાઉઝરમાં ખોલો"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"લિંક કૉપિ કરો"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"લિંક શેર કરો"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"ક્લિપબોર્ડ પર લિંક કૉપિ કરી"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-hi/strings.xml b/browser/browser/src/main/res/values-hi/strings.xml
index 62db794..340c591 100644
--- a/browser/browser/src/main/res/values-hi/strings.xml
+++ b/browser/browser/src/main/res/values-hi/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ब्राउज़र में खोलें"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"लिंक कॉपी करें"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"लिंक शेयर करें"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"लिंक क्लिपबोर्ड पर कॉपी किया गया"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ब्राउज़र में खोलें"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"लिंक कॉपी करें"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"लिंक शेयर करें"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"लिंक क्लिपबोर्ड पर कॉपी किया गया"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-hr/strings.xml b/browser/browser/src/main/res/values-hr/strings.xml
index 750455f..a282b99 100644
--- a/browser/browser/src/main/res/values-hr/strings.xml
+++ b/browser/browser/src/main/res/values-hr/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Otvori u pregledniku"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopiraj vezu"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Podijeli vezu"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Veza je kopirana u međuspremnik"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Otvori u pregledniku"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopiraj vezu"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Podijeli vezu"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Veza je kopirana u međuspremnik"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-hu/strings.xml b/browser/browser/src/main/res/values-hu/strings.xml
index 796b869..d868916 100644
--- a/browser/browser/src/main/res/values-hu/strings.xml
+++ b/browser/browser/src/main/res/values-hu/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Megnyitás böngészőben"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Link másolása"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Link megosztása"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link vágólapra másolva"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Megnyitás böngészőben"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Link másolása"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Link megosztása"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link vágólapra másolva"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-hy/strings.xml b/browser/browser/src/main/res/values-hy/strings.xml
index 44a74d5..20b94fc 100644
--- a/browser/browser/src/main/res/values-hy/strings.xml
+++ b/browser/browser/src/main/res/values-hy/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Բացել դիտարկիչում"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Պատճենել հղումը"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Կիսվել հղումով"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Հղումը պատճենվեց սեղմատախտակին"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Բացել դիտարկիչում"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Պատճենել հղումը"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Կիսվել հղումով"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Հղումը պատճենվեց սեղմատախտակին"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-in/strings.xml b/browser/browser/src/main/res/values-in/strings.xml
index 944cf16..6ecebc8 100644
--- a/browser/browser/src/main/res/values-in/strings.xml
+++ b/browser/browser/src/main/res/values-in/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Buka di browser"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Salin link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Bagikan link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link disalin ke papan klip"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Buka di browser"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Salin link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Bagikan link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link disalin ke papan klip"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-is/strings.xml b/browser/browser/src/main/res/values-is/strings.xml
index 273b5e1..e3467f9 100644
--- a/browser/browser/src/main/res/values-is/strings.xml
+++ b/browser/browser/src/main/res/values-is/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Opna í vafra"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Afrita tengil"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Deila tengli"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Tengill afritaður á klippiborð"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Opna í vafra"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Afrita tengil"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Deila tengli"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Tengill afritaður á klippiborð"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-it/strings.xml b/browser/browser/src/main/res/values-it/strings.xml
index f01fb6f..e5bcad7 100644
--- a/browser/browser/src/main/res/values-it/strings.xml
+++ b/browser/browser/src/main/res/values-it/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Apri nel browser"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copia link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Condividi link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link copiato negli appunti"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Apri nel browser"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copia link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Condividi link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link copiato negli appunti"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-iw/strings.xml b/browser/browser/src/main/res/values-iw/strings.xml
index 63ed4d8..a0b8a11 100644
--- a/browser/browser/src/main/res/values-iw/strings.xml
+++ b/browser/browser/src/main/res/values-iw/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"פתיחה בדפדפן"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"להעתקת הקישור"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"לשיתוף הקישור"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"הקישור הועתק ללוח"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"פתיחה בדפדפן"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"להעתקת הקישור"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"לשיתוף הקישור"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"הקישור הועתק ללוח"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ja/strings.xml b/browser/browser/src/main/res/values-ja/strings.xml
index fa9ef93..d4bb09d 100644
--- a/browser/browser/src/main/res/values-ja/strings.xml
+++ b/browser/browser/src/main/res/values-ja/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ブラウザで開く"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"リンクをコピー"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"リンクの共有"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"リンクをクリップボードにコピーしました"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ブラウザで開く"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"リンクをコピー"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"リンクの共有"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"リンクをクリップボードにコピーしました"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ka/strings.xml b/browser/browser/src/main/res/values-ka/strings.xml
index d471a7e..53bb8be 100644
--- a/browser/browser/src/main/res/values-ka/strings.xml
+++ b/browser/browser/src/main/res/values-ka/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ბრაუზერში გახსნა"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"ბმულის კოპირება"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"ბმულის გაზიარება"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"გაცვლის ბუფერში კოპირებული ბმული"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ბრაუზერში გახსნა"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"ბმულის კოპირება"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"ბმულის გაზიარება"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"გაცვლის ბუფერში კოპირებული ბმული"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-kk/strings.xml b/browser/browser/src/main/res/values-kk/strings.xml
index 1b61c7b..b3ba395 100644
--- a/browser/browser/src/main/res/values-kk/strings.xml
+++ b/browser/browser/src/main/res/values-kk/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Браузерден ашу"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Сілтемені көшіру"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Сілтемені бөлісу"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Сілтеме буферге көшірілді."</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Браузерден ашу"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Сілтемені көшіру"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Сілтемені бөлісу"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Сілтеме буферге көшірілді."</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-km/strings.xml b/browser/browser/src/main/res/values-km/strings.xml
index 36b6717..beeb187 100644
--- a/browser/browser/src/main/res/values-km/strings.xml
+++ b/browser/browser/src/main/res/values-km/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"បើក​នៅក្នុង​កម្មវិធី​រុករកតាម​អ៊ីនធឺណិត"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"ចម្លង​តំណ"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"តំណចែករំលែក"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"បាន​ចម្លង​តំណ​ទៅឃ្លីបបត"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"បើក​នៅក្នុង​កម្មវិធី​រុករកតាម​អ៊ីនធឺណិត"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"ចម្លង​តំណ"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"តំណចែករំលែក"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"បាន​ចម្លង​តំណ​ទៅឃ្លីបបត"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-kn/strings.xml b/browser/browser/src/main/res/values-kn/strings.xml
index 515f7db2c..ca98a3a 100644
--- a/browser/browser/src/main/res/values-kn/strings.xml
+++ b/browser/browser/src/main/res/values-kn/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ಬ್ರೌಸರ್‌ನಲ್ಲಿ ತೆರೆಯಿರಿ"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"ಲಿಂಕ್ ನಕಲಿಸಿ"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"ಲಿಂಕ್ ಹಂಚಿರಿ"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ಲಿಂಕ್ ಅನ್ನು ನಕಲಿಸಲಾಗಿದೆ"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ಬ್ರೌಸರ್‌ನಲ್ಲಿ ತೆರೆಯಿರಿ"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"ಲಿಂಕ್ ನಕಲಿಸಿ"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"ಲಿಂಕ್ ಹಂಚಿರಿ"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ಲಿಂಕ್ ಅನ್ನು ನಕಲಿಸಲಾಗಿದೆ"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ko/strings.xml b/browser/browser/src/main/res/values-ko/strings.xml
index 1b2ce04..ead6a31 100644
--- a/browser/browser/src/main/res/values-ko/strings.xml
+++ b/browser/browser/src/main/res/values-ko/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"브라우저에서 열기"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"링크 복사"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"링크 공유"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"클립보드에 링크 복사됨"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"브라우저에서 열기"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"링크 복사"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"링크 공유"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"클립보드에 링크 복사됨"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ky/strings.xml b/browser/browser/src/main/res/values-ky/strings.xml
index 0f8f958..02c4e07 100644
--- a/browser/browser/src/main/res/values-ky/strings.xml
+++ b/browser/browser/src/main/res/values-ky/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Серепчиден ачуу"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Шилтемени көчүрүү"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Шилтемени бөлүшүү"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Шилтеме буферге көчүрүлдү"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Серепчиден ачуу"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Шилтемени көчүрүү"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Шилтемени бөлүшүү"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Шилтеме буферге көчүрүлдү"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-lo/strings.xml b/browser/browser/src/main/res/values-lo/strings.xml
index cdf8ec5..4ba2a27 100644
--- a/browser/browser/src/main/res/values-lo/strings.xml
+++ b/browser/browser/src/main/res/values-lo/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ເປີດໃນໂປຣແກຣມທ່ອງເວັບ"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"ສຳເນົາລິ້ງ"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"ແບ່ງປັນລິ້ງ"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"ສຳເນົາລິ້ງໃສ່ຄລິບບອດແລ້ວ"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ເປີດໃນໂປຣແກຣມທ່ອງເວັບ"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"ສຳເນົາລິ້ງ"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"ແບ່ງປັນລິ້ງ"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"ສຳເນົາລິ້ງໃສ່ຄລິບບອດແລ້ວ"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-lt/strings.xml b/browser/browser/src/main/res/values-lt/strings.xml
index 5e7f6f5..bca2453 100644
--- a/browser/browser/src/main/res/values-lt/strings.xml
+++ b/browser/browser/src/main/res/values-lt/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Atidaryti naršyklėje"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopijuoti nuorodą"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Bendrinti nuorodą"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Nuoroda nukopijuota į iškarpinę"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Atidaryti naršyklėje"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopijuoti nuorodą"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Bendrinti nuorodą"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Nuoroda nukopijuota į iškarpinę"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-lv/strings.xml b/browser/browser/src/main/res/values-lv/strings.xml
index 57d916a..4aaf188 100644
--- a/browser/browser/src/main/res/values-lv/strings.xml
+++ b/browser/browser/src/main/res/values-lv/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Atvērt pārlūkprogrammā"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopēt saiti"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Kopīgot saiti"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Saite ir kopēta starpliktuvē."</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Atvērt pārlūkprogrammā"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopēt saiti"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Kopīgot saiti"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Saite ir kopēta starpliktuvē."</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-mk/strings.xml b/browser/browser/src/main/res/values-mk/strings.xml
index 1377c26..381005b 100644
--- a/browser/browser/src/main/res/values-mk/strings.xml
+++ b/browser/browser/src/main/res/values-mk/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Отвори во прелистувач"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Копирај го линкот"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Сподели линк"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Линкот е копиран во привремена меморија"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Отвори во прелистувач"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Копирај го линкот"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Сподели линк"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Линкот е копиран во привремена меморија"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ml/strings.xml b/browser/browser/src/main/res/values-ml/strings.xml
index 1bff1ef..a86b778 100644
--- a/browser/browser/src/main/res/values-ml/strings.xml
+++ b/browser/browser/src/main/res/values-ml/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ബ്രൗസറിൽ തുറക്കുക"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"ലിങ്ക് പകർത്തുക"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"ലിങ്ക് പങ്കിടുക"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"ക്ലിപ്പ്‌ബോർഡിലേക്ക് ലിങ്ക് പകർത്തി"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ബ്രൗസറിൽ തുറക്കുക"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"ലിങ്ക് പകർത്തുക"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"ലിങ്ക് പങ്കിടുക"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"ക്ലിപ്പ്‌ബോർഡിലേക്ക് ലിങ്ക് പകർത്തി"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-mn/strings.xml b/browser/browser/src/main/res/values-mn/strings.xml
index 3cd50a0..514ba87 100644
--- a/browser/browser/src/main/res/values-mn/strings.xml
+++ b/browser/browser/src/main/res/values-mn/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Хөтчид нээх"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Холбоосыг хуулах"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Холбоосыг хуваалцах"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Холбоосыг түр санах ойд хуулсан"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Хөтчид нээх"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Холбоосыг хуулах"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Холбоосыг хуваалцах"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Холбоосыг түр санах ойд хуулсан"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-mr/strings.xml b/browser/browser/src/main/res/values-mr/strings.xml
index f45c36b..74d59d4 100644
--- a/browser/browser/src/main/res/values-mr/strings.xml
+++ b/browser/browser/src/main/res/values-mr/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ब्राउझरमध्ये उघडा"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"लिंक कॉपी करा"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"लिंक शेअर करा"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"लिंक क्लिपबोर्डवर कॉपी केली"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ब्राउझरमध्ये उघडा"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"लिंक कॉपी करा"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"लिंक शेअर करा"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"लिंक क्लिपबोर्डवर कॉपी केली"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ms/strings.xml b/browser/browser/src/main/res/values-ms/strings.xml
index 2ca4b9f..4ec8544 100644
--- a/browser/browser/src/main/res/values-ms/strings.xml
+++ b/browser/browser/src/main/res/values-ms/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Buka dalam penyemak imbas"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Salin pautan"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Kongsi pautan"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Pautan disalin ke papan keratan"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Buka dalam penyemak imbas"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Salin pautan"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Kongsi pautan"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Pautan disalin ke papan keratan"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-my/strings.xml b/browser/browser/src/main/res/values-my/strings.xml
index bd80be0..bddcc22 100644
--- a/browser/browser/src/main/res/values-my/strings.xml
+++ b/browser/browser/src/main/res/values-my/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ဘရောင်ဇာတွင် ဖွင့်ရန်"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"လင့်ခ်ကို ကူးယူရန်"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"လင့်ခ်ကို မျှဝေရန်"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"လင့်ခ်ကို ကလစ်ဘုတ်သို့ ကူးပြီးပါပြီ"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ဘရောင်ဇာတွင် ဖွင့်ရန်"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"လင့်ခ်ကို ကူးယူရန်"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"လင့်ခ်ကို မျှဝေရန်"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"လင့်ခ်ကို ကလစ်ဘုတ်သို့ ကူးပြီးပါပြီ"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-nb/strings.xml b/browser/browser/src/main/res/values-nb/strings.xml
index 77990ce..599813c 100644
--- a/browser/browser/src/main/res/values-nb/strings.xml
+++ b/browser/browser/src/main/res/values-nb/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Åpne i nettleseren"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopiér linken"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Del link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Linken er kopiert til utklippstavlen"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Åpne i nettleseren"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopiér linken"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Del link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Linken er kopiert til utklippstavlen"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ne/strings.xml b/browser/browser/src/main/res/values-ne/strings.xml
index e7bdb2a..05f9c5b 100644
--- a/browser/browser/src/main/res/values-ne/strings.xml
+++ b/browser/browser/src/main/res/values-ne/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ब्राउजरमा खोल्नुहोस्"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"लिंक प्रतिलिपि गर्नुहोस्"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"लिंक आदान प्रदान गर्नुहोस्"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"क्लिपबोर्डमा लिंक प्रतिलिपि गरियो"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ब्राउजरमा खोल्नुहोस्"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"लिंक प्रतिलिपि गर्नुहोस्"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"लिंक आदान प्रदान गर्नुहोस्"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"क्लिपबोर्डमा लिंक प्रतिलिपि गरियो"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-nl/strings.xml b/browser/browser/src/main/res/values-nl/strings.xml
index db7a2fd..78feee5 100644
--- a/browser/browser/src/main/res/values-nl/strings.xml
+++ b/browser/browser/src/main/res/values-nl/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Openen in browser"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Link kopiëren"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Link delen"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link naar klembord gekopieerd"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Openen in browser"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Link kopiëren"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Link delen"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link naar klembord gekopieerd"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-or/strings.xml b/browser/browser/src/main/res/values-or/strings.xml
index 921fd03..75b5333 100644
--- a/browser/browser/src/main/res/values-or/strings.xml
+++ b/browser/browser/src/main/res/values-or/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ବ୍ରାଉଜର୍‌ରେ ଖୋଲନ୍ତୁ"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"ଲିଙ୍କ୍ କପି କରନ୍ତୁ"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"ଲିଙ୍କ୍ ସେୟାର୍ କରନ୍ତୁ"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"ଲିଙ୍କକୁ କ୍ଲିପ୍‍‍ବୋର୍ଡରେ କପି କରାଯାଇଛି"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ବ୍ରାଉଜର୍‌ରେ ଖୋଲନ୍ତୁ"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"ଲିଙ୍କ୍ କପି କରନ୍ତୁ"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"ଲିଙ୍କ୍ ସେୟାର୍ କରନ୍ତୁ"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"ଲିଙ୍କକୁ କ୍ଲିପ୍‍‍ବୋର୍ଡରେ କପି କରାଯାଇଛି"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-pa/strings.xml b/browser/browser/src/main/res/values-pa/strings.xml
index 987092e..dba5a6c 100644
--- a/browser/browser/src/main/res/values-pa/strings.xml
+++ b/browser/browser/src/main/res/values-pa/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"ਬ੍ਰਾਊਜ਼ਰ ਵਿੱਚ ਖੋਲ੍ਹੋ"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"ਲਿੰਕ ਕਾਪੀ ਕਰੋ"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"ਲਿੰਕ ਸਾਂਝਾ ਕਰੋ"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"ਲਿੰਕ ਕਲਿੱਪਬੋਰਡ \'ਤੇ ਕਾਪੀ ਹੋ ਗਿਆ"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"ਬ੍ਰਾਊਜ਼ਰ ਵਿੱਚ ਖੋਲ੍ਹੋ"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"ਲਿੰਕ ਕਾਪੀ ਕਰੋ"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"ਲਿੰਕ ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"ਲਿੰਕ ਕਲਿੱਪਬੋਰਡ \'ਤੇ ਕਾਪੀ ਹੋ ਗਿਆ"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-pl/strings.xml b/browser/browser/src/main/res/values-pl/strings.xml
index 0e62e42..8ca4b48 100644
--- a/browser/browser/src/main/res/values-pl/strings.xml
+++ b/browser/browser/src/main/res/values-pl/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Otwórz w przeglądarce"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopiuj link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Udostępnij link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link skopiowany do schowka"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Otwórz w przeglądarce"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopiuj link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Udostępnij link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link skopiowany do schowka"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-pt-rBR/strings.xml b/browser/browser/src/main/res/values-pt-rBR/strings.xml
index dd438f1..b0aa417 100644
--- a/browser/browser/src/main/res/values-pt-rBR/strings.xml
+++ b/browser/browser/src/main/res/values-pt-rBR/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Abrir no navegador"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copiar link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Compartilhar link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link copiado para a área de transferência"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Abrir no navegador"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copiar link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Compartilhar link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link copiado para a área de transferência"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-pt-rPT/strings.xml b/browser/browser/src/main/res/values-pt-rPT/strings.xml
index 08390ad..23b58df 100644
--- a/browser/browser/src/main/res/values-pt-rPT/strings.xml
+++ b/browser/browser/src/main/res/values-pt-rPT/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Abrir no navegador"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copiar link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Partilhar link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link copiado para a área de transferência."</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Abrir no navegador"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copiar link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Partilhar link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link copiado para a área de transferência."</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-pt/strings.xml b/browser/browser/src/main/res/values-pt/strings.xml
index dd438f1..b0aa417 100644
--- a/browser/browser/src/main/res/values-pt/strings.xml
+++ b/browser/browser/src/main/res/values-pt/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Abrir no navegador"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copiar link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Compartilhar link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Link copiado para a área de transferência"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Abrir no navegador"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copiar link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Compartilhar link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Link copiado para a área de transferência"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ro/strings.xml b/browser/browser/src/main/res/values-ro/strings.xml
index 65b7700..c11f554 100644
--- a/browser/browser/src/main/res/values-ro/strings.xml
+++ b/browser/browser/src/main/res/values-ro/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Deschideți în browser"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Copiați linkul"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Trimiteți linkul"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Linkul a fost copiat în clipboard"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Deschideți în browser"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Copiați linkul"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Trimiteți linkul"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Linkul a fost copiat în clipboard"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ru/strings.xml b/browser/browser/src/main/res/values-ru/strings.xml
index 694c46c..7017414 100644
--- a/browser/browser/src/main/res/values-ru/strings.xml
+++ b/browser/browser/src/main/res/values-ru/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Открыть в браузере"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Копировать ссылку"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Отправить ссылку"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Ссылка скопирована в буфер обмена."</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Открыть в браузере"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Копировать ссылку"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Отправить ссылку"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Ссылка скопирована в буфер обмена."</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-si/strings.xml b/browser/browser/src/main/res/values-si/strings.xml
index 2b6f22f..9202156 100644
--- a/browser/browser/src/main/res/values-si/strings.xml
+++ b/browser/browser/src/main/res/values-si/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"බ්‍රව්සරයේ විවෘත කරන්න"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"සබැඳිය පිටපත් කරන්න"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"සබැඳිය බෙදා ගන්න"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"සබැඳිය පසුරු පුවරුවට පිටපත් කෙරිණි"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"බ්‍රව්සරයේ විවෘත කරන්න"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"සබැඳිය පිටපත් කරන්න"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"සබැඳිය බෙදා ගන්න"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"සබැඳිය පසුරු පුවරුවට පිටපත් කෙරිණි"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-sk/strings.xml b/browser/browser/src/main/res/values-sk/strings.xml
index 4489ab4..a9ee62d 100644
--- a/browser/browser/src/main/res/values-sk/strings.xml
+++ b/browser/browser/src/main/res/values-sk/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Otvoriť v prehliadači"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopírovať odkaz"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Zdieľať odkaz"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Odkaz bol skopírovaný do schránky"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Otvoriť v prehliadači"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopírovať odkaz"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Zdieľať odkaz"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Odkaz bol skopírovaný do schránky"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-sl/strings.xml b/browser/browser/src/main/res/values-sl/strings.xml
index 0d53238..61c607a 100644
--- a/browser/browser/src/main/res/values-sl/strings.xml
+++ b/browser/browser/src/main/res/values-sl/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Odpri v brskalniku"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopiraj povezavo"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Deli povezavo"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Povezava je kopirana v odložišče"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Odpri v brskalniku"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopiraj povezavo"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Deli povezavo"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Povezava je kopirana v odložišče"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-sq/strings.xml b/browser/browser/src/main/res/values-sq/strings.xml
index 7855f3d..afce0d8 100644
--- a/browser/browser/src/main/res/values-sq/strings.xml
+++ b/browser/browser/src/main/res/values-sq/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Hape në shfletues"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopjo lidhjen"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Ndaj lidhjen"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Lidhja u kopjua në kujtesën e fragmenteve"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Hape në shfletues"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopjo lidhjen"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Ndaj lidhjen"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Lidhja u kopjua në kujtesën e fragmenteve"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-sr/strings.xml b/browser/browser/src/main/res/values-sr/strings.xml
index e3fe39a..a4d760d 100644
--- a/browser/browser/src/main/res/values-sr/strings.xml
+++ b/browser/browser/src/main/res/values-sr/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Отвори у прегледачу"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Копирај линк"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Дели линк"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Линк је копиран у привремену меморију"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Отвори у прегледачу"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Копирај линк"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Дели линк"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Линк је копиран у привремену меморију"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-sv/strings.xml b/browser/browser/src/main/res/values-sv/strings.xml
index 3d96572..b9c3963 100644
--- a/browser/browser/src/main/res/values-sv/strings.xml
+++ b/browser/browser/src/main/res/values-sv/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Öppna i webbläsaren"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopiera länk"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Dela länk"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Länk kopierad till Urklipp"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Öppna i webbläsaren"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopiera länk"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Dela länk"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Länk kopierad till Urklipp"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-sw/strings.xml b/browser/browser/src/main/res/values-sw/strings.xml
index c8c9c31..de8578a 100644
--- a/browser/browser/src/main/res/values-sw/strings.xml
+++ b/browser/browser/src/main/res/values-sw/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Fungua katika kivinjari"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Nakili kiungo"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Shiriki kiungo"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Imenakili kiungo kwenye ubao wa kunakili"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Fungua katika kivinjari"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Nakili kiungo"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Shiriki kiungo"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Imenakili kiungo kwenye ubao wa kunakili"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ta/strings.xml b/browser/browser/src/main/res/values-ta/strings.xml
index 7885a21..e83f133 100644
--- a/browser/browser/src/main/res/values-ta/strings.xml
+++ b/browser/browser/src/main/res/values-ta/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"உலாவியில் திற"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"இணைப்பை நகலெடு"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"இணைப்பைப் பகிர்"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"கிளிப்-போர்டுக்கு இணைப்பு நகலெடுக்கப்பட்டது"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"உலாவியில் திற"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"இணைப்பை நகலெடு"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"இணைப்பைப் பகிர்"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"கிளிப்-போர்டுக்கு இணைப்பு நகலெடுக்கப்பட்டது"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-te/strings.xml b/browser/browser/src/main/res/values-te/strings.xml
index 6132419..8844d82 100644
--- a/browser/browser/src/main/res/values-te/strings.xml
+++ b/browser/browser/src/main/res/values-te/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"బ్రౌజర్‌లో తెరువు"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"లింక్‌ను కాపీ చేయి"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"లింక్‌ను షేర్ చేయి"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"క్లిప్‌బోర్డ్‌కు లింక్ కాపీ చేయబడింది"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"బ్రౌజర్‌లో తెరువు"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"లింక్‌ను కాపీ చేయి"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"లింక్‌ను షేర్ చేయి"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"క్లిప్‌బోర్డ్‌కు లింక్ కాపీ చేయబడింది"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-th/strings.xml b/browser/browser/src/main/res/values-th/strings.xml
index d1e538a..0a6035d 100644
--- a/browser/browser/src/main/res/values-th/strings.xml
+++ b/browser/browser/src/main/res/values-th/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"เปิดในเบราว์เซอร์"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"คัดลอกลิงก์"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"แชร์ลิงก์"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"คัดลอกลิงก์ไปยังคลิปบอร์ดแล้ว"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"เปิดในเบราว์เซอร์"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"คัดลอกลิงก์"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"แชร์ลิงก์"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"คัดลอกลิงก์ไปยังคลิปบอร์ดแล้ว"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-tl/strings.xml b/browser/browser/src/main/res/values-tl/strings.xml
index 0fdfc6c..0bbcf91 100644
--- a/browser/browser/src/main/res/values-tl/strings.xml
+++ b/browser/browser/src/main/res/values-tl/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Buksan sa browser"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopyahin ang link"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Ibahagi ang link"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Nakopya sa clipboard ang link"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Buksan sa browser"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopyahin ang link"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Ibahagi ang link"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Nakopya sa clipboard ang link"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-tr/strings.xml b/browser/browser/src/main/res/values-tr/strings.xml
index 6ab3ec2..5195cfb 100644
--- a/browser/browser/src/main/res/values-tr/strings.xml
+++ b/browser/browser/src/main/res/values-tr/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Tarayıcıda aç"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Bağlantıyı kopyala"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Bağlantıyı paylaş"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Bağlantı panoya kopyalandı"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Tarayıcıda aç"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Bağlantıyı kopyala"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Bağlantıyı paylaş"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Bağlantı panoya kopyalandı"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-uk/strings.xml b/browser/browser/src/main/res/values-uk/strings.xml
index b40badb..63a0419 100644
--- a/browser/browser/src/main/res/values-uk/strings.xml
+++ b/browser/browser/src/main/res/values-uk/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Відкрити у веб-переглядачі"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Копіювати посилання"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Надіслати посилання"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Посилання скопійовано в буфер обміну"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Відкрити у веб-переглядачі"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Копіювати посилання"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Надіслати посилання"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Посилання скопійовано в буфер обміну"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-ur/strings.xml b/browser/browser/src/main/res/values-ur/strings.xml
index e6dc0a2..ae78042 100644
--- a/browser/browser/src/main/res/values-ur/strings.xml
+++ b/browser/browser/src/main/res/values-ur/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"براؤزر میں کھولیں"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"لنک کاپی کریں"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"لنک کا اشتراک کریں"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"لنک کلپ بورڈ پر کاپی ہو گیا"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"براؤزر میں کھولیں"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"لنک کاپی کریں"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"لنک کا اشتراک کریں"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"لنک کلپ بورڈ پر کاپی ہو گیا"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-uz/strings.xml b/browser/browser/src/main/res/values-uz/strings.xml
index d33562f..5d789c5 100644
--- a/browser/browser/src/main/res/values-uz/strings.xml
+++ b/browser/browser/src/main/res/values-uz/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Brauzerda ochish"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Havoladan nusxa olish"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Havolani ulashish"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Havoladan vaqtinchalik xotiraga nusxa olindi"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Brauzerda ochish"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Havoladan nusxa olish"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Havolani ulashish"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Havoladan vaqtinchalik xotiraga nusxa olindi"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-vi/strings.xml b/browser/browser/src/main/res/values-vi/strings.xml
index d494c98..956712c 100644
--- a/browser/browser/src/main/res/values-vi/strings.xml
+++ b/browser/browser/src/main/res/values-vi/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Mở trong trình duyệt"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Sao chép liên kết"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Chia sẻ liên kết"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Đã sao chép liên kết vào khay nhớ tạm"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Mở trong trình duyệt"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Sao chép đường liên kết"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Chia sẻ liên kết"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Đã sao chép đường liên kết vào khay nhớ tạm"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-zh-rCN/strings.xml b/browser/browser/src/main/res/values-zh-rCN/strings.xml
index 63c639d..2046ed2 100644
--- a/browser/browser/src/main/res/values-zh-rCN/strings.xml
+++ b/browser/browser/src/main/res/values-zh-rCN/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"在浏览器中打开"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"复制链接"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"分享链接"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"链接已复制到剪贴板"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"在浏览器中打开"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"复制链接"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"分享链接"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"链接已复制到剪贴板"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-zh-rHK/strings.xml b/browser/browser/src/main/res/values-zh-rHK/strings.xml
index 8d4feb3..c4dbd76 100644
--- a/browser/browser/src/main/res/values-zh-rHK/strings.xml
+++ b/browser/browser/src/main/res/values-zh-rHK/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"在瀏覽器中開啟"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"複製連結"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"分享連結"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"連結已複製到剪貼簿"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"在瀏覽器中開啟"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"複製連結"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"分享連結"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"連結已複製到剪貼簿"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-zh-rTW/strings.xml b/browser/browser/src/main/res/values-zh-rTW/strings.xml
index b60673f..ece4eae 100644
--- a/browser/browser/src/main/res/values-zh-rTW/strings.xml
+++ b/browser/browser/src/main/res/values-zh-rTW/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"在瀏覽器中開啟"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"複製連結"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"分享連結"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"已將連結複製到剪貼簿"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"在瀏覽器中開啟"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"複製連結"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"分享連結"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"已將連結複製到剪貼簿"</string>
 </resources>
diff --git a/browser/browser/src/main/res/values-zu/strings.xml b/browser/browser/src/main/res/values-zu/strings.xml
index 0740ead..6b25280 100644
--- a/browser/browser/src/main/res/values-zu/strings.xml
+++ b/browser/browser/src/main/res/values-zu/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="fallback_menu_item_open_in_browser" msgid="8984733760067120953">"Vula kusiphequluli"</string>
-    <string name="fallback_menu_item_copy_link" msgid="2615365786337886368">"Kopisha isixhumanisi"</string>
-    <string name="fallback_menu_item_share_link" msgid="271185644269364308">"Yabelana ngesixhumanisi"</string>
-    <string name="copy_toast_msg" msgid="8230469354668895088">"Isixhumanisi sikopishelwe ku-clipboard"</string>
+    <string name="fallback_menu_item_open_in_browser" msgid="3413186855122069269">"Vula kusiphequluli"</string>
+    <string name="fallback_menu_item_copy_link" msgid="4566929209979330987">"Kopisha isixhumanisi"</string>
+    <string name="fallback_menu_item_share_link" msgid="7145444925855055364">"Yabelana ngesixhumanisi"</string>
+    <string name="copy_toast_msg" msgid="3260749812566568062">"Isixhumanisi sikopishelwe ku-clipboard"</string>
 </resources>
diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
index 7e4cdf2..549caa3 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
@@ -41,7 +41,7 @@
     val CARDVIEW = Version("1.1.0-alpha01")
     val COLLECTION = Version("1.2.0-alpha01")
     val CONTENTPAGER = Version("1.1.0-alpha01")
-    val COMPOSE = Version("0.1.0-dev10")
+    val COMPOSE = Version("0.1.0-dev11")
     val CONTENTACCESS = Version("1.0.0-alpha01")
     val COORDINATORLAYOUT = Version("1.2.0-alpha01")
     val CORE = Version("1.4.0-alpha01")
@@ -77,14 +77,14 @@
     val MEDIA2 = Version("1.1.0-alpha01")
     val MEDIAROUTER = Version("1.2.0-alpha01")
     val MESSAGEBROWSER_BROWSER = Version("1.0.0-alpha01")
-    val NAVIGATION = Version("2.3.0-alpha05")
+    val NAVIGATION = Version("2.3.0-alpha06")
     val PAGING = Version("3.0.0-alpha01")
     val PALETTE = Version("1.1.0-alpha01")
     val PRINT = Version("1.1.0-alpha01")
     val PERCENTLAYOUT = Version("1.1.0-alpha01")
     val PREFERENCE = Version("1.2.0-alpha01")
     val RECOMMENDATION = Version("1.1.0-alpha01")
-    val RECYCLERVIEW = Version("1.2.0-alpha02")
+    val RECYCLERVIEW = Version("1.2.0-alpha03")
     val RECYCLERVIEW_SELECTION = Version("2.0.0-alpha01")
     val REMOTECALLBACK = Version("1.0.0-alpha02")
     val ROOM = Version("2.3.0-alpha01")
@@ -106,9 +106,9 @@
     val TESTSCREENSHOT = Version("1.0.0-alpha01")
     val TEXTCLASSIFIER = Version("1.0.0-alpha03")
     val TRACING = Version("1.0.0-alpha01")
-    val TRANSITION = Version("1.4.0-alpha01")
+    val TRANSITION = Version("2.0.0-alpha01")
     val TVPROVIDER = Version("1.1.0-alpha01")
-    val UI = Version("0.1.0-dev10")
+    val UI = Version("0.1.0-dev11")
     val VECTORDRAWABLE = Version("1.2.0-alpha01")
     val VECTORDRAWABLE_ANIMATED = Version("1.2.0-alpha01")
     val VECTORDRAWABLE_SEEKABLE = Version("1.0.0-alpha01")
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraImpl.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraImpl.java
index 63c50e1..d52a5a4 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraImpl.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/Camera2CameraImpl.java
@@ -75,6 +75,8 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -90,7 +92,8 @@
  * state.
  */
 final class Camera2CameraImpl implements CameraInternal {
-    private static final String TAG = "Camera";
+    private static final String TAG = "Camera2CameraImpl";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
     private static final int ERROR_NONE = 0;
 
     /**
@@ -118,7 +121,7 @@
             new LiveDataObservable<>();
     /** The camera control shared across all use cases bound to this Camera. */
     private final Camera2CameraControl mCameraControlInternal;
-    private final StateCallback mStateCallback = new StateCallback();
+    private final StateCallback mStateCallback;
     /** Information about the characteristics of this camera */
     @SuppressWarnings("WeakerAccess") /* synthetic accessor */
     @NonNull
@@ -169,7 +172,8 @@
      * @throws IllegalStateException if the {@link CameraCharacteristics} is unavailable. This
      *                               could occur if the camera was disconnected.
      */
-    Camera2CameraImpl(CameraManagerCompat cameraManager, String cameraId,
+    Camera2CameraImpl(@NonNull CameraManagerCompat cameraManager,
+            @NonNull String cameraId,
             @NonNull CameraStateRegistry cameraStateRegistry,
             @NonNull Executor executor,
             @NonNull Handler schedulerHandler) {
@@ -178,6 +182,7 @@
         ScheduledExecutorService executorScheduler =
                 CameraXExecutors.newHandlerExecutor(schedulerHandler);
         mExecutor = CameraXExecutors.newSequentialExecutor(executor);
+        mStateCallback = new StateCallback(mExecutor, executorScheduler);
         mUseCaseAttachState = new UseCaseAttachState(cameraId);
         mObservableState.postValue(State.CLOSED);
 
@@ -242,7 +247,7 @@
                 }
                 break;
             default:
-                Log.d(TAG, "open() ignored due to being in state: " + mState);
+                debugLog("open() ignored due to being in state: " + mState);
         }
     }
 
@@ -259,7 +264,7 @@
 
     @ExecutedBy("mExecutor")
     private void closeInternal() {
-        Log.d(TAG, "Closing camera: " + mCameraInfoInternal.getCameraId());
+        debugLog("Closing camera.");
         switch (mState) {
             case OPENED:
                 setState(InternalState.CLOSING);
@@ -267,7 +272,12 @@
                 break;
             case OPENING:
             case REOPENING:
+                boolean canFinish = mStateCallback.cancelScheduledReopen();
                 setState(InternalState.CLOSING);
+                if (canFinish) {
+                    Preconditions.checkState(isSessionCloseComplete());
+                    finishClose();
+                }
                 break;
             case PENDING_OPEN:
                 // We should be able to transition directly to an initialized state since the
@@ -276,7 +286,7 @@
                 setState(InternalState.INITIALIZED);
                 break;
             default:
-                Log.d(TAG, "close() ignored due to being in state: " + mState);
+                debugLog("close() ignored due to being in state: " + mState);
         }
     }
 
@@ -301,9 +311,9 @@
         SessionConfig.Builder builder = new SessionConfig.Builder();
         builder.addNonRepeatingSurface(new ImmediateSurface(surface));
         builder.setTemplateType(CameraDevice.TEMPLATE_PREVIEW);
-        Log.d(TAG, "Start configAndClose.");
+        debugLog("Start configAndClose.");
         ListenableFuture<Void> openDummyCaptureSession = dummySession.open(builder.build(),
-                mCameraDevice);
+                Preconditions.checkNotNull(mCameraDevice));
         Futures.addCallback(openDummyCaptureSession, new FutureCallback<Void>() {
             @Override
             @ExecutedBy("mExecutor")
@@ -317,8 +327,7 @@
             @Override
             @ExecutedBy("mExecutor")
             public void onFailure(Throwable t) {
-                Log.d(TAG, "Unable to configure camera " + mCameraInfoInternal.getCameraId()
-                        + " due to " + t.getMessage());
+                debugLog("Unable to configure camera due to " + t.getMessage());
 
                 // Release the dummy Session and continue closing camera when in correct state.
                 releaseDummySession(dummySession, closeAndCleanupRunner);
@@ -437,11 +446,16 @@
             case CLOSING:
             case REOPENING:
             case RELEASING:
+                boolean canFinish = mStateCallback.cancelScheduledReopen();
                 // Wait for the camera async callback to finish releasing
                 setState(InternalState.RELEASING);
+                if (canFinish) {
+                    Preconditions.checkState(isSessionCloseComplete());
+                    finishClose();
+                }
                 break;
             default:
-                Log.d(TAG, "release() ignored due to being in state: " + mState);
+                debugLog("release() ignored due to being in state: " + mState);
         }
 
         return future;
@@ -475,7 +489,7 @@
         captureSession.close();
         ListenableFuture<Void> releaseFuture = captureSession.release(abortInFlightCaptures);
 
-        Log.d(TAG, "releasing session in state " + mState.name());
+        debugLog("Releasing session in state " + mState.name());
         mReleasedCaptureSessions.put(captureSession, releaseFuture);
 
         // Add a callback to clear the future and notify if the camera and all capture sessions
@@ -531,8 +545,7 @@
     public void onUseCaseActive(@NonNull UseCase useCase) {
         Preconditions.checkNotNull(useCase);
         mExecutor.execute(() -> {
-            Log.d(TAG, "Use case " + useCase + " ACTIVE for camera "
-                    + mCameraInfoInternal.getCameraId());
+            debugLog("Use case " + useCase + " ACTIVE");
 
             // TODO(b/150208070)Race condition where onUseCaseActive can be called, even after a
             //  UseCase has been unbound. The try-catch is to retain existing behavior where an
@@ -553,8 +566,7 @@
     public void onUseCaseInactive(@NonNull UseCase useCase) {
         Preconditions.checkNotNull(useCase);
         mExecutor.execute(() -> {
-            Log.d(TAG, "Use case " + useCase + " INACTIVE for camera "
-                    + mCameraInfoInternal.getCameraId());
+            debugLog("Use case " + useCase + " INACTIVE");
             mUseCaseAttachState.setUseCaseInactive(useCase);
             updateCaptureSessionConfig();
         });
@@ -565,8 +577,7 @@
     public void onUseCaseUpdated(@NonNull UseCase useCase) {
         Preconditions.checkNotNull(useCase);
         mExecutor.execute(() -> {
-            Log.d(TAG, "Use case " + useCase + " UPDATED for camera "
-                    + mCameraInfoInternal.getCameraId());
+            debugLog("Use case " + useCase + " UPDATED");
             mUseCaseAttachState.updateUseCase(useCase);
             updateCaptureSessionConfig();
         });
@@ -576,8 +587,7 @@
     public void onUseCaseReset(@NonNull UseCase useCase) {
         Preconditions.checkNotNull(useCase);
         mExecutor.execute(() -> {
-            Log.d(TAG, "Use case " + useCase + " RESET for camera "
-                    + mCameraInfoInternal.getCameraId());
+            debugLog("Use case " + useCase + " RESET");
             mUseCaseAttachState.updateUseCase(useCase);
 
             resetCaptureSession(/*abortInFlightCaptures=*/false);
@@ -635,17 +645,16 @@
     private void tryAddOnlineUseCases(@NonNull Collection<UseCase> toAdd) {
         // Figure out which use cases are not already online and add them.
         List<UseCase> useCasesChangedToOnline = new ArrayList<>();
-        String cameraId = mCameraInfoInternal.getCameraId();
         for (UseCase useCase : toAdd) {
             if (!mUseCaseAttachState.isUseCaseOnline(useCase)) {
-                // TODO(b/150208070)Race condition where onUseCaseActive can bee called, even after
-                //  a UseCase has been unbound. The try-catch is to retain existing behavior
+                // TODO(b/150208070): Race condition where onUseCaseActive can be called, even
+                //  after a UseCase has been unbound. The try-catch is to retain existing behavior
                 //  where an unbound UseCase is silently ignored.
                 try {
                     mUseCaseAttachState.setUseCaseOnline(useCase);
                     useCasesChangedToOnline.add(useCase);
                 } catch (NullPointerException e) {
-                    Log.e(TAG, "Failed to set already detached use case online");
+                    debugLog("Failed to set already detached use case online");
                 }
             }
         }
@@ -654,9 +663,7 @@
             return;
         }
 
-        Log.d(TAG, "Use cases [" + TextUtils.join(", ", useCasesChangedToOnline)
-                + "] now ONLINE for camera "
-                + cameraId);
+        debugLog("Use cases [" + TextUtils.join(", ", useCasesChangedToOnline) + "] now ONLINE");
 
         notifyStateOnlineToUseCases(useCasesChangedToOnline);
 
@@ -692,7 +699,8 @@
     private void updateCameraControlPreviewAspectRatio(Collection<UseCase> useCases) {
         for (UseCase useCase : useCases) {
             if (useCase instanceof Preview) {
-                Size resolution = useCase.getAttachedSurfaceResolution();
+                Size resolution =
+                        Preconditions.checkNotNull(useCase.getAttachedSurfaceResolution());
                 Rational aspectRatio = new Rational(resolution.getWidth(), resolution.getHeight());
                 mCameraControlInternal.setPreviewAspectRatio(aspectRatio);
                 return;
@@ -736,9 +744,8 @@
             return;
         }
 
-        Log.d(TAG, "Use cases [" + TextUtils.join(", ", useCasesChangedToOffline)
-                + "] now OFFLINE for camera "
-                + mCameraInfoInternal.getCameraId());
+        debugLog("Use cases [" + TextUtils.join(", ", useCasesChangedToOffline)
+                + "] now OFFLINE for camera");
         clearCameraControlPreviewAspectRatio(useCasesChangedToOffline);
 
         notifyStateOfflineToUseCases(useCasesChangedToOffline);
@@ -774,18 +781,18 @@
     @SuppressWarnings("WeakerAccess") /* synthetic accessor */
     @ExecutedBy("mExecutor")
     void openCameraDevice() {
+        mStateCallback.cancelScheduledReopen();
         // Check that we have an available camera to open here before attempting
         // to open the camera again.
         if (!mCameraAvailability.isCameraAvailable() || !mCameraStateRegistry.tryOpenCamera(this)) {
-            Log.d(TAG, "No cameras available. Waiting for available camera before opening camera: "
-                    + mCameraInfoInternal.getCameraId());
+            debugLog("No cameras available. Waiting for available camera before opening camera.");
             setState(InternalState.PENDING_OPEN);
             return;
         } else {
             setState(InternalState.OPENING);
         }
 
-        Log.d(TAG, "Opening camera: " + mCameraInfoInternal.getCameraId());
+        debugLog("Opening camera.");
 
         try {
             mCameraManager.openCamera(mCameraInfoInternal.getCameraId(), mExecutor,
@@ -793,8 +800,7 @@
         } catch (CameraAccessException e) {
             // Camera2 will call the onError() callback with the specific error code that caused
             // this failure. No need to do anything here.
-            Log.d(TAG, "Unable to open camera " + mCameraInfoInternal.getCameraId() + " due to "
-                    + e.getMessage());
+            debugLog("Unable to open camera due to " + e.getMessage());
         }
     }
 
@@ -826,7 +832,7 @@
 
         ValidatingBuilder validatingBuilder = mUseCaseAttachState.getOnlineBuilder();
         if (!validatingBuilder.isValid()) {
-            Log.d(TAG, "Unable to create capture session due to conflicting configurations");
+            debugLog("Unable to create capture session due to conflicting configurations");
             return;
         }
 
@@ -834,7 +840,8 @@
         ListenableFuture<Void> openCaptureSession;
 
         if (!isLegacyDevice()) {
-            openCaptureSession = captureSession.open(validatingBuilder.build(), mCameraDevice);
+            openCaptureSession = captureSession.open(validatingBuilder.build(),
+                    Preconditions.checkNotNull(mCameraDevice));
         } else {
             // Opening and releasing the capture session quickly and constantly is a problem for
             // LEGACY devices. See: b/146773463. It needs to check all the releasing capture
@@ -858,7 +865,8 @@
                             // The camera state should be opened. Otherwise, this CaptureSession
                             // should be released.
                             Preconditions.checkState(mState == InternalState.OPENED);
-                            return captureSession.open(validatingBuilder.build(), mCameraDevice);
+                            return captureSession.open(validatingBuilder.build(),
+                                    Preconditions.checkNotNull(mCameraDevice));
                         }
                     }, mExecutor);
         }
@@ -874,11 +882,9 @@
             @ExecutedBy("mExecutor")
             public void onFailure(Throwable t) {
                 if (t instanceof CameraAccessException) {
-                    Log.d(TAG, "Unable to configure camera " + mCameraInfoInternal.getCameraId()
-                            + " due to " + t.getMessage());
+                    debugLog("Unable to configure camera due to " + t.getMessage());
                 } else if (t instanceof CancellationException) {
-                    Log.d(TAG, "Unable to configure camera " + mCameraInfoInternal.getCameraId()
-                            + " cancelled");
+                    debugLog("Unable to configure camera cancelled");
                 } else if (t instanceof DeferrableSurface.SurfaceClosedException) {
                     UseCase useCase =
                             findUseCaseForSurface(
@@ -933,7 +939,7 @@
     @ExecutedBy("mExecutor")
     UseCase findUseCaseForSurface(@NonNull DeferrableSurface surface) {
         for (UseCase useCase : mUseCaseAttachState.getOnlineUseCases()) {
-            SessionConfig sessionConfig = useCase.getSessionConfig();
+            SessionConfig sessionConfig = Preconditions.checkNotNull(useCase.getSessionConfig());
             if (sessionConfig.getSurfaces().contains(surface)) {
                 return useCase;
             }
@@ -945,12 +951,12 @@
     @SuppressWarnings("WeakerAccess") /* synthetic accessor */
     void postSurfaceClosedError(@NonNull UseCase useCase) {
         Executor executor = CameraXExecutors.mainThreadExecutor();
-        SessionConfig sessionConfigError = useCase.getSessionConfig();
+        SessionConfig sessionConfigError = Preconditions.checkNotNull(useCase.getSessionConfig());
         List<SessionConfig.ErrorListener> errorListeners =
                 sessionConfigError.getErrorListeners();
         if (!errorListeners.isEmpty()) {
             SessionConfig.ErrorListener errorListener = errorListeners.get(0);
-            Log.d(TAG, "Posting surface closed", new Throwable());
+            debugLog("Posting surface closed", new Throwable());
             executor.execute(() -> errorListener.onError(sessionConfigError,
                     SessionConfig.SessionError.SESSION_ERROR_SURFACE_NEEDS_RESET));
         }
@@ -968,7 +974,7 @@
     @ExecutedBy("mExecutor")
     void resetCaptureSession(boolean abortInFlightCaptures) {
         Preconditions.checkState(mCaptureSession != null);
-        Log.d(TAG, "Resetting Capture Session");
+        debugLog("Resetting Capture Session");
         CaptureSession oldCaptureSession = mCaptureSession;
         // Recreate an initialized (but not opened) capture session from the previous configuration
         SessionConfig previousSessionConfig = oldCaptureSession.getSessionConfig();
@@ -1009,7 +1015,7 @@
         Collection<UseCase> activeUseCases = mUseCaseAttachState.getActiveAndOnlineUseCases();
 
         for (UseCase useCase : activeUseCases) {
-            SessionConfig sessionConfig = useCase.getSessionConfig();
+            SessionConfig sessionConfig = Preconditions.checkNotNull(useCase.getSessionConfig());
             // Query the repeating surfaces attached to this use case, then add them to the builder.
             List<DeferrableSurface> surfaces =
                     sessionConfig.getRepeatingCaptureConfig().getSurfaces();
@@ -1059,7 +1065,7 @@
             captureConfigsWithSurface.add(builder.build());
         }
 
-        Log.d(TAG, "issue capture request for camera " + mCameraInfoInternal.getCameraId());
+        debugLog("Issue capture request");
 
         mCaptureSession.issueCaptureRequests(captureConfigsWithSurface);
     }
@@ -1071,6 +1077,22 @@
                 mCameraInfoInternal.getCameraId());
     }
 
+    @SuppressWarnings("WeakerAccess") /* synthetic accessor */
+    void debugLog(@NonNull String msg) {
+        debugLog(msg, null);
+    }
+
+    private void debugLog(@NonNull String msg, @Nullable Throwable throwable) {
+        if (DEBUG) {
+            String msgString = String.format("{%s} %s", toString(), msg);
+            if (throwable == null) {
+                Log.d(TAG, msgString);
+            } else {
+                Log.d(TAG, msgString, throwable);
+            }
+        }
+    }
+
     @NonNull
     @Override
     public CameraControl getCameraControl() {
@@ -1152,7 +1174,7 @@
     @SuppressWarnings("WeakerAccess") /* synthetic accessor */
     @ExecutedBy("mExecutor")
     void setState(@NonNull InternalState state) {
-        Log.d(TAG, "Transitioning camera internal state: " + mState + " --> " + state);
+        debugLog("Transitioning camera internal state: " + mState + " --> " + state);
         mState = state;
         // Convert the internal state to the publicly visible state
         State publicState;
@@ -1208,10 +1230,27 @@
 
     final class StateCallback extends CameraDevice.StateCallback {
 
+        // Delay long enough to guarantee the app could have been backgrounded.
+        // See ProcessLifecycleProvider for where this delay comes from.
+        private static final int REOPEN_DELAY_MS = 700;
+
+        @CameraExecutor
+        private final Executor mExecutor;
+        private final ScheduledExecutorService mScheduler;
+        private ScheduledReopen mScheduledReopenRunnable;
+        @SuppressWarnings("WeakerAccess") /* synthetic accessor */
+                ScheduledFuture<?> mScheduledReopenHandle;
+
+        StateCallback(@NonNull @CameraExecutor Executor executor, @NonNull ScheduledExecutorService
+                scheduler) {
+            this.mExecutor = executor;
+            this.mScheduler = scheduler;
+        }
+
         @Override
         @ExecutedBy("mExecutor")
-        public void onOpened(CameraDevice cameraDevice) {
-            Log.d(TAG, "CameraDevice.onOpened(): " + cameraDevice.getId());
+        public void onOpened(@NonNull CameraDevice cameraDevice) {
+            debugLog("CameraDevice.onOpened()");
             mCameraDevice = cameraDevice;
 
             // CameraControl needs CaptureRequest.Builder to get default capture request options.
@@ -1239,8 +1278,8 @@
 
         @Override
         @ExecutedBy("mExecutor")
-        public void onClosed(CameraDevice cameraDevice) {
-            Log.d(TAG, "CameraDevice.onClosed(): " + cameraDevice.getId());
+        public void onClosed(@NonNull CameraDevice cameraDevice) {
+            debugLog("CameraDevice.onClosed()");
             Preconditions.checkState(mCameraDevice == null,
                     "Unexpected onClose callback on camera device: " + cameraDevice);
             switch (mState) {
@@ -1250,7 +1289,20 @@
                     finishClose();
                     break;
                 case REOPENING:
-                    openCameraDevice();
+                    if (mCameraDeviceError != ERROR_NONE) {
+                        Preconditions.checkState(mScheduledReopenRunnable == null);
+                        Preconditions.checkState(mScheduledReopenHandle == null);
+                        mScheduledReopenRunnable = new ScheduledReopen(mExecutor);
+                        debugLog(
+                                "Camera closed due to error: " + getErrorMessage(mCameraDeviceError)
+                                        + ". Attempting re-open in " + REOPEN_DELAY_MS + "ms: "
+                                        + mScheduledReopenRunnable);
+                        mScheduledReopenHandle = mScheduler.schedule(mScheduledReopenRunnable,
+                                REOPEN_DELAY_MS,
+                                TimeUnit.MILLISECONDS);
+                    } else {
+                        openCameraDevice();
+                    }
                     break;
                 default:
                     throw new IllegalStateException("Camera closed while in state: " + mState);
@@ -1259,12 +1311,12 @@
 
         @Override
         @ExecutedBy("mExecutor")
-        public void onDisconnected(CameraDevice cameraDevice) {
-            Log.d(TAG, "CameraDevice.onDisconnected(): " + cameraDevice.getId());
+        public void onDisconnected(@NonNull CameraDevice cameraDevice) {
+            debugLog("CameraDevice.onDisconnected()");
 
-            // TODO(b/140955560) Need to force close the CaptureSessions, because onDisconnected
-            //  () callback causes condition where CameraCaptureSession won't receive the
-            //  onClosed() callback.
+            // Need to force close the CaptureSessions, because onDisconnected () callback causes
+            // condition where CameraCaptureSession won't receive the onClosed() callback. See
+            // b/140955560 for more detail.
             for (CaptureSession captureSession : mReleasedCaptureSessions.keySet()) {
                 captureSession.forceClose();
             }
@@ -1348,6 +1400,66 @@
             setState(InternalState.REOPENING);
             closeCamera(/*abortInFlightCaptures=*/false);
         }
+
+        /**
+         * Attempts to cancel reopen.
+         *
+         * <p>If successful, it is safe to finish closing the camera via {@link #finishClose()} as
+         * a reopen will only be scheduled after {@link #onClosed(CameraDevice)} has been called.
+         *
+         * @return true if reopen was cancelled. False if no re-open was scheduled.
+         */
+        @ExecutedBy("mExecutor")
+        boolean cancelScheduledReopen() {
+            boolean cancelled = false;
+            if (mScheduledReopenHandle != null) {
+                // A reopen has been scheduled
+                debugLog("Cancelling scheduled re-open: " + mScheduledReopenRunnable);
+
+                // Ensure the runnable doesn't try to open the camera if it has already
+                // been pushed to the executor.
+                mScheduledReopenRunnable.cancel();
+                mScheduledReopenRunnable = null;
+
+                // Un-schedule the runnable in case if hasn't run.
+                mScheduledReopenHandle.cancel(/*mayInterruptIfRunning=*/false);
+                mScheduledReopenHandle = null;
+
+                cancelled = true;
+            }
+
+            return cancelled;
+        }
+
+        /**
+         * A {@link Runnable} which will attempt to reopen the camera after a scheduled delay.
+         */
+        class ScheduledReopen implements Runnable {
+
+            @CameraExecutor
+            private Executor mExecutor;
+            private boolean mCancelled = false;
+
+            ScheduledReopen(@NonNull @CameraExecutor Executor executor) {
+                mExecutor = executor;
+            }
+
+            void cancel() {
+                mCancelled = true;
+            }
+
+            @Override
+            public void run() {
+                mExecutor.execute(() -> {
+                    // Scheduled reopen may have been cancelled after execute(). Check to ensure
+                    // this is still the scheduled reopen.
+                    if (!mCancelled) {
+                        Preconditions.checkState(mState == InternalState.REOPENING);
+                        openCameraDevice();
+                    }
+                });
+            }
+        }
     }
 
     @SuppressWarnings("WeakerAccess") /* synthetic accessor */
diff --git a/camera/camera-core/src/main/res/values-af/strings.xml b/camera/camera-core/src/main/res/values-af/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-af/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-am/strings.xml b/camera/camera-core/src/main/res/values-am/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-am/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ar/strings.xml b/camera/camera-core/src/main/res/values-ar/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ar/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-as/strings.xml b/camera/camera-core/src/main/res/values-as/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-as/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-az/strings.xml b/camera/camera-core/src/main/res/values-az/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-az/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-b+sr+Latn/strings.xml b/camera/camera-core/src/main/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-be/strings.xml b/camera/camera-core/src/main/res/values-be/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-be/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-bg/strings.xml b/camera/camera-core/src/main/res/values-bg/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-bg/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-bn/strings.xml b/camera/camera-core/src/main/res/values-bn/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-bn/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-bs/strings.xml b/camera/camera-core/src/main/res/values-bs/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-bs/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ca/strings.xml b/camera/camera-core/src/main/res/values-ca/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ca/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-cs/strings.xml b/camera/camera-core/src/main/res/values-cs/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-cs/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-da/strings.xml b/camera/camera-core/src/main/res/values-da/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-da/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-de/strings.xml b/camera/camera-core/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-de/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-el/strings.xml b/camera/camera-core/src/main/res/values-el/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-el/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-en-rAU/strings.xml b/camera/camera-core/src/main/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-en-rAU/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-en-rCA/strings.xml b/camera/camera-core/src/main/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-en-rCA/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-en-rGB/strings.xml b/camera/camera-core/src/main/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-en-rIN/strings.xml b/camera/camera-core/src/main/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-en-rIN/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-en-rXC/strings.xml b/camera/camera-core/src/main/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-en-rXC/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-es-rUS/strings.xml b/camera/camera-core/src/main/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-es-rUS/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-es/strings.xml b/camera/camera-core/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-es/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-et/strings.xml b/camera/camera-core/src/main/res/values-et/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-et/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-eu/strings.xml b/camera/camera-core/src/main/res/values-eu/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-eu/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-fa/strings.xml b/camera/camera-core/src/main/res/values-fa/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-fa/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-fi/strings.xml b/camera/camera-core/src/main/res/values-fi/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-fi/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-fr-rCA/strings.xml b/camera/camera-core/src/main/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-fr-rCA/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-fr/strings.xml b/camera/camera-core/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-fr/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-gl/strings.xml b/camera/camera-core/src/main/res/values-gl/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-gl/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-gu/strings.xml b/camera/camera-core/src/main/res/values-gu/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-gu/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-hi/strings.xml b/camera/camera-core/src/main/res/values-hi/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-hi/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-hr/strings.xml b/camera/camera-core/src/main/res/values-hr/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-hr/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-hu/strings.xml b/camera/camera-core/src/main/res/values-hu/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-hu/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-hy/strings.xml b/camera/camera-core/src/main/res/values-hy/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-hy/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-in/strings.xml b/camera/camera-core/src/main/res/values-in/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-in/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-is/strings.xml b/camera/camera-core/src/main/res/values-is/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-is/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-it/strings.xml b/camera/camera-core/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-it/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-iw/strings.xml b/camera/camera-core/src/main/res/values-iw/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-iw/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ja/strings.xml b/camera/camera-core/src/main/res/values-ja/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ja/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ka/strings.xml b/camera/camera-core/src/main/res/values-ka/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ka/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-kk/strings.xml b/camera/camera-core/src/main/res/values-kk/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-kk/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-km/strings.xml b/camera/camera-core/src/main/res/values-km/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-km/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-kn/strings.xml b/camera/camera-core/src/main/res/values-kn/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-kn/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ko/strings.xml b/camera/camera-core/src/main/res/values-ko/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ko/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ky/strings.xml b/camera/camera-core/src/main/res/values-ky/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ky/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-lo/strings.xml b/camera/camera-core/src/main/res/values-lo/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-lo/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-lt/strings.xml b/camera/camera-core/src/main/res/values-lt/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-lt/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-lv/strings.xml b/camera/camera-core/src/main/res/values-lv/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-lv/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-mk/strings.xml b/camera/camera-core/src/main/res/values-mk/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-mk/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ml/strings.xml b/camera/camera-core/src/main/res/values-ml/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ml/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-mn/strings.xml b/camera/camera-core/src/main/res/values-mn/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-mn/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-mr/strings.xml b/camera/camera-core/src/main/res/values-mr/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-mr/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ms/strings.xml b/camera/camera-core/src/main/res/values-ms/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ms/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-my/strings.xml b/camera/camera-core/src/main/res/values-my/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-my/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-nb/strings.xml b/camera/camera-core/src/main/res/values-nb/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-nb/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ne/strings.xml b/camera/camera-core/src/main/res/values-ne/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ne/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-nl/strings.xml b/camera/camera-core/src/main/res/values-nl/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-nl/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-or/strings.xml b/camera/camera-core/src/main/res/values-or/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-or/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-pa/strings.xml b/camera/camera-core/src/main/res/values-pa/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-pa/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-pl/strings.xml b/camera/camera-core/src/main/res/values-pl/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-pl/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-pt-rBR/strings.xml b/camera/camera-core/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-pt-rPT/strings.xml b/camera/camera-core/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-pt/strings.xml b/camera/camera-core/src/main/res/values-pt/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-pt/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ro/strings.xml b/camera/camera-core/src/main/res/values-ro/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ro/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ru/strings.xml b/camera/camera-core/src/main/res/values-ru/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ru/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-si/strings.xml b/camera/camera-core/src/main/res/values-si/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-si/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-sk/strings.xml b/camera/camera-core/src/main/res/values-sk/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-sk/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-sl/strings.xml b/camera/camera-core/src/main/res/values-sl/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-sl/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-sq/strings.xml b/camera/camera-core/src/main/res/values-sq/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-sq/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-sr/strings.xml b/camera/camera-core/src/main/res/values-sr/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-sr/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-sv/strings.xml b/camera/camera-core/src/main/res/values-sv/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-sv/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-sw/strings.xml b/camera/camera-core/src/main/res/values-sw/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-sw/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ta/strings.xml b/camera/camera-core/src/main/res/values-ta/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ta/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-te/strings.xml b/camera/camera-core/src/main/res/values-te/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-te/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-th/strings.xml b/camera/camera-core/src/main/res/values-th/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-th/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-tl/strings.xml b/camera/camera-core/src/main/res/values-tl/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-tl/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-tr/strings.xml b/camera/camera-core/src/main/res/values-tr/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-tr/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-uk/strings.xml b/camera/camera-core/src/main/res/values-uk/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-uk/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-ur/strings.xml b/camera/camera-core/src/main/res/values-ur/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-ur/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-uz/strings.xml b/camera/camera-core/src/main/res/values-uz/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-uz/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-vi/strings.xml b/camera/camera-core/src/main/res/values-vi/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-vi/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-zh-rCN/strings.xml b/camera/camera-core/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-zh-rHK/strings.xml b/camera/camera-core/src/main/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-zh-rHK/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-zh-rTW/strings.xml b/camera/camera-core/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-core/src/main/res/values-zu/strings.xml b/camera/camera-core/src/main/res/values-zu/strings.xml
new file mode 100644
index 0000000..32345e3
--- /dev/null
+++ b/camera/camera-core/src/main/res/values-zu/strings.xml
@@ -0,0 +1,21 @@
+<?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.
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="androidx_camera_default_config_provider" msgid="3548231669228044639"></string>
+</resources>
diff --git a/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewImplementationTest.java b/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewImplementationTest.java
index 1a30fef..8e46cde 100644
--- a/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewImplementationTest.java
+++ b/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewImplementationTest.java
@@ -30,6 +30,7 @@
 import androidx.camera.core.impl.DeferrableSurface;
 import androidx.camera.view.preview.transform.PreviewTransform;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
@@ -209,6 +210,7 @@
         assertThat(mImplementation.mSurfaceReleaseFuture).isNull();
     }
 
+    @FlakyTest
     @Test
     public void releaseSurface_whenSurfaceTextureDestroyed_andCameraSurfaceRequestIsCancelled() {
         mImplementation.getSurfaceProvider().onSurfaceRequested(getSurfaceRequest());
diff --git a/camera/integration-tests/timingtestapp/build.gradle b/camera/integration-tests/timingtestapp/build.gradle
index 87857cf..168505e 100644
--- a/camera/integration-tests/timingtestapp/build.gradle
+++ b/camera/integration-tests/timingtestapp/build.gradle
@@ -58,7 +58,7 @@
 
     // Android support library
     implementation(project(":concurrent:concurrent-futures-ktx"))
-    implementation(project(":fragment:fragment"))
+    implementation(project(":fragment:fragment-ktx"))
     implementation("androidx.appcompat:appcompat:1.1.0")
     implementation("androidx.collection:collection:1.0.0")
     implementation("androidx.preference:preference:1.1.0")
diff --git a/camera/integration-tests/timingtestapp/src/main/java/androidx/camera/integration/antelope/MainActivity.kt b/camera/integration-tests/timingtestapp/src/main/java/androidx/camera/integration/antelope/MainActivity.kt
index 3bd621f..d347803 100644
--- a/camera/integration-tests/timingtestapp/src/main/java/androidx/camera/integration/antelope/MainActivity.kt
+++ b/camera/integration-tests/timingtestapp/src/main/java/androidx/camera/integration/antelope/MainActivity.kt
@@ -32,11 +32,12 @@
 import android.view.View
 import android.view.WindowManager
 import android.widget.Toast
+import androidx.activity.invoke
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.appcompat.app.AppCompatActivity
 import androidx.camera.integration.antelope.cameracontrollers.camera2Abort
 import androidx.camera.integration.antelope.cameracontrollers.cameraXAbort
 import androidx.camera.integration.antelope.cameracontrollers.closeAllCameras
-import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
@@ -110,6 +111,15 @@
         }
     }
 
+    private val requestPermission = registerForActivityResult(RequestPermission()) { granted ->
+        if (granted) {
+            // We now have permission, restart the app
+            val intent = this.intent
+            finish()
+            startActivity(intent)
+        }
+    }
+
     /**
      * Check camera permissions and set up UI
      */
@@ -245,59 +255,18 @@
     }
 
     /**
-     * Act on the result of a permissions request. If permission granted simply restart the activity
-     */
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<String>,
-        grantResults: IntArray
-    ) {
-
-        when (requestCode) {
-            REQUEST_CAMERA_PERMISSION -> {
-                if (grantResults.size > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    // We now have permission, restart the app
-                    val intent = this.intent
-                    finish()
-                    startActivity(intent)
-                } else {
-                }
-                return
-            }
-            REQUEST_FILE_WRITE_PERMISSION -> {
-                // If request is cancelled, the result arrays are empty.
-                if (grantResults.size > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    // We now have permission, restart the app
-                    val intent = this.intent
-                    finish()
-                    startActivity(intent)
-                } else {
-                }
-                return
-            }
-            else -> super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        }
-    }
-
-    /**
      * Check if we have been granted the need camera and file-system permissions
      */
     fun checkCameraPermissions(): Boolean {
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
             != PackageManager.PERMISSION_GRANTED) {
-
-            // No explanation needed; request the permission
-            ActivityCompat.requestPermissions(this,
-                arrayOf(Manifest.permission.CAMERA),
-                REQUEST_CAMERA_PERMISSION)
+            // Launch the permission request for CAMERA
+            requestPermission(Manifest.permission.CAMERA)
             return false
         } else if (ContextCompat.checkSelfPermission(this,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            != PackageManager.PERMISSION_GRANTED) {
-            // No explanation needed; request the permission
-            ActivityCompat.requestPermissions(this,
-                arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
-                REQUEST_FILE_WRITE_PERMISSION)
+                Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            // Launch the permission request for WRITE_EXTERNAL_STORAGE
+            requestPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
             return false
         }
 
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeMultiPlatformTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeMultiPlatformTests.kt
index a431fb7..10958f7 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeMultiPlatformTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposeMultiPlatformTests.kt
@@ -62,7 +62,6 @@
         public final class JvmKt {
           final static INNERCLASS JvmKt%Test%1 null null
           public final static Test(Landroidx/compose/Composer;)V
-          public final static synthetic Test()V
         }
         """
         )
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamSignatureTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamSignatureTests.kt
index 5e097dd..aae56dc 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamSignatureTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamSignatureTests.kt
@@ -45,8 +45,6 @@
             public final class TestKt {
               public final static Foo(Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;)V
               public final static Bar(Landroidx/compose/Composer;)V
-              public final static synthetic Foo(Lkotlin/jvm/functions/Function0;)V
-              public final static synthetic Bar()V
               final static INNERCLASS TestKt%Foo%1 null null
               final static INNERCLASS TestKt%Bar%1 null null
               final static INNERCLASS TestKt%Bar%4 null null
@@ -121,8 +119,6 @@
             public final class TestKt {
               public final static Foo(Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/compose/Composer;)V
               public final static Example(Landroidx/compose/Composer;)V
-              public final static synthetic Foo(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-              public final static synthetic Example()V
               final static INNERCLASS TestKt%Foo%1 null null
               final static INNERCLASS TestKt%Example%1 null null
               final static INNERCLASS TestKt%Example%4 null null
@@ -167,7 +163,6 @@
               private final static Landroidx/compose/ProvidableAmbient; a
               public final static getA()Landroidx/compose/ProvidableAmbient;
               public final static Foo(Landroidx/compose/Composer;)V
-              public final static synthetic Foo()V
               public final static <clinit>()V
               final static INNERCLASS TestKt%Foo%1 null null
               final static INNERCLASS TestKt%a%1 null null
@@ -263,7 +258,6 @@
         """
             public final class TestKt {
               public final static Example(Landroidx/compose/Composer;)V
-              public final static synthetic Example()V
               final static INNERCLASS TestKt%Example%4 null null
             }
             final class TestKt%Example%4 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function1 {
@@ -392,7 +386,6 @@
             public final class TestKt {
               public final static Foo(ILandroidx/compose/Composer;)V
               public static synthetic Foo%default(ILandroidx/compose/Composer;ILjava/lang/Object;)V
-              public final static synthetic Foo(I)V
               final static INNERCLASS TestKt%Foo%1 null null
             }
             final class TestKt%Foo%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function1 {
@@ -424,9 +417,6 @@
               public final static Foo(ILandroidx/compose/Composer;)V
               public static synthetic Foo%default(ILandroidx/compose/Composer;ILjava/lang/Object;)V
               public final static test(Landroidx/compose/Composer;)V
-              public final static synthetic identity(Ljava/lang/Object;)Ljava/lang/Object;
-              public final static synthetic Foo(I)V
-              public final static synthetic test()V
               final static INNERCLASS TestKt%Foo%1 null null
               final static INNERCLASS TestKt%test%5 null null
             }
@@ -466,8 +456,6 @@
             public final class TestKt {
               public final static Foo(ILjava/lang/String;Landroidx/compose/Composer;)V
               public final static Bar(ILjava/lang/String;Landroidx/compose/Composer;)V
-              public final static synthetic Foo(ILjava/lang/String;)V
-              public final static synthetic Bar(ILjava/lang/String;)V
               final static INNERCLASS TestKt%Foo%3 null null
               final static INNERCLASS TestKt%Bar%1 null null
             }
@@ -505,8 +493,6 @@
             public final class TestKt {
               public final static Foo(Landroidx/compose/Composer;)V
               public final static Bar(ILandroidx/compose/Composer;)V
-              public final static synthetic Foo()V
-              public final static synthetic Bar(I)V
               final static INNERCLASS TestKt%Foo%2 null null
               final static INNERCLASS TestKt%Bar%1 null null
             }
@@ -541,7 +527,6 @@
               private final static Lkotlin/jvm/functions/Function2; foo
               public final static getFoo()Lkotlin/jvm/functions/Function2;
               public final static Bar(Landroidx/compose/Composer;)V
-              public final static synthetic Bar()V
               public final static <clinit>()V
               final static INNERCLASS TestKt%Bar%3 null null
               final static INNERCLASS TestKt%foo%1 null null
@@ -575,7 +560,6 @@
         """
             public final class TestKt {
               public final static Bar(Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;)V
-              public final static synthetic Bar(Lkotlin/jvm/functions/Function0;)V
               final static INNERCLASS TestKt%Bar%foo%1 null null
               final static INNERCLASS TestKt%Bar%5 null null
             }
@@ -620,8 +604,6 @@
             public final class TestKt {
               public final static Wrap(Lkotlin/jvm/functions/Function2;Landroidx/compose/Composer;)V
               public final static App(ILandroidx/compose/Composer;)V
-              public final static synthetic Wrap(Lkotlin/jvm/functions/Function1;)V
-              public final static synthetic App(I)V
               final static INNERCLASS TestKt%Wrap%3 null null
               final static INNERCLASS TestKt%App%1 null null
               final static INNERCLASS TestKt%App%4 null null
@@ -678,12 +660,10 @@
         """
             public abstract interface Foo {
               public abstract bar(Landroidx/compose/Composer;)V
-              public abstract synthetic bar()V
             }
             public final class FooImpl implements Foo {
               public <init>()V
               public bar(Landroidx/compose/Composer;)V
-              public synthetic bar()V
               final static INNERCLASS FooImpl%bar%1 null null
             }
             final class FooImpl%bar%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function1 {
@@ -713,11 +693,9 @@
         """
             public abstract class Ambient2 {
               private <init>()V
-              public final synthetic getCurrent()Ljava/lang/Object;
+              public final getCurrent(Landroidx/compose/Composer;)Ljava/lang/Object;
               public static synthetic getCurrent%annotations()V
               public final foo(Landroidx/compose/Composer;)V
-              public final synthetic foo()V
-              public final getCurrent(Landroidx/compose/Composer;)Ljava/lang/Object;
               public synthetic <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
               final static INNERCLASS Ambient2%foo%1 null null
             }
@@ -751,9 +729,8 @@
         """,
         """
             public final class TestKt {
-              public final static synthetic getFoo()I
-              public static synthetic getFoo%annotations()V
               public final static getFoo(Landroidx/compose/Composer;)I
+              public static synthetic getFoo%annotations()V
             }
         """
     )
@@ -768,9 +745,8 @@
         """
             public final class Foo {
               public <init>()V
-              public final synthetic getFoo()I
-              public static synthetic getFoo%annotations()V
               public final getFoo(Landroidx/compose/Composer;)I
+              public static synthetic getFoo%annotations()V
             }
         """
     )
@@ -869,11 +845,9 @@
         """,
         """
             public final class TestKt {
-              public final static synthetic getBar()I
+              public final static getBar(Landroidx/compose/Composer;)I
               public static synthetic getBar%annotations()V
               public final static Example(Landroidx/compose/Composer;)V
-              public final static synthetic Example()V
-              public final static getBar(Landroidx/compose/Composer;)I
               final static INNERCLASS TestKt%Example%1 null null
             }
             final class TestKt%Example%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function1 {
@@ -901,12 +875,10 @@
             public abstract class BaseFoo {
               public <init>()V
               public abstract bar(Landroidx/compose/Composer;)V
-              public abstract synthetic bar()V
             }
             public final class FooImpl extends BaseFoo {
               public <init>()V
               public bar(Landroidx/compose/Composer;)V
-              public synthetic bar()V
               final static INNERCLASS FooImpl%bar%1 null null
             }
             final class FooImpl%bar%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function1 {
@@ -941,8 +913,6 @@
             public final class TestKt {
               public final static Wat(Landroidx/compose/Composer;)V
               public final static Foo(ILandroidx/compose/Composer;)V
-              public final static synthetic Wat()V
-              public final static synthetic Foo(I)V
               private final static Foo%goo(Landroidx/compose/Composer;)V
               public final static synthetic access%Foo%goo(Landroidx/compose/Composer;)V
               final static INNERCLASS TestKt%Wat%1 null null
@@ -960,7 +930,6 @@
             public final class TestKt%Foo%Bar {
               public <init>()V
               public final baz(Landroidx/compose/Composer;)V
-              public final synthetic baz()V
               final static INNERCLASS TestKt%Foo%Bar%baz%3 null null
               public final static INNERCLASS TestKt%Foo%Bar null Bar
               OUTERCLASS TestKt Foo (ILandroidx/compose/Composer;)V
@@ -1069,7 +1038,6 @@
         """
             public final class TestKt {
               public final static Example(Landroidx/compose/Composer;)V
-              public final static synthetic Example()V
               final static INNERCLASS TestKt%Example%3 null null
             }
             final class TestKt%Example%3 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function1 {
@@ -1097,8 +1065,6 @@
             public final class TestKt {
               public final static Example(Lkotlin/jvm/functions/Function1;Landroidx/compose/Composer;)V
               public final static Test(Landroidx/compose/Composer;)V
-              public final static synthetic Example(Lkotlin/jvm/functions/Function0;)V
-              public final static synthetic Test()V
               final static INNERCLASS TestKt%Test%2 null null
             }
             final class TestKt%Test%2 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function1 {
@@ -1127,7 +1093,6 @@
             public final class TestKt {
               private final static setRef(Landroid/widget/TextView;Lkotlin/jvm/functions/Function1;)V
               public final static Test(Landroidx/compose/Composer;)V
-              public final static synthetic Test()V
               final static INNERCLASS TestKt%Test%1%1 null null
               final static INNERCLASS TestKt%Test%4 null null
             }
@@ -1158,16 +1123,15 @@
         """,
         """
             public final class TestKt {
-              public final static synthetic getMyProperty()Lkotlin/jvm/functions/Function0;
-              public static synthetic getMyProperty%annotations()V
               public final static getMyProperty(Landroidx/compose/Composer;)Lkotlin/jvm/functions/Function0;
-              final static INNERCLASS TestKt%1 null null
+              public static synthetic getMyProperty%annotations()V
+              final static INNERCLASS TestKt%myProperty%1 null null
             }
-            final class TestKt%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function0 {
+            final class TestKt%myProperty%1 extends kotlin/jvm/internal/Lambda implements kotlin/jvm/functions/Function0 {
               <init>()V
               public final invoke()V
               public synthetic bridge invoke()Ljava/lang/Object;
-              final static INNERCLASS TestKt%1 null null
+              final static INNERCLASS TestKt%myProperty%1 null null
               OUTERCLASS TestKt getMyProperty (Landroidx/compose/Composer;)Lkotlin/jvm/functions/Function0;
             }
         """
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamTransformTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamTransformTests.kt
index 5c9f7bd..b69c57f 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamTransformTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/ComposerParamTransformTests.kt
@@ -45,14 +45,14 @@
             }
         """,
         """
+            val bar: Int
+              get() {
+                return 123
+              }
             @Composable
             fun Example(%composer: Composer<*>?) {
               bar
             }
-            @JvmName("getBar")
-            fun <get-bar>(%composer: Composer<*>?): Int {
-              return 123
-            }
         """
     )
 
@@ -251,11 +251,11 @@
             }
         """,
         """
-            @JvmName("getMyProperty")
-            fun <get-myProperty>(%composer: Composer<*>?): Function0<Unit> {
-              return {
+            val myProperty: Function0<Unit>
+              get() {
+                return {
+                }
               }
-            }
         """
     )
 
diff --git a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxCrossModuleTests.kt b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxCrossModuleTests.kt
index aaecdc6..5a0cc83 100644
--- a/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxCrossModuleTests.kt
+++ b/compose/compose-compiler-hosted/integration-tests/src/test/java/androidx/compose/plugins/kotlin/KtxCrossModuleTests.kt
@@ -38,6 +38,52 @@
 class KtxCrossModuleTests : AbstractCodegenTest() {
 
     @Test
+    fun testAccessibilityBridgeGeneration(): Unit = ensureSetup {
+        compile(
+            mapOf("library module" to mapOf(
+                    "x/I.kt" to """
+                      package x
+
+                      import androidx.compose.Composable
+
+                      @Composable fun bar(arg: @Composable () -> Unit) {
+                          arg()
+                      }
+                  """.trimIndent()
+                ),
+                "Main" to mapOf(
+                    "y/User.kt" to """
+                      package y
+
+                      import x.bar
+                      import androidx.compose.Composable
+
+                      @Composable fun baz() {
+                          bar {
+                            foo()
+                          }
+                      }
+                      @Composable private fun foo() { }
+                  """.trimIndent()
+                )
+            )
+        ) {
+            // Check that there is only one method declaration for access$foo.
+            // We used to introduce more symbols for the same function leading
+            // to multiple identical methods in the output.
+            // In the dump, $ is mapped to %.
+            val declaration = "synthetic access%foo"
+            val occurrences = it.windowed(declaration.length) { candidate ->
+                if (candidate.equals(declaration))
+                    1
+                else
+                    0
+            }.sum()
+            assert(occurrences == 1)
+        }
+    }
+
+    @Test
     fun testInlineClassCrossModule(): Unit = ensureSetup {
         compile(
             mapOf(
@@ -74,6 +120,47 @@
     }
 
     @Test
+    fun testInlineClassOverloading(): Unit = ensureSetup {
+        compile(
+            mapOf(
+                "library module" to mapOf(
+                    "x/A.kt" to """
+                        package x
+
+                        import androidx.compose.Composable
+
+                        inline class I(val i: Int)
+                        inline class J(val j: Int)
+
+                        @Composable fun foo(i: I) { }
+                        @Composable fun foo(j: J) { }
+                    """.trimIndent()
+                ),
+                "Main" to mapOf(
+                    "y/B.kt" to """
+                        package y
+
+                        import androidx.compose.Composable
+                        import x.*
+
+                        @Composable fun bar(k: Int) {
+                            foo(I(k))
+                            foo(J(k))
+                        }
+                    """
+                )
+            )
+        ) {
+            // Check that the composable functions were properly mangled
+            assert(it.contains("public final static foo-M7K8KNI(ILandroidx/compose/Composer;)V"))
+            assert(it.contains("public final static foo-fpD6Y9w(ILandroidx/compose/Composer;)V"))
+            // Check that we didn't leave any references to the original name, which probably
+            // leads to a compile error.
+            assert(!it.contains("foo("))
+        }
+    }
+
+    @Test
     fun testCrossinlineEmittable(): Unit = ensureSetup {
         compile(
             mapOf(
diff --git a/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposableCallTransformer.kt b/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposableCallTransformer.kt
index 67b89c75e2..23609dd 100644
--- a/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposableCallTransformer.kt
+++ b/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposableCallTransformer.kt
@@ -1,7 +1,6 @@
 package androidx.compose.plugins.kotlin.compiler.lower
 
 import androidx.compose.plugins.kotlin.ComposableEmitMetadata
-import androidx.compose.plugins.kotlin.ComposeFqNames
 import androidx.compose.plugins.kotlin.EmitChildrenValueParameterDescriptor
 import androidx.compose.plugins.kotlin.KtxNameConventions
 import androidx.compose.plugins.kotlin.ValidatedAssignment
@@ -12,31 +11,19 @@
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
 import org.jetbrains.kotlin.backend.common.deepCopyWithVariables
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
-import org.jetbrains.kotlin.backend.common.ir.copyTo
-import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor
 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.JvmBackendContext
-import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.builtins.getReceiverTypeFromFunctionType
 import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
-import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
-import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.IrBlockBuilder
 import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
-import org.jetbrains.kotlin.ir.builders.at
-import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
-import org.jetbrains.kotlin.ir.builders.declarations.addFunction
-import org.jetbrains.kotlin.ir.builders.declarations.buildClass
 import org.jetbrains.kotlin.ir.builders.irBlock
-import org.jetbrains.kotlin.ir.builders.irBlockBody
 import org.jetbrains.kotlin.ir.builders.irCall
-import org.jetbrains.kotlin.ir.builders.irDelegatingConstructorCall
 import org.jetbrains.kotlin.ir.builders.irFalse
 import org.jetbrains.kotlin.ir.builders.irGet
 import org.jetbrains.kotlin.ir.builders.irInt
@@ -44,8 +31,6 @@
 import org.jetbrains.kotlin.ir.builders.irReturnUnit
 import org.jetbrains.kotlin.ir.builders.irTemporary
 import org.jetbrains.kotlin.ir.builders.irTrue
-import org.jetbrains.kotlin.ir.builders.setSourceRange
-import org.jetbrains.kotlin.ir.declarations.IrConstructor
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrFunction
@@ -58,38 +43,17 @@
 import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrFunctionExpression
-import org.jetbrains.kotlin.ir.expressions.IrGetValue
-import org.jetbrains.kotlin.ir.expressions.IrReturn
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
 import org.jetbrains.kotlin.ir.expressions.copyTypeArgumentsFrom
 import org.jetbrains.kotlin.ir.expressions.getValueArgument
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrFunctionReferenceImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrInstanceInitializerCallImpl
 import org.jetbrains.kotlin.ir.expressions.putTypeArguments
 import org.jetbrains.kotlin.ir.expressions.putValueArgument
 import org.jetbrains.kotlin.ir.expressions.typeParametersCount
 import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl
-import org.jetbrains.kotlin.ir.types.IrSimpleType
-import org.jetbrains.kotlin.ir.types.IrTypeProjection
-import org.jetbrains.kotlin.ir.types.getClass
 import org.jetbrains.kotlin.ir.types.isUnit
 import org.jetbrains.kotlin.ir.types.toKotlinType
-import org.jetbrains.kotlin.ir.types.typeWith
 import org.jetbrains.kotlin.ir.util.DeepCopySymbolRemapper
-import org.jetbrains.kotlin.ir.util.constructors
-import org.jetbrains.kotlin.ir.util.defaultType
-import org.jetbrains.kotlin.ir.util.explicitParameters
-import org.jetbrains.kotlin.ir.util.findAnnotation
-import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
-import org.jetbrains.kotlin.ir.util.functions
-import org.jetbrains.kotlin.ir.util.getArgumentsWithIr
-import org.jetbrains.kotlin.ir.util.isSuspend
-import org.jetbrains.kotlin.ir.util.parentAsClass
-import org.jetbrains.kotlin.ir.util.statements
-import org.jetbrains.kotlin.ir.util.substitute
-import org.jetbrains.kotlin.ir.util.typeSubstitutionMap
-import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi2ir.findFirstFunction
@@ -350,9 +314,7 @@
                     type = blockParameter.type.toIrType()
                 ) {
                     +irCall(
-                        callee = IrSimpleFunctionSymbolImpl(original.symbol.descriptor).also {
-                            it.bind(original.symbol.owner as IrSimpleFunction)
-                        },
+                        callee = original.symbol,
                         type = original.type
                     ).apply {
                         copyTypeArgumentsFrom(original)
diff --git a/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposableTypeRemapper.kt b/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposableTypeRemapper.kt
index e2e47d4..ca6ceea 100644
--- a/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposableTypeRemapper.kt
+++ b/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposableTypeRemapper.kt
@@ -17,10 +17,8 @@
 package androidx.compose.plugins.kotlin.compiler.lower
 
 import androidx.compose.plugins.kotlin.ComposeFqNames
-import androidx.compose.plugins.kotlin.allUnbound
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.pop
-import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
 import org.jetbrains.kotlin.builtins.isFunctionType
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.ir.IrElement
@@ -28,7 +26,6 @@
 import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrConstructor
-import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrField
 import org.jetbrains.kotlin.ir.declarations.IrFile
@@ -44,7 +41,6 @@
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionBase
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrPropertyImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedTypeParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrCall
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
@@ -59,7 +55,6 @@
 import org.jetbrains.kotlin.ir.types.IrTypeArgument
 import org.jetbrains.kotlin.ir.types.IrTypeProjection
 import org.jetbrains.kotlin.ir.types.classifierOrNull
-import org.jetbrains.kotlin.ir.types.getClass
 import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
 import org.jetbrains.kotlin.ir.types.impl.IrTypeAbbreviationImpl
 import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
@@ -70,23 +65,14 @@
 import org.jetbrains.kotlin.ir.util.SymbolRenamer
 import org.jetbrains.kotlin.ir.util.TypeRemapper
 import org.jetbrains.kotlin.ir.util.TypeTranslator
-import org.jetbrains.kotlin.ir.util.constructedClass
-import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
 import org.jetbrains.kotlin.ir.util.hasAnnotation
-import org.jetbrains.kotlin.ir.util.isFunction
-import org.jetbrains.kotlin.ir.util.kotlinPackageFqn
 import org.jetbrains.kotlin.ir.util.patchDeclarationParents
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
-import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaTypeParameterDescriptor
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi2ir.PsiSourceManager
 import org.jetbrains.kotlin.psi2ir.findFirstFunction
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeParameterDescriptor
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.Variance
-import org.jetbrains.kotlin.types.replace
 import org.jetbrains.kotlin.types.typeUtil.replaceArgumentsWithStarProjections
 import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
 
@@ -337,12 +323,6 @@
 
     private val scopeStack = mutableListOf<IrTypeParametersContainer>()
 
-    private val shouldTransform: Boolean get() {
-        // we don't want to remap the types of composable decoys. they are there specifically for
-        // their types to be unaltered!
-        return scopeStack.isEmpty() || scopeStack.last().origin != COMPOSABLE_DECOY_IMPL
-    }
-
     override fun enterScope(irTypeParametersContainer: IrTypeParametersContainer) {
         scopeStack.add(irTypeParametersContainer)
     }
@@ -375,7 +355,6 @@
         if (type !is IrSimpleType) return type
         if (!type.isFunction()) return underlyingRemapType(type)
         if (!type.isComposable()) return underlyingRemapType(type)
-        if (!shouldTransform) return underlyingRemapType(type)
         val oldIrArguments = type.arguments
         val realParams = oldIrArguments.size - 1
         var extraArgs = listOf(
diff --git a/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposerParamTransformer.kt b/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposerParamTransformer.kt
index 5104141..7a60361 100644
--- a/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposerParamTransformer.kt
+++ b/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/ComposerParamTransformer.kt
@@ -26,10 +26,7 @@
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.ir.copyTo
 import org.jetbrains.kotlin.backend.common.ir.copyTypeParametersFrom
-import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
-import org.jetbrains.kotlin.backend.common.lower.irThrow
 import org.jetbrains.kotlin.backend.jvm.ir.isInlineParameter
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor
@@ -37,17 +34,11 @@
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
-import org.jetbrains.kotlin.ir.builders.irBlockBody
-import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
-import org.jetbrains.kotlin.ir.declarations.IrDeclarationContainer
-import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
-import org.jetbrains.kotlin.ir.declarations.IrDeclarationOriginImpl
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 import org.jetbrains.kotlin.ir.declarations.IrOverridableDeclaration
-import org.jetbrains.kotlin.ir.declarations.IrProperty
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.ir.declarations.copyAttributes
@@ -80,16 +71,13 @@
 import org.jetbrains.kotlin.ir.util.deepCopyWithSymbols
 import org.jetbrains.kotlin.ir.util.explicitParameters
 import org.jetbrains.kotlin.ir.util.findAnnotation
-import org.jetbrains.kotlin.ir.util.functions
 import org.jetbrains.kotlin.ir.util.isFakeOverride
 import org.jetbrains.kotlin.ir.util.patchDeclarationParents
-import org.jetbrains.kotlin.ir.util.properties
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.ir.visitors.acceptVoid
 import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
 import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi
 import org.jetbrains.kotlin.load.java.JvmAbi
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtFunctionLiteral
 import org.jetbrains.kotlin.psi2ir.findFirstFunction
@@ -99,7 +87,6 @@
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DescriptorWithContainerSource
 import org.jetbrains.kotlin.types.typeUtil.replaceArgumentsWithStarProjections
 import org.jetbrains.kotlin.util.OperatorNameConventions
-import kotlin.math.ceil
 import kotlin.math.min
 
 class ComposerParamTransformer(
@@ -154,60 +141,6 @@
         return super.visitFunction(declaration.withComposerParamIfNeeded())
     }
 
-    override fun visitFile(declaration: IrFile): IrFile {
-        val originalFunctions = mutableListOf<IrFunction>()
-        val originalProperties = mutableListOf<Pair<IrProperty, IrSimpleFunction>>()
-        loop@for (child in declaration.declarations) {
-            when (child) {
-                is IrFunction -> originalFunctions.add(child)
-                is IrProperty -> {
-                    val getter = child.getter ?: continue@loop
-                    originalProperties.add(child to getter)
-                }
-            }
-        }
-        val result = super.visitFile(declaration)
-        result.patchWithSyntheticComposableDecoys(originalFunctions, originalProperties)
-        return result
-    }
-
-    override fun visitClass(declaration: IrClass): IrStatement {
-        val originalFunctions = declaration.functions.toList()
-        val originalProperties = declaration
-            .properties
-            .mapNotNull { p -> p.getter?.let { p to it } }
-            .toList()
-        val result = super.visitClass(declaration)
-        if (result !is IrClass) error("expected IrClass")
-        result.patchWithSyntheticComposableDecoys(originalFunctions, originalProperties)
-        return result
-    }
-
-    fun IrDeclarationContainer.patchWithSyntheticComposableDecoys(
-        originalFunctions: List<IrFunction>,
-        originalProperties: List<Pair<IrProperty, IrSimpleFunction>>
-    ) {
-        for (function in originalFunctions) {
-            if (transformedFunctions.containsKey(function) && function.isComposable()) {
-                declarations.add(function.copyAsComposableDecoy())
-            }
-        }
-        for ((property, getter) in originalProperties) {
-            if (transformedFunctions.containsKey(getter) && property.hasComposableAnnotation()) {
-                val newGetter = property.getter
-                assert(getter !== newGetter)
-                assert(newGetter != null)
-                // NOTE(lmr): the compiler seems to turn a getter with a single parameter into a
-                // setter, even though it's in the "getter" position. As a result, we will put
-                // the original parameter-less getter in the "getter" position, and add the
-                // single-parameter getter to the class itself.
-                property.getter = getter.copyAsComposableDecoy().also { it.parent = this }
-                declarations.add(newGetter!!)
-                newGetter.parent = this
-            }
-        }
-    }
-
     fun IrCall.withComposerParamIfNeeded(composerParam: IrValueParameter): IrCall {
         val isComposableLambda = isComposableLambdaInvoke()
         if (!symbol.descriptor.isComposable() && !isComposableLambda)
@@ -316,8 +249,6 @@
         // transform it further).
         if (transformedFunctionSet.contains(this)) return this
 
-        if (origin == COMPOSABLE_DECOY_IMPL) return this
-
         // if not a composable fn, nothing we need to do
         if (!descriptor.isComposable()) return this
 
@@ -384,44 +315,6 @@
         }
     }
 
-    private fun IrFunction.copyAsComposableDecoy(): IrSimpleFunction {
-        if (origin == IrDeclarationOrigin.FAKE_OVERRIDE) return this as IrSimpleFunction
-        return copy().also { fn ->
-            fn.origin = COMPOSABLE_DECOY_IMPL
-            (fn as IrFunctionImpl).metadata = metadata
-            val errorCls = context.moduleDescriptor.findTopLevel(FqName("kotlin" +
-                    ".NotImplementedError"))
-            val errorCtor = context.symbolTable.referenceConstructor(errorCls.constructors.single {
-                it.valueParameters.size == 1 &&
-                        KotlinBuiltIns.isString(it.valueParameters.single().type)
-            })
-            // the decoy cannot have default expressions in its parameters, since they might be
-            // composable and if they are, it wouldn't have a composer param to use
-            fn.valueParameters.clear()
-            valueParameters.mapTo(fn.valueParameters) { p -> p.copyTo(fn, defaultValue = null) }
-            fn.body = DeclarationIrBuilder(context, fn.symbol).irBlockBody {
-                +irThrow(
-                    IrConstructorCallImpl(
-                        UNDEFINED_OFFSET,
-                        UNDEFINED_OFFSET,
-                        errorCls.defaultType.toIrType(),
-                        errorCtor,
-                        0, 0, 1
-                    ).also {
-                        it.putValueArgument(0, IrConstImpl.string(
-                            UNDEFINED_OFFSET,
-                            UNDEFINED_OFFSET,
-                            builtIns.stringType,
-                            "Composable functions cannot be called without a " +
-                                    "composer. If you are getting this error, it " +
-                                    "is likely because of a misconfigured compiler"
-                        ))
-                    }
-                )
-            }
-        }
-    }
-
     private fun wrapDescriptor(descriptor: FunctionDescriptor): WrappedSimpleFunctionDescriptor {
         return when (descriptor) {
             is PropertyGetterDescriptor ->
@@ -504,6 +397,7 @@
                 p.copyTo(fn, name = dexSafeName(p.name))
             }
             annotations.mapTo(fn.annotations) { a -> a }
+            fn.metadata = metadata
             fn.body = body?.deepCopyWithSymbols(this)
         }
     }
@@ -576,6 +470,7 @@
             ) {
                 val name = JvmAbi.getterName(descriptor.correspondingProperty.name.identifier)
                 fn.annotations.add(jvmNameAnnotation(name))
+                fn.correspondingPropertySymbol?.owner?.getter = fn
             }
 
             // same thing for the setter
@@ -584,6 +479,7 @@
             ) {
                 val name = JvmAbi.setterName(descriptor.correspondingProperty.name.identifier)
                 fn.annotations.add(jvmNameAnnotation(name))
+                fn.correspondingPropertySymbol?.owner?.setter = fn
             }
 
             val valueParametersMapping = explicitParameters
@@ -784,6 +680,3 @@
         }
     }
 }
-
-internal val COMPOSABLE_DECOY_IMPL =
-    object : IrDeclarationOriginImpl("COMPOSABLE_DECOY_IMPL", isSynthetic = true) {}
\ No newline at end of file
diff --git a/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/IrSourcePrinter.kt b/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/IrSourcePrinter.kt
index 9ee4536..b68d441 100644
--- a/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/IrSourcePrinter.kt
+++ b/compose/compose-compiler-hosted/src/main/java/androidx/compose/plugins/kotlin/compiler/lower/IrSourcePrinter.kt
@@ -39,7 +39,6 @@
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.ir.declarations.IrVariable
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltInOperator
-import org.jetbrains.kotlin.ir.descriptors.IrSimpleBuiltinOperatorDescriptorImpl
 import org.jetbrains.kotlin.ir.expressions.IrBlock
 import org.jetbrains.kotlin.ir.expressions.IrBlockBody
 import org.jetbrains.kotlin.ir.expressions.IrBranch
@@ -53,7 +52,6 @@
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrContainerExpression
 import org.jetbrains.kotlin.ir.expressions.IrContinue
-import org.jetbrains.kotlin.ir.expressions.IrDeclarationReference
 import org.jetbrains.kotlin.ir.expressions.IrDelegatingConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrDoWhileLoop
 import org.jetbrains.kotlin.ir.expressions.IrElseBranch
@@ -97,7 +95,6 @@
 import org.jetbrains.kotlin.ir.types.isNullableAny
 import org.jetbrains.kotlin.ir.types.isUnit
 import org.jetbrains.kotlin.ir.util.isAnnotationClass
-import org.jetbrains.kotlin.ir.util.isFunction
 import org.jetbrains.kotlin.ir.util.isInterface
 import org.jetbrains.kotlin.ir.util.parentAsClass
 import org.jetbrains.kotlin.ir.util.primaryConstructor
@@ -202,7 +199,6 @@
     }
 
     override fun visitSimpleFunction(declaration: IrSimpleFunction) {
-        if (declaration.origin == COMPOSABLE_DECOY_IMPL) return
         if (declaration.origin == IrDeclarationOrigin.FAKE_OVERRIDE) return
         declaration.printAnnotations(onePerLine = true)
         if (declaration.overriddenSymbols.isNotEmpty()) {
@@ -804,7 +800,6 @@
     }
 
     override fun visitProperty(declaration: IrProperty) {
-        if (declaration.getter?.origin == COMPOSABLE_DECOY_IMPL) return
         if (declaration.isLateinit) {
             print("lateinit")
         }
diff --git a/compose/compose-runtime/api/0.1.0-dev10.txt b/compose/compose-runtime/api/0.1.0-dev10.txt
index 7e5d3c2..46f8053 100644
--- a/compose/compose-runtime/api/0.1.0-dev10.txt
+++ b/compose/compose-runtime/api/0.1.0-dev10.txt
@@ -103,6 +103,7 @@
     method public final Object? nextSlot();
     method public final boolean recompose();
     method public final void skipCurrentGroup();
+    method public final void skipToGroupEnd();
     method public final void startExpr(Object key);
     method public final void startGroup(Object key);
     method public final void startMovableGroup(Object key);
@@ -325,6 +326,7 @@
     method public int getNodeIndex();
     method public int getParentLocation();
     method public int getParentNodes();
+    method public int getParentSlots();
     method public androidx.compose.SlotTable getTable();
     method public int groupEnd(int index);
     method public Object groupKey(int index);
@@ -353,6 +355,7 @@
     property public final int nodeIndex;
     property public final int parentLocation;
     property public final int parentNodes;
+    property public final int parentSlots;
   }
 
   public final class SlotTable {
diff --git a/compose/compose-runtime/api/0.1.0-dev11.txt b/compose/compose-runtime/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..46f8053
--- /dev/null
+++ b/compose/compose-runtime/api/0.1.0-dev11.txt
@@ -0,0 +1,635 @@
+// Signature format: 3.0
+package androidx.compose {
+
+  public final class ActualAndroidKt {
+  }
+
+  public final class ActualJvmKt {
+  }
+
+  @androidx.compose.Immutable public abstract sealed class Ambient<T> {
+    method public final inline T! getCurrent();
+    property public final inline T! current;
+  }
+
+  public final class AmbientKt {
+    method @androidx.compose.Composable public static void Providers(androidx.compose.ProvidedValue<?>![] values, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static <T> androidx.compose.ProvidableAmbient<T> ambientOf(kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual, kotlin.jvm.functions.Function0<? extends T>? defaultFactory = null);
+    method public static <T> androidx.compose.ProvidableAmbient<T> staticAmbientOf(kotlin.jvm.functions.Function0<? extends T>? defaultFactory = null);
+  }
+
+  public final class Anchor {
+    ctor public Anchor(internal int loc);
+    method public boolean getValid();
+    method public int location(androidx.compose.SlotTable slots);
+    property public final boolean valid;
+  }
+
+  public final class Applier<N> {
+    ctor public Applier(N! root, androidx.compose.ApplyAdapter<N> adapter);
+    method public void down(N? node);
+    method public N! getCurrent();
+    method public void insert(int index, N? instance);
+    method public void move(int from, int to, int count);
+    method public void remove(int index, int count);
+    method public void reset();
+    method public void up();
+    property public final N! current;
+  }
+
+  public interface ApplyAdapter<N> {
+    method public void end(N?, N? instance, N? parent);
+    method public void insertAt(N?, int index, N? instance);
+    method public void move(N?, int from, int to, int count);
+    method public void removeAt(N?, int index, int count);
+    method public void start(N?, N? instance);
+  }
+
+  public final class BuildableMap<K, V> implements kotlin.jvm.internal.markers.KMappedMarker java.util.Map<K,V> {
+    ctor public BuildableMap(kotlinx.collections.immutable.PersistentMap<K,? extends V> map);
+    method public kotlinx.collections.immutable.PersistentMap<K,V> component1();
+    method public boolean containsKey(Object! key);
+    method public boolean containsValue(Object! value);
+    method public androidx.compose.BuildableMap<K,V> copy(kotlinx.collections.immutable.PersistentMap<K,? extends V> map);
+    method public V? get(Object! key);
+    method public java.util.Set<java.util.Map.Entry<K,V>> getEntries();
+    method public java.util.Set<K> getKeys();
+    method public kotlinx.collections.immutable.PersistentMap<K,V> getMap();
+    method public int getSize();
+    method public java.util.Collection<V> getValues();
+    method public boolean isEmpty();
+  }
+
+  public interface CommitScope {
+    method public void onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> callback);
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER, AnnotationTarget.PROPERTY}) public @interface Composable {
+  }
+
+  public final class ComposeKt {
+    method public static kotlin.jvm.functions.Function0<kotlin.Unit> emptyContent();
+    method public static inline kotlin.jvm.functions.Function0<kotlin.Unit> orEmpty(kotlin.jvm.functions.Function0<kotlin.Unit>?);
+  }
+
+  public class Composer<N> implements androidx.compose.ComposerValidator {
+    ctor public Composer(androidx.compose.SlotTable slotTable, androidx.compose.Applier<N> applier, androidx.compose.Recomposer recomposer);
+    method public final void abortRoot();
+    method public final <V, T> void apply(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+    method public final void applyChanges();
+    method public final androidx.compose.CompositionReference buildReference();
+    method public final inline void call(Object key, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerValidator,java.lang.Boolean> invalid, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public <T> boolean changed(T? value);
+    method public boolean changed(int value);
+    method public final void collectKeySourceInformation();
+    method protected final void composeRoot(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public final <T extends N> void createNode(kotlin.jvm.functions.Function0<? extends T> factory);
+    method public final <T extends N> void emitNode(kotlin.jvm.functions.Function0<? extends T> factory);
+    method public final void emitNode(N? node);
+    method public final void endExpr();
+    method public final void endGroup();
+    method public final void endMovableGroup();
+    method public final void endNode();
+    method public final void endReplaceableGroup();
+    method public final androidx.compose.ScopeUpdateScope? endRestartGroup();
+    method public final void endRoot();
+    method public final int getChangeCount();
+    method public final int getCurrentCompoundKeyHash();
+    method public final boolean getInserting();
+    method public final androidx.compose.Recomposer getRecomposer();
+    method public final boolean getSkipping();
+    method public final androidx.compose.SlotTable getSlotTable();
+    method public final Object joinKey(Object? left, Object? right);
+    method public final Object? nextSlot();
+    method public final boolean recompose();
+    method public final void skipCurrentGroup();
+    method public final void skipToGroupEnd();
+    method public final void startExpr(Object key);
+    method public final void startGroup(Object key);
+    method public final void startMovableGroup(Object key);
+    method public final void startNode(Object key);
+    method public final void startReplaceableGroup(int key);
+    method public final void startRestartGroup(int key);
+    method public final void startRoot();
+    method public final void updateValue(Object? value);
+    method public final N! useNode();
+    property public final int changeCount;
+    property public final int currentCompoundKeyHash;
+    property public final boolean inserting;
+    property public final boolean skipping;
+  }
+
+  public final class ComposerKt {
+    method public static inline <N, T> T! cache(androidx.compose.Composer<N>, boolean valid = true, kotlin.jvm.functions.Function0<? extends T> block);
+    method public static inline <T> T! escapeCompose(kotlin.jvm.functions.Function1<? super androidx.compose.NullCompilationScope,? extends T> block);
+    method public static androidx.compose.Composer<?> getCurrentComposer();
+  }
+
+  public final class ComposerUpdater<N, T extends N> {
+    ctor public ComposerUpdater(androidx.compose.Composer<N> composer, T! node);
+    method public androidx.compose.Composer<N> getComposer();
+    method public T! getNode();
+    method public inline void set(int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public inline <reified V> void set(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+    method public inline void update(int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public inline <reified V> void update(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+  }
+
+  public interface ComposerValidator {
+    method public boolean changed(int value);
+    method public <T> boolean changed(T? value);
+  }
+
+  public interface Composition {
+    method public void dispose();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class CompositionKt {
+    method public static androidx.compose.Composition compositionFor(Object container, androidx.compose.Recomposer recomposer, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function2<? super androidx.compose.SlotTable,? super androidx.compose.Recomposer,? extends androidx.compose.Composer<?>> composerFactory);
+    method @Deprecated public static androidx.compose.Composition compositionFor(Object container, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function2<? super androidx.compose.SlotTable,? super androidx.compose.Recomposer,? extends androidx.compose.Composer<?>> composerFactory);
+  }
+
+  public interface CompositionLifecycleObserver {
+    method public void onEnter();
+    method public void onLeave();
+  }
+
+  public interface CompositionReference {
+    method public <T> T! getAmbient(androidx.compose.Ambient<T> key);
+    method public androidx.compose.BuildableMap<androidx.compose.Ambient<java.lang.Object>,androidx.compose.State<java.lang.Object>> getAmbientScope();
+    method public void invalidate();
+    method public <N> void registerComposer(androidx.compose.Composer<N> composer);
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.FUNCTION) public @interface Direct {
+  }
+
+  public final class EffectsKt {
+    method @androidx.compose.Composable public static androidx.compose.CompositionReference compositionReference();
+    method public static kotlin.jvm.functions.Function0<kotlin.Unit> getInvalidate();
+    method @androidx.compose.Composable public static void onActive(kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static inline void onCommit(kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1> void onCommit(V1? v1, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1, V2> void onCommit(V1? v1, V2? v2, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static void onCommit(Object![]? inputs, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static void onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> callback);
+    method @androidx.compose.Composable public static inline void onPreCommit(kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1> void onPreCommit(V1? v1, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1, V2> void onPreCommit(V1? v1, V2? v2, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static void onPreCommit(Object![]? inputs, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+  }
+
+  public final class ExpectKt {
+  }
+
+  public final class FrameManager {
+    method public void ensureStarted();
+    method public <T> T! framed(kotlin.jvm.functions.Function0<? extends T> block);
+    method public <T> T! isolated(kotlin.jvm.functions.Function0<? extends T> block);
+    method public void nextFrame();
+    method public <T> T! unframed(kotlin.jvm.functions.Function0<? extends T> block);
+    field public static final androidx.compose.FrameManager! INSTANCE;
+  }
+
+  @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Immutable {
+  }
+
+  public final class JoinedKeyKt {
+    method public static boolean isJoinedKey(Object? key);
+    method public static Object? joinedKeyLeft(Object? key);
+    method public static Object? joinedKeyRight(Object? key);
+  }
+
+  public final class KeyInfo {
+    ctor public KeyInfo(Object key, int location, int nodes, int index);
+    method public int getIndex();
+    method public Object getKey();
+    method public int getLocation();
+    method public int getNodes();
+  }
+
+  public final class KeyKt {
+    method @androidx.compose.Composable public static inline <T, V1> T! key(@androidx.compose.Pivotal V1? v1, kotlin.jvm.functions.Function0<? extends T> block);
+    method @androidx.compose.Composable public static inline <T, V1, V2> T! key(@androidx.compose.Pivotal V1? v1, @androidx.compose.Pivotal V2? v2, kotlin.jvm.functions.Function0<? extends T> block);
+    method @androidx.compose.Composable public static inline <T> T! key(@androidx.compose.Pivotal Object![]? inputs, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class KeySourceInfoKt {
+    method public static String? keySourceInfoOf(Object key);
+  }
+
+  @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Model {
+  }
+
+  @androidx.compose.Stable public interface MutableState<T> extends androidx.compose.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;
+  }
+
+  public final class MutableStateKt {
+    method public static kotlin.jvm.functions.Function2<java.lang.Object,java.lang.Object,java.lang.Boolean> getNeverEqual();
+    method public static kotlin.jvm.functions.Function2<java.lang.Object,java.lang.Object,java.lang.Boolean> getReferentiallyEqual();
+    method public static kotlin.jvm.functions.Function2<java.lang.Object,java.lang.Object,java.lang.Boolean> getStructurallyEqual();
+    method public static inline operator <T> T! getValue(androidx.compose.State<T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+    method public static <T> androidx.compose.MutableState<T> mutableStateOf(T? value, kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual);
+    method public static inline operator <T> void setValue(androidx.compose.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+    method @androidx.compose.Composable public static inline <T> androidx.compose.MutableState<T> state(kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.Composable public static inline <T, V1> androidx.compose.MutableState<T> stateFor(V1? v1, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.Composable public static inline <T, reified V1, reified V2> androidx.compose.MutableState<T> stateFor(V1? v1, V2? v2, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.Composable public static inline <T> androidx.compose.MutableState<T> stateFor(Object![]? inputs, kotlin.jvm.functions.Function0<? extends T> init);
+  }
+
+  public final class NullCompilationScope {
+    method public kotlin.Unit getComposer();
+    property public final kotlin.Unit composer;
+    field public static final androidx.compose.NullCompilationScope! INSTANCE;
+  }
+
+  public final class ObserveKt {
+    method @androidx.compose.Composable public static void Observe(kotlin.jvm.functions.Function0<kotlin.Unit> body);
+  }
+
+  public final class ObserverMap<K, V> {
+    ctor public ObserverMap();
+    method public void add(K key, V value);
+    method public void clear();
+    method public void clearValues(kotlin.jvm.functions.Function1<? super V,java.lang.Boolean> predicate);
+    method public boolean contains(K key, V value);
+    method public operator java.util.List<V> get(Iterable<? extends K> keys);
+    method public java.util.List<V> getValueOf(K key);
+    method public void remove(K key);
+    method public void remove(K key, V value);
+    method public void removeValue(V value);
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Target(allowedTargets={AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION}) public @interface Pivotal {
+  }
+
+  @androidx.compose.Immutable public abstract class ProvidableAmbient<T> extends androidx.compose.Ambient<T> {
+    method public final infix androidx.compose.ProvidedValue<T> provides(T? value);
+  }
+
+  public final class ProvidedValue<T> {
+    method public androidx.compose.Ambient<T> getAmbient();
+    method public T! getValue();
+  }
+
+  public final class RecomposeKt {
+    method @androidx.compose.Composable public static void Recompose(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> body);
+  }
+
+  public abstract class Recomposer {
+    ctor public Recomposer();
+    method protected final void dispatchRecomposes();
+    method public abstract boolean hasPendingChanges();
+    method public abstract void recomposeSync();
+    method protected abstract void scheduleChangesDispatch();
+    field public static final androidx.compose.Recomposer.Companion! Companion;
+  }
+
+  public static final class Recomposer.Companion {
+    method public androidx.compose.Recomposer current();
+    method @Deprecated public boolean hasPendingChanges();
+  }
+
+  public final class RememberKt {
+    method @androidx.compose.Composable public static inline <T> T! remember(kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <T, V1> T! remember(V1? v1, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <T, V1, V2> T! remember(V1? v1, V2? v2, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <T, V1, V2, V3> T! remember(V1? v1, V2? v2, V3? v3, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <V> V! remember(Object![]? inputs, kotlin.jvm.functions.Function0<? extends V> block);
+  }
+
+  public interface ScopeUpdateScope {
+    method public void updateScope(kotlin.jvm.functions.Function1<? super androidx.compose.Composer<?>,kotlin.Unit> block);
+  }
+
+  public final class SlotReader {
+    ctor public SlotReader(androidx.compose.SlotTable table);
+    method public void beginEmpty();
+    method public void close();
+    method public void endEmpty();
+    method public void endGroup();
+    method public void endNode();
+    method public java.util.List<androidx.compose.KeyInfo> extractKeys();
+    method public Object? get(androidx.compose.Anchor anchor);
+    method public Object? get(int index);
+    method public int getCurrent();
+    method public int getCurrentEnd();
+    method public int getGroupEnd();
+    method public Object! getGroupKey();
+    method public int getGroupSize();
+    method public boolean getInEmpty();
+    method public int getNodeIndex();
+    method public int getParentLocation();
+    method public int getParentNodes();
+    method public int getParentSlots();
+    method public androidx.compose.SlotTable getTable();
+    method public int groupEnd(int index);
+    method public Object groupKey(int index);
+    method public int groupSize(int index);
+    method public boolean isGroup();
+    method public boolean isGroup(int index);
+    method public boolean isGroupEnd();
+    method public boolean isNode();
+    method public boolean isNode(int location);
+    method public Object? next();
+    method public void reposition(int value);
+    method public int skipGroup();
+    method public int skipNode();
+    method public void skipToGroupEnd();
+    method public void startGroup(Object key);
+    method public void startNode(Object key);
+    property public final int current;
+    property public final int currentEnd;
+    property public final int groupEnd;
+    property public final Object! groupKey;
+    property public final int groupSize;
+    property public final boolean inEmpty;
+    property public final boolean isGroup;
+    property public final boolean isGroupEnd;
+    property public final boolean isNode;
+    property public final int nodeIndex;
+    property public final int parentLocation;
+    property public final int parentNodes;
+    property public final int parentSlots;
+  }
+
+  public final class SlotTable {
+    ctor public SlotTable(internal Object![] slots);
+    ctor public SlotTable();
+    method public int getSize();
+    method public java.util.List<java.lang.Integer> groupPathTo(int location);
+    method public androidx.compose.SlotReader openReader();
+    method public androidx.compose.SlotWriter openWriter();
+    method public <T> T! read(kotlin.jvm.functions.Function1<? super androidx.compose.SlotReader,? extends T> block);
+    method public void verifyWellFormed();
+    method public <T> T! write(kotlin.jvm.functions.Function1<? super androidx.compose.SlotWriter,? extends T> block);
+    property public final int size;
+    field public static final androidx.compose.SlotTable.Companion! Companion;
+  }
+
+  public static final class SlotTable.Companion {
+    method public Object getEMPTY();
+    property public final Object EMPTY;
+  }
+
+  public final class SlotTableKt {
+  }
+
+  public final class SlotWriter {
+    method public androidx.compose.Anchor anchor(int index = current);
+    method public void beginInsert();
+    method public void close();
+    method public int endGroup();
+    method public void endInsert();
+    method public int endNode();
+    method public void ensureStarted(int location);
+    method public void ensureStarted(androidx.compose.Anchor anchor);
+    method public Object? get(androidx.compose.Anchor anchor);
+    method public Object? get(int index);
+    method public boolean getClosed();
+    method public int getCurrent();
+    method public int getGroupSize();
+    method public int getNodeIndex();
+    method public int getParentLocation();
+    method public int getParentNodes();
+    method public androidx.compose.SlotTable getTable();
+    method public int groupSize(int index);
+    method public java.util.Iterator<java.lang.Object> groupSlots();
+    method public boolean isGroup();
+    method public boolean isGroup(int index);
+    method public boolean isNode();
+    method public java.util.List<androidx.compose.Anchor> moveFrom(androidx.compose.SlotTable table, int location);
+    method public void moveGroup(int offset);
+    method public int parentIndex(androidx.compose.Anchor anchor);
+    method public boolean removeGroup();
+    method public void set(Object? value);
+    method public void setCurrent(int p);
+    method public Object? skip();
+    method public void skip(int amount);
+    method public int skipGroup();
+    method public int skipNode();
+    method public void skipToGroupEnd();
+    method public void startGroup(Object key);
+    method public void startNode(Object key);
+    method public Object? update(Object? value);
+    property public final boolean closed;
+    property public final int current;
+    property public final int groupSize;
+    property public final boolean isGroup;
+    property public final boolean isNode;
+    property public final int nodeIndex;
+    property public final int parentLocation;
+    property public final int parentNodes;
+  }
+
+  @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Stable {
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS}) public @interface StableMarker {
+  }
+
+  @androidx.compose.Stable public interface State<T> {
+    method public T! getValue();
+    property public abstract T! value;
+  }
+
+  public final class TraceKt {
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER}) public @interface UnionType {
+    method public abstract Class<?>[] types();
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.FUNCTION) public @interface Untracked {
+  }
+
+}
+
+package androidx.compose.frames {
+
+  public abstract class AbstractRecord implements androidx.compose.frames.Record {
+    ctor public AbstractRecord();
+    method public int getFrameId();
+    method public androidx.compose.frames.Record? getNext();
+    method public void setFrameId(int p);
+    method public void setNext(androidx.compose.frames.Record? p);
+    property public int frameId;
+    property public androidx.compose.frames.Record? next;
+  }
+
+  public final class Frame {
+    method public int getId();
+    method public boolean getReadonly();
+    method public boolean hasPendingChanges();
+    property public final boolean readonly;
+  }
+
+  public final class FrameAborted extends java.lang.RuntimeException {
+    ctor public FrameAborted(androidx.compose.frames.Frame frame);
+    method public androidx.compose.frames.Frame getFrame();
+  }
+
+  public final class FrameContainersKt {
+    method public static <T> androidx.compose.frames.ModelList<T> modelListOf();
+    method public static <T> androidx.compose.frames.ModelList<T> modelListOf(T? element);
+    method public static <T> androidx.compose.frames.ModelList<T> modelListOf(T?... elements);
+    method public static <K, V> androidx.compose.frames.ModelMap<K,V> modelMapOf();
+    method public static <K, V> androidx.compose.frames.ModelMap<K,V> modelMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+  }
+
+  public final class FrameIdSetKt {
+  }
+
+  public interface Framed {
+    method public androidx.compose.frames.Record getFirstFrameRecord();
+    method public void prependFrameRecord(androidx.compose.frames.Record value);
+    property public abstract androidx.compose.frames.Record firstFrameRecord;
+  }
+
+  public final class FramesKt {
+    method public static kotlin.Unit? _created(androidx.compose.frames.Framed framed);
+    method public static androidx.compose.frames.Record _readable(androidx.compose.frames.Record r, androidx.compose.frames.Framed framed);
+    method public static androidx.compose.frames.Record _writable(androidx.compose.frames.Record r, androidx.compose.frames.Framed framed);
+    method public static void abort();
+    method public static void abort(androidx.compose.frames.Frame frame);
+    method public static void abortHandler();
+    method public static void abortHandler(androidx.compose.frames.Frame frame);
+    method public static void commit();
+    method public static void commit(androidx.compose.frames.Frame frame);
+    method public static kotlin.Unit? commitHandler();
+    method public static androidx.compose.frames.Frame currentFrame();
+    method public static boolean getInFrame();
+    method public static void observeAllReads(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit> readObserver, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public static androidx.compose.frames.Frame open(boolean readOnly = false);
+    method public static androidx.compose.frames.Frame open(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver = null, kotlin.jvm.functions.Function2<java.lang.Object,? super java.lang.Boolean,kotlin.Unit>? writeObserver = null);
+    method public static <T extends androidx.compose.frames.Record> T readable(T, androidx.compose.frames.Framed framed);
+    method public static kotlin.jvm.functions.Function0<kotlin.Unit> registerCommitObserver(kotlin.jvm.functions.Function2<? super java.util.Set<?>,? super androidx.compose.frames.Frame,kotlin.Unit> observer);
+    method public static void restore(androidx.compose.frames.Frame frame);
+    method public static androidx.compose.frames.Frame suspend();
+    method public static boolean wasModified(Object value);
+    method public static inline <T extends androidx.compose.frames.Record> void withCurrent(T, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public static <T extends androidx.compose.frames.Record> T writable(T, androidx.compose.frames.Framed framed);
+    method public static <T extends androidx.compose.frames.Record> T writable(T, androidx.compose.frames.Framed framed, androidx.compose.frames.Frame frame);
+  }
+
+  public final class ModelList<T> implements androidx.compose.frames.Framed kotlin.jvm.internal.markers.KMutableList java.util.List<T> {
+    ctor public ModelList();
+    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.frames.Record getFirstFrameRecord();
+    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 prependFrameRecord(androidx.compose.frames.Record value);
+    method public boolean remove(Object? element);
+    method public boolean removeAll(java.util.Collection<?> elements);
+    method public T! removeAt(int index);
+    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.frames.Record firstFrameRecord;
+    property public int size;
+  }
+
+  public final class ModelMap<K, V> implements androidx.compose.frames.Framed kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> {
+    ctor public ModelMap();
+    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.frames.Record getFirstFrameRecord();
+    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 prependFrameRecord(androidx.compose.frames.Record 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.frames.Record firstFrameRecord;
+    property public java.util.Set<K> keys;
+    property public int size;
+    property public java.util.Collection<V> values;
+  }
+
+  public interface Record {
+    method public void assign(androidx.compose.frames.Record value);
+    method public androidx.compose.frames.Record create();
+    method public int getFrameId();
+    method public androidx.compose.frames.Record? getNext();
+    method public void setFrameId(int p);
+    method public void setNext(androidx.compose.frames.Record? p);
+    property public abstract int frameId;
+    property public abstract androidx.compose.frames.Record? next;
+  }
+
+}
+
+package androidx.compose.internal {
+
+  @androidx.compose.Stable public final class RestartableFunction<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, R> implements kotlin.jvm.functions.Function0<R> kotlin.jvm.functions.Function1<androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function10<P1,P2,P3,P4,P5,P6,P7,P8,P9,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function11<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function12<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function13<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function14<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function15<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function16<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function17<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function18<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function19<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function2<P1,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function20<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,P19,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function21<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,P19,P20,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function22<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,P19,P20,P21,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function3<P1,P2,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function4<P1,P2,P3,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function5<P1,P2,P3,P4,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function6<P1,P2,P3,P4,P5,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function7<P1,P2,P3,P4,P5,P6,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function8<P1,P2,P3,P4,P5,P6,P7,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function9<P1,P2,P3,P4,P5,P6,P7,P8,androidx.compose.Composer<?>,R> {
+    ctor public RestartableFunction(int key, boolean tracked);
+    method public int getKey();
+    method public R! invoke();
+    method public R! invoke(androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, P19? p19, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, P19? p19, P20? p20, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, P19? p19, P20? p20, P21? p21, androidx.compose.Composer<?> c);
+    method public void update(Object block);
+  }
+
+  public final class RestartableFunctionKt {
+    method public static androidx.compose.internal.RestartableFunction<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,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object> restartableFunction(androidx.compose.Composer<?> composer, int key, boolean tracked, Object block);
+    method public static androidx.compose.internal.RestartableFunction<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,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object> restartableFunctionInstance(int key, boolean tracked, Object block);
+  }
+
+  @androidx.compose.Stable public final class RestartableFunctionN<R> implements kotlin.jvm.functions.FunctionN<R> {
+    ctor public RestartableFunctionN(int key, boolean tracked, int arity);
+    method public int getArity();
+    method public int getKey();
+    method public R! invoke(java.lang.Object?... args);
+    method public void update(Object block);
+  }
+
+  public final class RestartableFunctionNKt {
+    method public static androidx.compose.internal.RestartableFunctionN<?> restartableFunctionN(androidx.compose.Composer<?> composer, int key, boolean tracked, int arity, Object block);
+    method public static androidx.compose.internal.RestartableFunctionN<?> restartableFunctionNInstance(int key, boolean tracked, int arity, Object block);
+  }
+
+}
+
diff --git a/compose/compose-runtime/api/current.txt b/compose/compose-runtime/api/current.txt
index 7e5d3c2..46f8053 100644
--- a/compose/compose-runtime/api/current.txt
+++ b/compose/compose-runtime/api/current.txt
@@ -103,6 +103,7 @@
     method public final Object? nextSlot();
     method public final boolean recompose();
     method public final void skipCurrentGroup();
+    method public final void skipToGroupEnd();
     method public final void startExpr(Object key);
     method public final void startGroup(Object key);
     method public final void startMovableGroup(Object key);
@@ -325,6 +326,7 @@
     method public int getNodeIndex();
     method public int getParentLocation();
     method public int getParentNodes();
+    method public int getParentSlots();
     method public androidx.compose.SlotTable getTable();
     method public int groupEnd(int index);
     method public Object groupKey(int index);
@@ -353,6 +355,7 @@
     property public final int nodeIndex;
     property public final int parentLocation;
     property public final int parentNodes;
+    property public final int parentSlots;
   }
 
   public final class SlotTable {
diff --git a/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev10.txt b/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev10.txt
index 7e5d3c2..46f8053 100644
--- a/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev10.txt
@@ -103,6 +103,7 @@
     method public final Object? nextSlot();
     method public final boolean recompose();
     method public final void skipCurrentGroup();
+    method public final void skipToGroupEnd();
     method public final void startExpr(Object key);
     method public final void startGroup(Object key);
     method public final void startMovableGroup(Object key);
@@ -325,6 +326,7 @@
     method public int getNodeIndex();
     method public int getParentLocation();
     method public int getParentNodes();
+    method public int getParentSlots();
     method public androidx.compose.SlotTable getTable();
     method public int groupEnd(int index);
     method public Object groupKey(int index);
@@ -353,6 +355,7 @@
     property public final int nodeIndex;
     property public final int parentLocation;
     property public final int parentNodes;
+    property public final int parentSlots;
   }
 
   public final class SlotTable {
diff --git a/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev11.txt b/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..46f8053
--- /dev/null
+++ b/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,635 @@
+// Signature format: 3.0
+package androidx.compose {
+
+  public final class ActualAndroidKt {
+  }
+
+  public final class ActualJvmKt {
+  }
+
+  @androidx.compose.Immutable public abstract sealed class Ambient<T> {
+    method public final inline T! getCurrent();
+    property public final inline T! current;
+  }
+
+  public final class AmbientKt {
+    method @androidx.compose.Composable public static void Providers(androidx.compose.ProvidedValue<?>![] values, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static <T> androidx.compose.ProvidableAmbient<T> ambientOf(kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual, kotlin.jvm.functions.Function0<? extends T>? defaultFactory = null);
+    method public static <T> androidx.compose.ProvidableAmbient<T> staticAmbientOf(kotlin.jvm.functions.Function0<? extends T>? defaultFactory = null);
+  }
+
+  public final class Anchor {
+    ctor public Anchor(internal int loc);
+    method public boolean getValid();
+    method public int location(androidx.compose.SlotTable slots);
+    property public final boolean valid;
+  }
+
+  public final class Applier<N> {
+    ctor public Applier(N! root, androidx.compose.ApplyAdapter<N> adapter);
+    method public void down(N? node);
+    method public N! getCurrent();
+    method public void insert(int index, N? instance);
+    method public void move(int from, int to, int count);
+    method public void remove(int index, int count);
+    method public void reset();
+    method public void up();
+    property public final N! current;
+  }
+
+  public interface ApplyAdapter<N> {
+    method public void end(N?, N? instance, N? parent);
+    method public void insertAt(N?, int index, N? instance);
+    method public void move(N?, int from, int to, int count);
+    method public void removeAt(N?, int index, int count);
+    method public void start(N?, N? instance);
+  }
+
+  public final class BuildableMap<K, V> implements kotlin.jvm.internal.markers.KMappedMarker java.util.Map<K,V> {
+    ctor public BuildableMap(kotlinx.collections.immutable.PersistentMap<K,? extends V> map);
+    method public kotlinx.collections.immutable.PersistentMap<K,V> component1();
+    method public boolean containsKey(Object! key);
+    method public boolean containsValue(Object! value);
+    method public androidx.compose.BuildableMap<K,V> copy(kotlinx.collections.immutable.PersistentMap<K,? extends V> map);
+    method public V? get(Object! key);
+    method public java.util.Set<java.util.Map.Entry<K,V>> getEntries();
+    method public java.util.Set<K> getKeys();
+    method public kotlinx.collections.immutable.PersistentMap<K,V> getMap();
+    method public int getSize();
+    method public java.util.Collection<V> getValues();
+    method public boolean isEmpty();
+  }
+
+  public interface CommitScope {
+    method public void onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> callback);
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER, AnnotationTarget.PROPERTY}) public @interface Composable {
+  }
+
+  public final class ComposeKt {
+    method public static kotlin.jvm.functions.Function0<kotlin.Unit> emptyContent();
+    method public static inline kotlin.jvm.functions.Function0<kotlin.Unit> orEmpty(kotlin.jvm.functions.Function0<kotlin.Unit>?);
+  }
+
+  public class Composer<N> implements androidx.compose.ComposerValidator {
+    ctor public Composer(androidx.compose.SlotTable slotTable, androidx.compose.Applier<N> applier, androidx.compose.Recomposer recomposer);
+    method public final void abortRoot();
+    method public final <V, T> void apply(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+    method public final void applyChanges();
+    method public final androidx.compose.CompositionReference buildReference();
+    method public final inline void call(Object key, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerValidator,java.lang.Boolean> invalid, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public <T> boolean changed(T? value);
+    method public boolean changed(int value);
+    method public final void collectKeySourceInformation();
+    method protected final void composeRoot(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public final <T extends N> void createNode(kotlin.jvm.functions.Function0<? extends T> factory);
+    method public final <T extends N> void emitNode(kotlin.jvm.functions.Function0<? extends T> factory);
+    method public final void emitNode(N? node);
+    method public final void endExpr();
+    method public final void endGroup();
+    method public final void endMovableGroup();
+    method public final void endNode();
+    method public final void endReplaceableGroup();
+    method public final androidx.compose.ScopeUpdateScope? endRestartGroup();
+    method public final void endRoot();
+    method public final int getChangeCount();
+    method public final int getCurrentCompoundKeyHash();
+    method public final boolean getInserting();
+    method public final androidx.compose.Recomposer getRecomposer();
+    method public final boolean getSkipping();
+    method public final androidx.compose.SlotTable getSlotTable();
+    method public final Object joinKey(Object? left, Object? right);
+    method public final Object? nextSlot();
+    method public final boolean recompose();
+    method public final void skipCurrentGroup();
+    method public final void skipToGroupEnd();
+    method public final void startExpr(Object key);
+    method public final void startGroup(Object key);
+    method public final void startMovableGroup(Object key);
+    method public final void startNode(Object key);
+    method public final void startReplaceableGroup(int key);
+    method public final void startRestartGroup(int key);
+    method public final void startRoot();
+    method public final void updateValue(Object? value);
+    method public final N! useNode();
+    property public final int changeCount;
+    property public final int currentCompoundKeyHash;
+    property public final boolean inserting;
+    property public final boolean skipping;
+  }
+
+  public final class ComposerKt {
+    method public static inline <N, T> T! cache(androidx.compose.Composer<N>, boolean valid = true, kotlin.jvm.functions.Function0<? extends T> block);
+    method public static inline <T> T! escapeCompose(kotlin.jvm.functions.Function1<? super androidx.compose.NullCompilationScope,? extends T> block);
+    method public static androidx.compose.Composer<?> getCurrentComposer();
+  }
+
+  public final class ComposerUpdater<N, T extends N> {
+    ctor public ComposerUpdater(androidx.compose.Composer<N> composer, T! node);
+    method public androidx.compose.Composer<N> getComposer();
+    method public T! getNode();
+    method public inline void set(int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public inline <reified V> void set(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+    method public inline void update(int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public inline <reified V> void update(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+  }
+
+  public interface ComposerValidator {
+    method public boolean changed(int value);
+    method public <T> boolean changed(T? value);
+  }
+
+  public interface Composition {
+    method public void dispose();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class CompositionKt {
+    method public static androidx.compose.Composition compositionFor(Object container, androidx.compose.Recomposer recomposer, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function2<? super androidx.compose.SlotTable,? super androidx.compose.Recomposer,? extends androidx.compose.Composer<?>> composerFactory);
+    method @Deprecated public static androidx.compose.Composition compositionFor(Object container, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function2<? super androidx.compose.SlotTable,? super androidx.compose.Recomposer,? extends androidx.compose.Composer<?>> composerFactory);
+  }
+
+  public interface CompositionLifecycleObserver {
+    method public void onEnter();
+    method public void onLeave();
+  }
+
+  public interface CompositionReference {
+    method public <T> T! getAmbient(androidx.compose.Ambient<T> key);
+    method public androidx.compose.BuildableMap<androidx.compose.Ambient<java.lang.Object>,androidx.compose.State<java.lang.Object>> getAmbientScope();
+    method public void invalidate();
+    method public <N> void registerComposer(androidx.compose.Composer<N> composer);
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.FUNCTION) public @interface Direct {
+  }
+
+  public final class EffectsKt {
+    method @androidx.compose.Composable public static androidx.compose.CompositionReference compositionReference();
+    method public static kotlin.jvm.functions.Function0<kotlin.Unit> getInvalidate();
+    method @androidx.compose.Composable public static void onActive(kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static inline void onCommit(kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1> void onCommit(V1? v1, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1, V2> void onCommit(V1? v1, V2? v2, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static void onCommit(Object![]? inputs, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static void onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> callback);
+    method @androidx.compose.Composable public static inline void onPreCommit(kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1> void onPreCommit(V1? v1, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1, V2> void onPreCommit(V1? v1, V2? v2, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static void onPreCommit(Object![]? inputs, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+  }
+
+  public final class ExpectKt {
+  }
+
+  public final class FrameManager {
+    method public void ensureStarted();
+    method public <T> T! framed(kotlin.jvm.functions.Function0<? extends T> block);
+    method public <T> T! isolated(kotlin.jvm.functions.Function0<? extends T> block);
+    method public void nextFrame();
+    method public <T> T! unframed(kotlin.jvm.functions.Function0<? extends T> block);
+    field public static final androidx.compose.FrameManager! INSTANCE;
+  }
+
+  @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Immutable {
+  }
+
+  public final class JoinedKeyKt {
+    method public static boolean isJoinedKey(Object? key);
+    method public static Object? joinedKeyLeft(Object? key);
+    method public static Object? joinedKeyRight(Object? key);
+  }
+
+  public final class KeyInfo {
+    ctor public KeyInfo(Object key, int location, int nodes, int index);
+    method public int getIndex();
+    method public Object getKey();
+    method public int getLocation();
+    method public int getNodes();
+  }
+
+  public final class KeyKt {
+    method @androidx.compose.Composable public static inline <T, V1> T! key(@androidx.compose.Pivotal V1? v1, kotlin.jvm.functions.Function0<? extends T> block);
+    method @androidx.compose.Composable public static inline <T, V1, V2> T! key(@androidx.compose.Pivotal V1? v1, @androidx.compose.Pivotal V2? v2, kotlin.jvm.functions.Function0<? extends T> block);
+    method @androidx.compose.Composable public static inline <T> T! key(@androidx.compose.Pivotal Object![]? inputs, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class KeySourceInfoKt {
+    method public static String? keySourceInfoOf(Object key);
+  }
+
+  @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Model {
+  }
+
+  @androidx.compose.Stable public interface MutableState<T> extends androidx.compose.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;
+  }
+
+  public final class MutableStateKt {
+    method public static kotlin.jvm.functions.Function2<java.lang.Object,java.lang.Object,java.lang.Boolean> getNeverEqual();
+    method public static kotlin.jvm.functions.Function2<java.lang.Object,java.lang.Object,java.lang.Boolean> getReferentiallyEqual();
+    method public static kotlin.jvm.functions.Function2<java.lang.Object,java.lang.Object,java.lang.Boolean> getStructurallyEqual();
+    method public static inline operator <T> T! getValue(androidx.compose.State<T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+    method public static <T> androidx.compose.MutableState<T> mutableStateOf(T? value, kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual);
+    method public static inline operator <T> void setValue(androidx.compose.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+    method @androidx.compose.Composable public static inline <T> androidx.compose.MutableState<T> state(kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.Composable public static inline <T, V1> androidx.compose.MutableState<T> stateFor(V1? v1, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.Composable public static inline <T, reified V1, reified V2> androidx.compose.MutableState<T> stateFor(V1? v1, V2? v2, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.Composable public static inline <T> androidx.compose.MutableState<T> stateFor(Object![]? inputs, kotlin.jvm.functions.Function0<? extends T> init);
+  }
+
+  public final class NullCompilationScope {
+    method public kotlin.Unit getComposer();
+    property public final kotlin.Unit composer;
+    field public static final androidx.compose.NullCompilationScope! INSTANCE;
+  }
+
+  public final class ObserveKt {
+    method @androidx.compose.Composable public static void Observe(kotlin.jvm.functions.Function0<kotlin.Unit> body);
+  }
+
+  public final class ObserverMap<K, V> {
+    ctor public ObserverMap();
+    method public void add(K key, V value);
+    method public void clear();
+    method public void clearValues(kotlin.jvm.functions.Function1<? super V,java.lang.Boolean> predicate);
+    method public boolean contains(K key, V value);
+    method public operator java.util.List<V> get(Iterable<? extends K> keys);
+    method public java.util.List<V> getValueOf(K key);
+    method public void remove(K key);
+    method public void remove(K key, V value);
+    method public void removeValue(V value);
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Target(allowedTargets={AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION}) public @interface Pivotal {
+  }
+
+  @androidx.compose.Immutable public abstract class ProvidableAmbient<T> extends androidx.compose.Ambient<T> {
+    method public final infix androidx.compose.ProvidedValue<T> provides(T? value);
+  }
+
+  public final class ProvidedValue<T> {
+    method public androidx.compose.Ambient<T> getAmbient();
+    method public T! getValue();
+  }
+
+  public final class RecomposeKt {
+    method @androidx.compose.Composable public static void Recompose(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> body);
+  }
+
+  public abstract class Recomposer {
+    ctor public Recomposer();
+    method protected final void dispatchRecomposes();
+    method public abstract boolean hasPendingChanges();
+    method public abstract void recomposeSync();
+    method protected abstract void scheduleChangesDispatch();
+    field public static final androidx.compose.Recomposer.Companion! Companion;
+  }
+
+  public static final class Recomposer.Companion {
+    method public androidx.compose.Recomposer current();
+    method @Deprecated public boolean hasPendingChanges();
+  }
+
+  public final class RememberKt {
+    method @androidx.compose.Composable public static inline <T> T! remember(kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <T, V1> T! remember(V1? v1, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <T, V1, V2> T! remember(V1? v1, V2? v2, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <T, V1, V2, V3> T! remember(V1? v1, V2? v2, V3? v3, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <V> V! remember(Object![]? inputs, kotlin.jvm.functions.Function0<? extends V> block);
+  }
+
+  public interface ScopeUpdateScope {
+    method public void updateScope(kotlin.jvm.functions.Function1<? super androidx.compose.Composer<?>,kotlin.Unit> block);
+  }
+
+  public final class SlotReader {
+    ctor public SlotReader(androidx.compose.SlotTable table);
+    method public void beginEmpty();
+    method public void close();
+    method public void endEmpty();
+    method public void endGroup();
+    method public void endNode();
+    method public java.util.List<androidx.compose.KeyInfo> extractKeys();
+    method public Object? get(androidx.compose.Anchor anchor);
+    method public Object? get(int index);
+    method public int getCurrent();
+    method public int getCurrentEnd();
+    method public int getGroupEnd();
+    method public Object! getGroupKey();
+    method public int getGroupSize();
+    method public boolean getInEmpty();
+    method public int getNodeIndex();
+    method public int getParentLocation();
+    method public int getParentNodes();
+    method public int getParentSlots();
+    method public androidx.compose.SlotTable getTable();
+    method public int groupEnd(int index);
+    method public Object groupKey(int index);
+    method public int groupSize(int index);
+    method public boolean isGroup();
+    method public boolean isGroup(int index);
+    method public boolean isGroupEnd();
+    method public boolean isNode();
+    method public boolean isNode(int location);
+    method public Object? next();
+    method public void reposition(int value);
+    method public int skipGroup();
+    method public int skipNode();
+    method public void skipToGroupEnd();
+    method public void startGroup(Object key);
+    method public void startNode(Object key);
+    property public final int current;
+    property public final int currentEnd;
+    property public final int groupEnd;
+    property public final Object! groupKey;
+    property public final int groupSize;
+    property public final boolean inEmpty;
+    property public final boolean isGroup;
+    property public final boolean isGroupEnd;
+    property public final boolean isNode;
+    property public final int nodeIndex;
+    property public final int parentLocation;
+    property public final int parentNodes;
+    property public final int parentSlots;
+  }
+
+  public final class SlotTable {
+    ctor public SlotTable(internal Object![] slots);
+    ctor public SlotTable();
+    method public int getSize();
+    method public java.util.List<java.lang.Integer> groupPathTo(int location);
+    method public androidx.compose.SlotReader openReader();
+    method public androidx.compose.SlotWriter openWriter();
+    method public <T> T! read(kotlin.jvm.functions.Function1<? super androidx.compose.SlotReader,? extends T> block);
+    method public void verifyWellFormed();
+    method public <T> T! write(kotlin.jvm.functions.Function1<? super androidx.compose.SlotWriter,? extends T> block);
+    property public final int size;
+    field public static final androidx.compose.SlotTable.Companion! Companion;
+  }
+
+  public static final class SlotTable.Companion {
+    method public Object getEMPTY();
+    property public final Object EMPTY;
+  }
+
+  public final class SlotTableKt {
+  }
+
+  public final class SlotWriter {
+    method public androidx.compose.Anchor anchor(int index = current);
+    method public void beginInsert();
+    method public void close();
+    method public int endGroup();
+    method public void endInsert();
+    method public int endNode();
+    method public void ensureStarted(int location);
+    method public void ensureStarted(androidx.compose.Anchor anchor);
+    method public Object? get(androidx.compose.Anchor anchor);
+    method public Object? get(int index);
+    method public boolean getClosed();
+    method public int getCurrent();
+    method public int getGroupSize();
+    method public int getNodeIndex();
+    method public int getParentLocation();
+    method public int getParentNodes();
+    method public androidx.compose.SlotTable getTable();
+    method public int groupSize(int index);
+    method public java.util.Iterator<java.lang.Object> groupSlots();
+    method public boolean isGroup();
+    method public boolean isGroup(int index);
+    method public boolean isNode();
+    method public java.util.List<androidx.compose.Anchor> moveFrom(androidx.compose.SlotTable table, int location);
+    method public void moveGroup(int offset);
+    method public int parentIndex(androidx.compose.Anchor anchor);
+    method public boolean removeGroup();
+    method public void set(Object? value);
+    method public void setCurrent(int p);
+    method public Object? skip();
+    method public void skip(int amount);
+    method public int skipGroup();
+    method public int skipNode();
+    method public void skipToGroupEnd();
+    method public void startGroup(Object key);
+    method public void startNode(Object key);
+    method public Object? update(Object? value);
+    property public final boolean closed;
+    property public final int current;
+    property public final int groupSize;
+    property public final boolean isGroup;
+    property public final boolean isNode;
+    property public final int nodeIndex;
+    property public final int parentLocation;
+    property public final int parentNodes;
+  }
+
+  @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Stable {
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS}) public @interface StableMarker {
+  }
+
+  @androidx.compose.Stable public interface State<T> {
+    method public T! getValue();
+    property public abstract T! value;
+  }
+
+  public final class TraceKt {
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER}) public @interface UnionType {
+    method public abstract Class<?>[] types();
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.FUNCTION) public @interface Untracked {
+  }
+
+}
+
+package androidx.compose.frames {
+
+  public abstract class AbstractRecord implements androidx.compose.frames.Record {
+    ctor public AbstractRecord();
+    method public int getFrameId();
+    method public androidx.compose.frames.Record? getNext();
+    method public void setFrameId(int p);
+    method public void setNext(androidx.compose.frames.Record? p);
+    property public int frameId;
+    property public androidx.compose.frames.Record? next;
+  }
+
+  public final class Frame {
+    method public int getId();
+    method public boolean getReadonly();
+    method public boolean hasPendingChanges();
+    property public final boolean readonly;
+  }
+
+  public final class FrameAborted extends java.lang.RuntimeException {
+    ctor public FrameAborted(androidx.compose.frames.Frame frame);
+    method public androidx.compose.frames.Frame getFrame();
+  }
+
+  public final class FrameContainersKt {
+    method public static <T> androidx.compose.frames.ModelList<T> modelListOf();
+    method public static <T> androidx.compose.frames.ModelList<T> modelListOf(T? element);
+    method public static <T> androidx.compose.frames.ModelList<T> modelListOf(T?... elements);
+    method public static <K, V> androidx.compose.frames.ModelMap<K,V> modelMapOf();
+    method public static <K, V> androidx.compose.frames.ModelMap<K,V> modelMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+  }
+
+  public final class FrameIdSetKt {
+  }
+
+  public interface Framed {
+    method public androidx.compose.frames.Record getFirstFrameRecord();
+    method public void prependFrameRecord(androidx.compose.frames.Record value);
+    property public abstract androidx.compose.frames.Record firstFrameRecord;
+  }
+
+  public final class FramesKt {
+    method public static kotlin.Unit? _created(androidx.compose.frames.Framed framed);
+    method public static androidx.compose.frames.Record _readable(androidx.compose.frames.Record r, androidx.compose.frames.Framed framed);
+    method public static androidx.compose.frames.Record _writable(androidx.compose.frames.Record r, androidx.compose.frames.Framed framed);
+    method public static void abort();
+    method public static void abort(androidx.compose.frames.Frame frame);
+    method public static void abortHandler();
+    method public static void abortHandler(androidx.compose.frames.Frame frame);
+    method public static void commit();
+    method public static void commit(androidx.compose.frames.Frame frame);
+    method public static kotlin.Unit? commitHandler();
+    method public static androidx.compose.frames.Frame currentFrame();
+    method public static boolean getInFrame();
+    method public static void observeAllReads(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit> readObserver, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public static androidx.compose.frames.Frame open(boolean readOnly = false);
+    method public static androidx.compose.frames.Frame open(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver = null, kotlin.jvm.functions.Function2<java.lang.Object,? super java.lang.Boolean,kotlin.Unit>? writeObserver = null);
+    method public static <T extends androidx.compose.frames.Record> T readable(T, androidx.compose.frames.Framed framed);
+    method public static kotlin.jvm.functions.Function0<kotlin.Unit> registerCommitObserver(kotlin.jvm.functions.Function2<? super java.util.Set<?>,? super androidx.compose.frames.Frame,kotlin.Unit> observer);
+    method public static void restore(androidx.compose.frames.Frame frame);
+    method public static androidx.compose.frames.Frame suspend();
+    method public static boolean wasModified(Object value);
+    method public static inline <T extends androidx.compose.frames.Record> void withCurrent(T, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public static <T extends androidx.compose.frames.Record> T writable(T, androidx.compose.frames.Framed framed);
+    method public static <T extends androidx.compose.frames.Record> T writable(T, androidx.compose.frames.Framed framed, androidx.compose.frames.Frame frame);
+  }
+
+  public final class ModelList<T> implements androidx.compose.frames.Framed kotlin.jvm.internal.markers.KMutableList java.util.List<T> {
+    ctor public ModelList();
+    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.frames.Record getFirstFrameRecord();
+    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 prependFrameRecord(androidx.compose.frames.Record value);
+    method public boolean remove(Object? element);
+    method public boolean removeAll(java.util.Collection<?> elements);
+    method public T! removeAt(int index);
+    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.frames.Record firstFrameRecord;
+    property public int size;
+  }
+
+  public final class ModelMap<K, V> implements androidx.compose.frames.Framed kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> {
+    ctor public ModelMap();
+    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.frames.Record getFirstFrameRecord();
+    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 prependFrameRecord(androidx.compose.frames.Record 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.frames.Record firstFrameRecord;
+    property public java.util.Set<K> keys;
+    property public int size;
+    property public java.util.Collection<V> values;
+  }
+
+  public interface Record {
+    method public void assign(androidx.compose.frames.Record value);
+    method public androidx.compose.frames.Record create();
+    method public int getFrameId();
+    method public androidx.compose.frames.Record? getNext();
+    method public void setFrameId(int p);
+    method public void setNext(androidx.compose.frames.Record? p);
+    property public abstract int frameId;
+    property public abstract androidx.compose.frames.Record? next;
+  }
+
+}
+
+package androidx.compose.internal {
+
+  @androidx.compose.Stable public final class RestartableFunction<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, R> implements kotlin.jvm.functions.Function0<R> kotlin.jvm.functions.Function1<androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function10<P1,P2,P3,P4,P5,P6,P7,P8,P9,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function11<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function12<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function13<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function14<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function15<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function16<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function17<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function18<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function19<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function2<P1,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function20<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,P19,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function21<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,P19,P20,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function22<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,P19,P20,P21,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function3<P1,P2,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function4<P1,P2,P3,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function5<P1,P2,P3,P4,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function6<P1,P2,P3,P4,P5,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function7<P1,P2,P3,P4,P5,P6,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function8<P1,P2,P3,P4,P5,P6,P7,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function9<P1,P2,P3,P4,P5,P6,P7,P8,androidx.compose.Composer<?>,R> {
+    ctor public RestartableFunction(int key, boolean tracked);
+    method public int getKey();
+    method public R! invoke();
+    method public R! invoke(androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, P19? p19, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, P19? p19, P20? p20, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, P19? p19, P20? p20, P21? p21, androidx.compose.Composer<?> c);
+    method public void update(Object block);
+  }
+
+  public final class RestartableFunctionKt {
+    method public static androidx.compose.internal.RestartableFunction<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,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object> restartableFunction(androidx.compose.Composer<?> composer, int key, boolean tracked, Object block);
+    method public static androidx.compose.internal.RestartableFunction<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,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object> restartableFunctionInstance(int key, boolean tracked, Object block);
+  }
+
+  @androidx.compose.Stable public final class RestartableFunctionN<R> implements kotlin.jvm.functions.FunctionN<R> {
+    ctor public RestartableFunctionN(int key, boolean tracked, int arity);
+    method public int getArity();
+    method public int getKey();
+    method public R! invoke(java.lang.Object?... args);
+    method public void update(Object block);
+  }
+
+  public final class RestartableFunctionNKt {
+    method public static androidx.compose.internal.RestartableFunctionN<?> restartableFunctionN(androidx.compose.Composer<?> composer, int key, boolean tracked, int arity, Object block);
+    method public static androidx.compose.internal.RestartableFunctionN<?> restartableFunctionNInstance(int key, boolean tracked, int arity, Object block);
+  }
+
+}
+
diff --git a/compose/compose-runtime/api/public_plus_experimental_current.txt b/compose/compose-runtime/api/public_plus_experimental_current.txt
index 7e5d3c2..46f8053 100644
--- a/compose/compose-runtime/api/public_plus_experimental_current.txt
+++ b/compose/compose-runtime/api/public_plus_experimental_current.txt
@@ -103,6 +103,7 @@
     method public final Object? nextSlot();
     method public final boolean recompose();
     method public final void skipCurrentGroup();
+    method public final void skipToGroupEnd();
     method public final void startExpr(Object key);
     method public final void startGroup(Object key);
     method public final void startMovableGroup(Object key);
@@ -325,6 +326,7 @@
     method public int getNodeIndex();
     method public int getParentLocation();
     method public int getParentNodes();
+    method public int getParentSlots();
     method public androidx.compose.SlotTable getTable();
     method public int groupEnd(int index);
     method public Object groupKey(int index);
@@ -353,6 +355,7 @@
     property public final int nodeIndex;
     property public final int parentLocation;
     property public final int parentNodes;
+    property public final int parentSlots;
   }
 
   public final class SlotTable {
diff --git a/compose/compose-runtime/api/res-0.1.0-dev11.txt b/compose/compose-runtime/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compose/compose-runtime/api/res-0.1.0-dev11.txt
diff --git a/compose/compose-runtime/api/restricted_0.1.0-dev10.txt b/compose/compose-runtime/api/restricted_0.1.0-dev10.txt
index 7e5d3c2..46f8053 100644
--- a/compose/compose-runtime/api/restricted_0.1.0-dev10.txt
+++ b/compose/compose-runtime/api/restricted_0.1.0-dev10.txt
@@ -103,6 +103,7 @@
     method public final Object? nextSlot();
     method public final boolean recompose();
     method public final void skipCurrentGroup();
+    method public final void skipToGroupEnd();
     method public final void startExpr(Object key);
     method public final void startGroup(Object key);
     method public final void startMovableGroup(Object key);
@@ -325,6 +326,7 @@
     method public int getNodeIndex();
     method public int getParentLocation();
     method public int getParentNodes();
+    method public int getParentSlots();
     method public androidx.compose.SlotTable getTable();
     method public int groupEnd(int index);
     method public Object groupKey(int index);
@@ -353,6 +355,7 @@
     property public final int nodeIndex;
     property public final int parentLocation;
     property public final int parentNodes;
+    property public final int parentSlots;
   }
 
   public final class SlotTable {
diff --git a/compose/compose-runtime/api/restricted_0.1.0-dev11.txt b/compose/compose-runtime/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..46f8053
--- /dev/null
+++ b/compose/compose-runtime/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,635 @@
+// Signature format: 3.0
+package androidx.compose {
+
+  public final class ActualAndroidKt {
+  }
+
+  public final class ActualJvmKt {
+  }
+
+  @androidx.compose.Immutable public abstract sealed class Ambient<T> {
+    method public final inline T! getCurrent();
+    property public final inline T! current;
+  }
+
+  public final class AmbientKt {
+    method @androidx.compose.Composable public static void Providers(androidx.compose.ProvidedValue<?>![] values, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static <T> androidx.compose.ProvidableAmbient<T> ambientOf(kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual, kotlin.jvm.functions.Function0<? extends T>? defaultFactory = null);
+    method public static <T> androidx.compose.ProvidableAmbient<T> staticAmbientOf(kotlin.jvm.functions.Function0<? extends T>? defaultFactory = null);
+  }
+
+  public final class Anchor {
+    ctor public Anchor(internal int loc);
+    method public boolean getValid();
+    method public int location(androidx.compose.SlotTable slots);
+    property public final boolean valid;
+  }
+
+  public final class Applier<N> {
+    ctor public Applier(N! root, androidx.compose.ApplyAdapter<N> adapter);
+    method public void down(N? node);
+    method public N! getCurrent();
+    method public void insert(int index, N? instance);
+    method public void move(int from, int to, int count);
+    method public void remove(int index, int count);
+    method public void reset();
+    method public void up();
+    property public final N! current;
+  }
+
+  public interface ApplyAdapter<N> {
+    method public void end(N?, N? instance, N? parent);
+    method public void insertAt(N?, int index, N? instance);
+    method public void move(N?, int from, int to, int count);
+    method public void removeAt(N?, int index, int count);
+    method public void start(N?, N? instance);
+  }
+
+  public final class BuildableMap<K, V> implements kotlin.jvm.internal.markers.KMappedMarker java.util.Map<K,V> {
+    ctor public BuildableMap(kotlinx.collections.immutable.PersistentMap<K,? extends V> map);
+    method public kotlinx.collections.immutable.PersistentMap<K,V> component1();
+    method public boolean containsKey(Object! key);
+    method public boolean containsValue(Object! value);
+    method public androidx.compose.BuildableMap<K,V> copy(kotlinx.collections.immutable.PersistentMap<K,? extends V> map);
+    method public V? get(Object! key);
+    method public java.util.Set<java.util.Map.Entry<K,V>> getEntries();
+    method public java.util.Set<K> getKeys();
+    method public kotlinx.collections.immutable.PersistentMap<K,V> getMap();
+    method public int getSize();
+    method public java.util.Collection<V> getValues();
+    method public boolean isEmpty();
+  }
+
+  public interface CommitScope {
+    method public void onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> callback);
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER, AnnotationTarget.PROPERTY}) public @interface Composable {
+  }
+
+  public final class ComposeKt {
+    method public static kotlin.jvm.functions.Function0<kotlin.Unit> emptyContent();
+    method public static inline kotlin.jvm.functions.Function0<kotlin.Unit> orEmpty(kotlin.jvm.functions.Function0<kotlin.Unit>?);
+  }
+
+  public class Composer<N> implements androidx.compose.ComposerValidator {
+    ctor public Composer(androidx.compose.SlotTable slotTable, androidx.compose.Applier<N> applier, androidx.compose.Recomposer recomposer);
+    method public final void abortRoot();
+    method public final <V, T> void apply(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+    method public final void applyChanges();
+    method public final androidx.compose.CompositionReference buildReference();
+    method public final inline void call(Object key, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerValidator,java.lang.Boolean> invalid, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public <T> boolean changed(T? value);
+    method public boolean changed(int value);
+    method public final void collectKeySourceInformation();
+    method protected final void composeRoot(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public final <T extends N> void createNode(kotlin.jvm.functions.Function0<? extends T> factory);
+    method public final <T extends N> void emitNode(kotlin.jvm.functions.Function0<? extends T> factory);
+    method public final void emitNode(N? node);
+    method public final void endExpr();
+    method public final void endGroup();
+    method public final void endMovableGroup();
+    method public final void endNode();
+    method public final void endReplaceableGroup();
+    method public final androidx.compose.ScopeUpdateScope? endRestartGroup();
+    method public final void endRoot();
+    method public final int getChangeCount();
+    method public final int getCurrentCompoundKeyHash();
+    method public final boolean getInserting();
+    method public final androidx.compose.Recomposer getRecomposer();
+    method public final boolean getSkipping();
+    method public final androidx.compose.SlotTable getSlotTable();
+    method public final Object joinKey(Object? left, Object? right);
+    method public final Object? nextSlot();
+    method public final boolean recompose();
+    method public final void skipCurrentGroup();
+    method public final void skipToGroupEnd();
+    method public final void startExpr(Object key);
+    method public final void startGroup(Object key);
+    method public final void startMovableGroup(Object key);
+    method public final void startNode(Object key);
+    method public final void startReplaceableGroup(int key);
+    method public final void startRestartGroup(int key);
+    method public final void startRoot();
+    method public final void updateValue(Object? value);
+    method public final N! useNode();
+    property public final int changeCount;
+    property public final int currentCompoundKeyHash;
+    property public final boolean inserting;
+    property public final boolean skipping;
+  }
+
+  public final class ComposerKt {
+    method public static inline <N, T> T! cache(androidx.compose.Composer<N>, boolean valid = true, kotlin.jvm.functions.Function0<? extends T> block);
+    method public static inline <T> T! escapeCompose(kotlin.jvm.functions.Function1<? super androidx.compose.NullCompilationScope,? extends T> block);
+    method public static androidx.compose.Composer<?> getCurrentComposer();
+  }
+
+  public final class ComposerUpdater<N, T extends N> {
+    ctor public ComposerUpdater(androidx.compose.Composer<N> composer, T! node);
+    method public androidx.compose.Composer<N> getComposer();
+    method public T! getNode();
+    method public inline void set(int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public inline <reified V> void set(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+    method public inline void update(int value, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit> block);
+    method public inline <reified V> void update(V? value, kotlin.jvm.functions.Function2<? super T,? super V,kotlin.Unit> block);
+  }
+
+  public interface ComposerValidator {
+    method public boolean changed(int value);
+    method public <T> boolean changed(T? value);
+  }
+
+  public interface Composition {
+    method public void dispose();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class CompositionKt {
+    method public static androidx.compose.Composition compositionFor(Object container, androidx.compose.Recomposer recomposer, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function2<? super androidx.compose.SlotTable,? super androidx.compose.Recomposer,? extends androidx.compose.Composer<?>> composerFactory);
+    method @Deprecated public static androidx.compose.Composition compositionFor(Object container, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function2<? super androidx.compose.SlotTable,? super androidx.compose.Recomposer,? extends androidx.compose.Composer<?>> composerFactory);
+  }
+
+  public interface CompositionLifecycleObserver {
+    method public void onEnter();
+    method public void onLeave();
+  }
+
+  public interface CompositionReference {
+    method public <T> T! getAmbient(androidx.compose.Ambient<T> key);
+    method public androidx.compose.BuildableMap<androidx.compose.Ambient<java.lang.Object>,androidx.compose.State<java.lang.Object>> getAmbientScope();
+    method public void invalidate();
+    method public <N> void registerComposer(androidx.compose.Composer<N> composer);
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.FUNCTION) public @interface Direct {
+  }
+
+  public final class EffectsKt {
+    method @androidx.compose.Composable public static androidx.compose.CompositionReference compositionReference();
+    method public static kotlin.jvm.functions.Function0<kotlin.Unit> getInvalidate();
+    method @androidx.compose.Composable public static void onActive(kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static inline void onCommit(kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1> void onCommit(V1? v1, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1, V2> void onCommit(V1? v1, V2? v2, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static void onCommit(Object![]? inputs, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static void onDispose(kotlin.jvm.functions.Function0<kotlin.Unit> callback);
+    method @androidx.compose.Composable public static inline void onPreCommit(kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1> void onPreCommit(V1? v1, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static <V1, V2> void onPreCommit(V1? v1, V2? v2, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+    method @androidx.compose.Composable public static void onPreCommit(Object![]? inputs, kotlin.jvm.functions.Function1<? super androidx.compose.CommitScope,kotlin.Unit> callback);
+  }
+
+  public final class ExpectKt {
+  }
+
+  public final class FrameManager {
+    method public void ensureStarted();
+    method public <T> T! framed(kotlin.jvm.functions.Function0<? extends T> block);
+    method public <T> T! isolated(kotlin.jvm.functions.Function0<? extends T> block);
+    method public void nextFrame();
+    method public <T> T! unframed(kotlin.jvm.functions.Function0<? extends T> block);
+    field public static final androidx.compose.FrameManager! INSTANCE;
+  }
+
+  @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Immutable {
+  }
+
+  public final class JoinedKeyKt {
+    method public static boolean isJoinedKey(Object? key);
+    method public static Object? joinedKeyLeft(Object? key);
+    method public static Object? joinedKeyRight(Object? key);
+  }
+
+  public final class KeyInfo {
+    ctor public KeyInfo(Object key, int location, int nodes, int index);
+    method public int getIndex();
+    method public Object getKey();
+    method public int getLocation();
+    method public int getNodes();
+  }
+
+  public final class KeyKt {
+    method @androidx.compose.Composable public static inline <T, V1> T! key(@androidx.compose.Pivotal V1? v1, kotlin.jvm.functions.Function0<? extends T> block);
+    method @androidx.compose.Composable public static inline <T, V1, V2> T! key(@androidx.compose.Pivotal V1? v1, @androidx.compose.Pivotal V2? v2, kotlin.jvm.functions.Function0<? extends T> block);
+    method @androidx.compose.Composable public static inline <T> T! key(@androidx.compose.Pivotal Object![]? inputs, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class KeySourceInfoKt {
+    method public static String? keySourceInfoOf(Object key);
+  }
+
+  @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Model {
+  }
+
+  @androidx.compose.Stable public interface MutableState<T> extends androidx.compose.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;
+  }
+
+  public final class MutableStateKt {
+    method public static kotlin.jvm.functions.Function2<java.lang.Object,java.lang.Object,java.lang.Boolean> getNeverEqual();
+    method public static kotlin.jvm.functions.Function2<java.lang.Object,java.lang.Object,java.lang.Boolean> getReferentiallyEqual();
+    method public static kotlin.jvm.functions.Function2<java.lang.Object,java.lang.Object,java.lang.Boolean> getStructurallyEqual();
+    method public static inline operator <T> T! getValue(androidx.compose.State<T>, Object? thisObj, kotlin.reflect.KProperty<?> property);
+    method public static <T> androidx.compose.MutableState<T> mutableStateOf(T? value, kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual);
+    method public static inline operator <T> void setValue(androidx.compose.MutableState<T>, Object? thisObj, kotlin.reflect.KProperty<?> property, T? value);
+    method @androidx.compose.Composable public static inline <T> androidx.compose.MutableState<T> state(kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.Composable public static inline <T, V1> androidx.compose.MutableState<T> stateFor(V1? v1, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.Composable public static inline <T, reified V1, reified V2> androidx.compose.MutableState<T> stateFor(V1? v1, V2? v2, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.compose.Composable public static inline <T> androidx.compose.MutableState<T> stateFor(Object![]? inputs, kotlin.jvm.functions.Function0<? extends T> init);
+  }
+
+  public final class NullCompilationScope {
+    method public kotlin.Unit getComposer();
+    property public final kotlin.Unit composer;
+    field public static final androidx.compose.NullCompilationScope! INSTANCE;
+  }
+
+  public final class ObserveKt {
+    method @androidx.compose.Composable public static void Observe(kotlin.jvm.functions.Function0<kotlin.Unit> body);
+  }
+
+  public final class ObserverMap<K, V> {
+    ctor public ObserverMap();
+    method public void add(K key, V value);
+    method public void clear();
+    method public void clearValues(kotlin.jvm.functions.Function1<? super V,java.lang.Boolean> predicate);
+    method public boolean contains(K key, V value);
+    method public operator java.util.List<V> get(Iterable<? extends K> keys);
+    method public java.util.List<V> getValueOf(K key);
+    method public void remove(K key);
+    method public void remove(K key, V value);
+    method public void removeValue(V value);
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Target(allowedTargets={AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION}) public @interface Pivotal {
+  }
+
+  @androidx.compose.Immutable public abstract class ProvidableAmbient<T> extends androidx.compose.Ambient<T> {
+    method public final infix androidx.compose.ProvidedValue<T> provides(T? value);
+  }
+
+  public final class ProvidedValue<T> {
+    method public androidx.compose.Ambient<T> getAmbient();
+    method public T! getValue();
+  }
+
+  public final class RecomposeKt {
+    method @androidx.compose.Composable public static void Recompose(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> body);
+  }
+
+  public abstract class Recomposer {
+    ctor public Recomposer();
+    method protected final void dispatchRecomposes();
+    method public abstract boolean hasPendingChanges();
+    method public abstract void recomposeSync();
+    method protected abstract void scheduleChangesDispatch();
+    field public static final androidx.compose.Recomposer.Companion! Companion;
+  }
+
+  public static final class Recomposer.Companion {
+    method public androidx.compose.Recomposer current();
+    method @Deprecated public boolean hasPendingChanges();
+  }
+
+  public final class RememberKt {
+    method @androidx.compose.Composable public static inline <T> T! remember(kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <T, V1> T! remember(V1? v1, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <T, V1, V2> T! remember(V1? v1, V2? v2, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <T, V1, V2, V3> T! remember(V1? v1, V2? v2, V3? v3, kotlin.jvm.functions.Function0<? extends T> calculation);
+    method @androidx.compose.Composable public static inline <V> V! remember(Object![]? inputs, kotlin.jvm.functions.Function0<? extends V> block);
+  }
+
+  public interface ScopeUpdateScope {
+    method public void updateScope(kotlin.jvm.functions.Function1<? super androidx.compose.Composer<?>,kotlin.Unit> block);
+  }
+
+  public final class SlotReader {
+    ctor public SlotReader(androidx.compose.SlotTable table);
+    method public void beginEmpty();
+    method public void close();
+    method public void endEmpty();
+    method public void endGroup();
+    method public void endNode();
+    method public java.util.List<androidx.compose.KeyInfo> extractKeys();
+    method public Object? get(androidx.compose.Anchor anchor);
+    method public Object? get(int index);
+    method public int getCurrent();
+    method public int getCurrentEnd();
+    method public int getGroupEnd();
+    method public Object! getGroupKey();
+    method public int getGroupSize();
+    method public boolean getInEmpty();
+    method public int getNodeIndex();
+    method public int getParentLocation();
+    method public int getParentNodes();
+    method public int getParentSlots();
+    method public androidx.compose.SlotTable getTable();
+    method public int groupEnd(int index);
+    method public Object groupKey(int index);
+    method public int groupSize(int index);
+    method public boolean isGroup();
+    method public boolean isGroup(int index);
+    method public boolean isGroupEnd();
+    method public boolean isNode();
+    method public boolean isNode(int location);
+    method public Object? next();
+    method public void reposition(int value);
+    method public int skipGroup();
+    method public int skipNode();
+    method public void skipToGroupEnd();
+    method public void startGroup(Object key);
+    method public void startNode(Object key);
+    property public final int current;
+    property public final int currentEnd;
+    property public final int groupEnd;
+    property public final Object! groupKey;
+    property public final int groupSize;
+    property public final boolean inEmpty;
+    property public final boolean isGroup;
+    property public final boolean isGroupEnd;
+    property public final boolean isNode;
+    property public final int nodeIndex;
+    property public final int parentLocation;
+    property public final int parentNodes;
+    property public final int parentSlots;
+  }
+
+  public final class SlotTable {
+    ctor public SlotTable(internal Object![] slots);
+    ctor public SlotTable();
+    method public int getSize();
+    method public java.util.List<java.lang.Integer> groupPathTo(int location);
+    method public androidx.compose.SlotReader openReader();
+    method public androidx.compose.SlotWriter openWriter();
+    method public <T> T! read(kotlin.jvm.functions.Function1<? super androidx.compose.SlotReader,? extends T> block);
+    method public void verifyWellFormed();
+    method public <T> T! write(kotlin.jvm.functions.Function1<? super androidx.compose.SlotWriter,? extends T> block);
+    property public final int size;
+    field public static final androidx.compose.SlotTable.Companion! Companion;
+  }
+
+  public static final class SlotTable.Companion {
+    method public Object getEMPTY();
+    property public final Object EMPTY;
+  }
+
+  public final class SlotTableKt {
+  }
+
+  public final class SlotWriter {
+    method public androidx.compose.Anchor anchor(int index = current);
+    method public void beginInsert();
+    method public void close();
+    method public int endGroup();
+    method public void endInsert();
+    method public int endNode();
+    method public void ensureStarted(int location);
+    method public void ensureStarted(androidx.compose.Anchor anchor);
+    method public Object? get(androidx.compose.Anchor anchor);
+    method public Object? get(int index);
+    method public boolean getClosed();
+    method public int getCurrent();
+    method public int getGroupSize();
+    method public int getNodeIndex();
+    method public int getParentLocation();
+    method public int getParentNodes();
+    method public androidx.compose.SlotTable getTable();
+    method public int groupSize(int index);
+    method public java.util.Iterator<java.lang.Object> groupSlots();
+    method public boolean isGroup();
+    method public boolean isGroup(int index);
+    method public boolean isNode();
+    method public java.util.List<androidx.compose.Anchor> moveFrom(androidx.compose.SlotTable table, int location);
+    method public void moveGroup(int offset);
+    method public int parentIndex(androidx.compose.Anchor anchor);
+    method public boolean removeGroup();
+    method public void set(Object? value);
+    method public void setCurrent(int p);
+    method public Object? skip();
+    method public void skip(int amount);
+    method public int skipGroup();
+    method public int skipNode();
+    method public void skipToGroupEnd();
+    method public void startGroup(Object key);
+    method public void startNode(Object key);
+    method public Object? update(Object? value);
+    property public final boolean closed;
+    property public final int current;
+    property public final int groupSize;
+    property public final boolean isGroup;
+    property public final boolean isNode;
+    property public final int nodeIndex;
+    property public final int parentLocation;
+    property public final int parentNodes;
+  }
+
+  @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Stable {
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS}) public @interface StableMarker {
+  }
+
+  @androidx.compose.Stable public interface State<T> {
+    method public T! getValue();
+    property public abstract T! value;
+  }
+
+  public final class TraceKt {
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER}) public @interface UnionType {
+    method public abstract Class<?>[] types();
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.FUNCTION) public @interface Untracked {
+  }
+
+}
+
+package androidx.compose.frames {
+
+  public abstract class AbstractRecord implements androidx.compose.frames.Record {
+    ctor public AbstractRecord();
+    method public int getFrameId();
+    method public androidx.compose.frames.Record? getNext();
+    method public void setFrameId(int p);
+    method public void setNext(androidx.compose.frames.Record? p);
+    property public int frameId;
+    property public androidx.compose.frames.Record? next;
+  }
+
+  public final class Frame {
+    method public int getId();
+    method public boolean getReadonly();
+    method public boolean hasPendingChanges();
+    property public final boolean readonly;
+  }
+
+  public final class FrameAborted extends java.lang.RuntimeException {
+    ctor public FrameAborted(androidx.compose.frames.Frame frame);
+    method public androidx.compose.frames.Frame getFrame();
+  }
+
+  public final class FrameContainersKt {
+    method public static <T> androidx.compose.frames.ModelList<T> modelListOf();
+    method public static <T> androidx.compose.frames.ModelList<T> modelListOf(T? element);
+    method public static <T> androidx.compose.frames.ModelList<T> modelListOf(T?... elements);
+    method public static <K, V> androidx.compose.frames.ModelMap<K,V> modelMapOf();
+    method public static <K, V> androidx.compose.frames.ModelMap<K,V> modelMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
+  }
+
+  public final class FrameIdSetKt {
+  }
+
+  public interface Framed {
+    method public androidx.compose.frames.Record getFirstFrameRecord();
+    method public void prependFrameRecord(androidx.compose.frames.Record value);
+    property public abstract androidx.compose.frames.Record firstFrameRecord;
+  }
+
+  public final class FramesKt {
+    method public static kotlin.Unit? _created(androidx.compose.frames.Framed framed);
+    method public static androidx.compose.frames.Record _readable(androidx.compose.frames.Record r, androidx.compose.frames.Framed framed);
+    method public static androidx.compose.frames.Record _writable(androidx.compose.frames.Record r, androidx.compose.frames.Framed framed);
+    method public static void abort();
+    method public static void abort(androidx.compose.frames.Frame frame);
+    method public static void abortHandler();
+    method public static void abortHandler(androidx.compose.frames.Frame frame);
+    method public static void commit();
+    method public static void commit(androidx.compose.frames.Frame frame);
+    method public static kotlin.Unit? commitHandler();
+    method public static androidx.compose.frames.Frame currentFrame();
+    method public static boolean getInFrame();
+    method public static void observeAllReads(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit> readObserver, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public static androidx.compose.frames.Frame open(boolean readOnly = false);
+    method public static androidx.compose.frames.Frame open(kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver = null, kotlin.jvm.functions.Function2<java.lang.Object,? super java.lang.Boolean,kotlin.Unit>? writeObserver = null);
+    method public static <T extends androidx.compose.frames.Record> T readable(T, androidx.compose.frames.Framed framed);
+    method public static kotlin.jvm.functions.Function0<kotlin.Unit> registerCommitObserver(kotlin.jvm.functions.Function2<? super java.util.Set<?>,? super androidx.compose.frames.Frame,kotlin.Unit> observer);
+    method public static void restore(androidx.compose.frames.Frame frame);
+    method public static androidx.compose.frames.Frame suspend();
+    method public static boolean wasModified(Object value);
+    method public static inline <T extends androidx.compose.frames.Record> void withCurrent(T, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> block);
+    method public static <T extends androidx.compose.frames.Record> T writable(T, androidx.compose.frames.Framed framed);
+    method public static <T extends androidx.compose.frames.Record> T writable(T, androidx.compose.frames.Framed framed, androidx.compose.frames.Frame frame);
+  }
+
+  public final class ModelList<T> implements androidx.compose.frames.Framed kotlin.jvm.internal.markers.KMutableList java.util.List<T> {
+    ctor public ModelList();
+    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.frames.Record getFirstFrameRecord();
+    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 prependFrameRecord(androidx.compose.frames.Record value);
+    method public boolean remove(Object? element);
+    method public boolean removeAll(java.util.Collection<?> elements);
+    method public T! removeAt(int index);
+    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.frames.Record firstFrameRecord;
+    property public int size;
+  }
+
+  public final class ModelMap<K, V> implements androidx.compose.frames.Framed kotlin.jvm.internal.markers.KMutableMap java.util.Map<K,V> {
+    ctor public ModelMap();
+    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.frames.Record getFirstFrameRecord();
+    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 prependFrameRecord(androidx.compose.frames.Record 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.frames.Record firstFrameRecord;
+    property public java.util.Set<K> keys;
+    property public int size;
+    property public java.util.Collection<V> values;
+  }
+
+  public interface Record {
+    method public void assign(androidx.compose.frames.Record value);
+    method public androidx.compose.frames.Record create();
+    method public int getFrameId();
+    method public androidx.compose.frames.Record? getNext();
+    method public void setFrameId(int p);
+    method public void setNext(androidx.compose.frames.Record? p);
+    property public abstract int frameId;
+    property public abstract androidx.compose.frames.Record? next;
+  }
+
+}
+
+package androidx.compose.internal {
+
+  @androidx.compose.Stable public final class RestartableFunction<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, R> implements kotlin.jvm.functions.Function0<R> kotlin.jvm.functions.Function1<androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function10<P1,P2,P3,P4,P5,P6,P7,P8,P9,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function11<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function12<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function13<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function14<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function15<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function16<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function17<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function18<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function19<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function2<P1,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function20<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,P19,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function21<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,P19,P20,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function22<P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16,P17,P18,P19,P20,P21,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function3<P1,P2,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function4<P1,P2,P3,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function5<P1,P2,P3,P4,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function6<P1,P2,P3,P4,P5,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function7<P1,P2,P3,P4,P5,P6,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function8<P1,P2,P3,P4,P5,P6,P7,androidx.compose.Composer<?>,R> kotlin.jvm.functions.Function9<P1,P2,P3,P4,P5,P6,P7,P8,androidx.compose.Composer<?>,R> {
+    ctor public RestartableFunction(int key, boolean tracked);
+    method public int getKey();
+    method public R! invoke();
+    method public R! invoke(androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, P19? p19, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, P19? p19, P20? p20, androidx.compose.Composer<?> c);
+    method public R! invoke(P1? p1, P2? p2, P3? p3, P4? p4, P5? p5, P6? p6, P7? p7, P8? p8, P9? p9, P10? p10, P11? p11, P12? p12, P13? p13, P14? p14, P15? p15, P16? p16, P17? p17, P18? p18, P19? p19, P20? p20, P21? p21, androidx.compose.Composer<?> c);
+    method public void update(Object block);
+  }
+
+  public final class RestartableFunctionKt {
+    method public static androidx.compose.internal.RestartableFunction<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,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object> restartableFunction(androidx.compose.Composer<?> composer, int key, boolean tracked, Object block);
+    method public static androidx.compose.internal.RestartableFunction<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,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object> restartableFunctionInstance(int key, boolean tracked, Object block);
+  }
+
+  @androidx.compose.Stable public final class RestartableFunctionN<R> implements kotlin.jvm.functions.FunctionN<R> {
+    ctor public RestartableFunctionN(int key, boolean tracked, int arity);
+    method public int getArity();
+    method public int getKey();
+    method public R! invoke(java.lang.Object?... args);
+    method public void update(Object block);
+  }
+
+  public final class RestartableFunctionNKt {
+    method public static androidx.compose.internal.RestartableFunctionN<?> restartableFunctionN(androidx.compose.Composer<?> composer, int key, boolean tracked, int arity, Object block);
+    method public static androidx.compose.internal.RestartableFunctionN<?> restartableFunctionNInstance(int key, boolean tracked, int arity, Object block);
+  }
+
+}
+
diff --git a/compose/compose-runtime/api/restricted_current.txt b/compose/compose-runtime/api/restricted_current.txt
index 7e5d3c2..46f8053 100644
--- a/compose/compose-runtime/api/restricted_current.txt
+++ b/compose/compose-runtime/api/restricted_current.txt
@@ -103,6 +103,7 @@
     method public final Object? nextSlot();
     method public final boolean recompose();
     method public final void skipCurrentGroup();
+    method public final void skipToGroupEnd();
     method public final void startExpr(Object key);
     method public final void startGroup(Object key);
     method public final void startMovableGroup(Object key);
@@ -325,6 +326,7 @@
     method public int getNodeIndex();
     method public int getParentLocation();
     method public int getParentNodes();
+    method public int getParentSlots();
     method public androidx.compose.SlotTable getTable();
     method public int groupEnd(int index);
     method public Object groupKey(int index);
@@ -353,6 +355,7 @@
     property public final int nodeIndex;
     property public final int parentLocation;
     property public final int parentNodes;
+    property public final int parentSlots;
   }
 
   public final class SlotTable {
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composer.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composer.kt
index fd484c6..a20d3c3 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composer.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/Composer.kt
@@ -478,11 +478,9 @@
     ) {
         startGroup(key)
         if (this.invalid() || !skipping) {
-            startGroup(invocation)
             block()
-            endGroup()
         } else {
-            skipCurrentGroup()
+            skipToGroupEnd()
         }
         endGroup()
     }
@@ -1407,7 +1405,7 @@
             require(reader.parentLocation == previousParent) { "Group enter mismatch" }
         } else {
             // No recompositions were requested in the range, skip it.
-            skipGroup()
+            skipReaderToGroupEnd()
         }
         isComposing = wasComposing
     }
@@ -1433,7 +1431,8 @@
     }
 
     /**
-     * Skip a group. This is only valid to call if the composition is not inserting.
+     * Skip a group. Skips the group at the current location. This is only valid to call if the
+     * composition is not inserting.
      */
     fun skipCurrentGroup() {
         if (invalidations.isEmpty()) {
@@ -1445,6 +1444,24 @@
         }
     }
 
+    private fun skipReaderToGroupEnd() {
+        groupNodeCount = reader.parentNodes
+        reader.skipToGroupEnd()
+    }
+
+    /**
+     * Skip to the end of the group opened by [startGroup].
+     */
+    fun skipToGroupEnd() {
+        require(groupNodeCount == 0) { "No nodes can be emitted before calling skipAndEndGroup" }
+        if (invalidations.isEmpty()) {
+            skipReaderToGroupEnd()
+        } else {
+            val parentLocation = reader.parentLocation
+            recomposeComponentRange(parentLocation, parentLocation + reader.parentSlots + 1)
+        }
+    }
+
     /**
      * Start a restart group. A restart group creates a recompose scope and sets it as the current
      * recompose scope of the composition. If the recompose scope is invalidated then this group
@@ -1541,9 +1558,9 @@
      * node.
      */
     private fun recordApplierOperation(change: Change<N>) {
+        realizeInsertApplier()
         realizeUps()
         realizeDowns()
-        realizeInsertApplier()
         record(change)
     }
 
@@ -1615,6 +1632,7 @@
             val parentLocation = reader.parentLocation
             if (realizedDowns.peekOr(-1) == parentLocation) {
                 pendingUps++
+                realizedDowns.pop()
             }
         }
     }
diff --git a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/SlotTable.kt b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/SlotTable.kt
index 6e9f6df..9aef41a 100644
--- a/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/SlotTable.kt
+++ b/compose/compose-runtime/src/commonMain/kotlin/androidx/compose/SlotTable.kt
@@ -110,6 +110,12 @@
         if (startStack.isEmpty()) 0 else slots[startStack.peek()].asGroupStart.nodes
 
     /**
+     * Return the number of slots are in the current group.
+     */
+    val parentSlots: Int get() =
+        if (startStack.isEmpty()) 0 else slots[startStack.peek()].asGroupStart.slots
+
+    /**
      * Get the value stored at [anchor].
      */
     @Suppress("KotlinOperator")
diff --git a/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/CompositionTests.kt b/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/CompositionTests.kt
index 6e1d482..51a2515 100644
--- a/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/CompositionTests.kt
+++ b/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/CompositionTests.kt
@@ -1904,6 +1904,104 @@
         myComposer.expectChanges()
     }
 
+    @Test // b/154650546
+    fun testInsertOnMultipleLevels() {
+        val items = mutableListOf(
+            1 to mutableListOf(
+                0, 1, 2, 3, 4),
+            3 to mutableListOf(
+                0, 1, 2, 3, 4)
+        )
+
+        val invalidates = mutableListOf<() -> Unit>()
+        fun invalidateComposition() {
+            invalidates.forEach { it() }
+            invalidates.clear()
+        }
+
+        @Composable
+        fun MockComposeScope.numbers(numbers: List<Int>) {
+            linear {
+                linear {
+                    invalidates.add(invalidate)
+                    for (number in numbers) {
+                        text("$number")
+                    }
+                }
+            }
+        }
+
+        @Composable
+        fun MockComposeScope.item(number: Int, numbers: List<Int>) {
+            linear {
+                invalidates.add(invalidate)
+                text("$number")
+                numbers(numbers)
+            }
+        }
+
+        @Composable
+        fun MockComposeScope.test() {
+            invalidates.add(invalidate)
+
+            linear {
+                invalidates.add(invalidate)
+                for ((number, numbers) in items) {
+                    item(number, numbers)
+                }
+            }
+        }
+
+        fun MockViewValidator.numbers(numbers: List<Int>) {
+            linear {
+                linear {
+                    for (number in numbers) {
+                        text("$number")
+                    }
+                }
+            }
+        }
+
+        fun MockViewValidator.item(number: Int, numbers: List<Int>) {
+            linear {
+                text("$number")
+                numbers(numbers)
+            }
+        }
+
+        fun MockViewValidator.test() {
+            linear {
+                for ((number, numbers) in items) {
+                    item(number, numbers)
+                }
+            }
+        }
+
+        val myComposition = compose {
+            test()
+        }
+
+        fun validate() {
+            validate(myComposition.root) {
+                test()
+            }
+        }
+
+        validate()
+
+        // Add numbers to the list at 0 and 1
+        items[0].second.add(2, 100)
+        items[1].second.add(3, 200)
+
+        // Add a list to the root.
+        items.add(1, 2 to mutableListOf(0, 1, 2))
+
+        invalidateComposition()
+
+        myComposition.expectChanges()
+        validate()
+    }
+
     @Test
     fun testInsertingAfterSkipping() {
         val items = mutableListOf(
diff --git a/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/mock/ViewComposer.kt b/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/mock/ViewComposer.kt
index 3b36053..190eb07 100644
--- a/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/mock/ViewComposer.kt
+++ b/compose/compose-runtime/src/unitTest/kotlin/androidx/compose/mock/ViewComposer.kt
@@ -104,11 +104,9 @@
     with(currentComposer as MockViewComposer) {
         startGroup(key)
         if (!changed(p1)) {
-            skipCurrentGroup()
+            skipToGroupEnd()
         } else {
-            startGroup(key)
             block(p1)
-            endGroup()
         }
         endGroup()
     }
diff --git a/core/core-ktx/api/1.4.0-alpha01.txt b/core/core-ktx/api/1.4.0-alpha01.txt
index b310061..8b85ea4 100644
--- a/core/core-ktx/api/1.4.0-alpha01.txt
+++ b/core/core-ktx/api/1.4.0-alpha01.txt
@@ -545,6 +545,7 @@
     method public static inline void forEachIndexed(android.view.ViewGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.View,kotlin.Unit> action);
     method public static operator android.view.View get(android.view.ViewGroup, int index);
     method public static kotlin.sequences.Sequence<android.view.View> getChildren(android.view.ViewGroup);
+    method public static kotlin.sequences.Sequence<android.view.View> getDescendants(android.view.ViewGroup);
     method public static inline int getSize(android.view.ViewGroup);
     method public static inline boolean isEmpty(android.view.ViewGroup);
     method public static inline boolean isNotEmpty(android.view.ViewGroup);
@@ -563,6 +564,8 @@
     method public static inline void doOnNextLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static inline androidx.core.view.OneShotPreDrawListener doOnPreDraw(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static android.graphics.Bitmap drawToBitmap(android.view.View, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
+    method public static kotlin.sequences.Sequence<android.view.View> getAllViews(android.view.View);
+    method public static kotlin.sequences.Sequence<android.view.ViewParent> getAncestors(android.view.View);
     method public static inline int getMarginBottom(android.view.View);
     method public static inline int getMarginEnd(android.view.View);
     method public static inline int getMarginLeft(android.view.View);
diff --git a/core/core-ktx/api/current.txt b/core/core-ktx/api/current.txt
index b310061..8b85ea4 100644
--- a/core/core-ktx/api/current.txt
+++ b/core/core-ktx/api/current.txt
@@ -545,6 +545,7 @@
     method public static inline void forEachIndexed(android.view.ViewGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.View,kotlin.Unit> action);
     method public static operator android.view.View get(android.view.ViewGroup, int index);
     method public static kotlin.sequences.Sequence<android.view.View> getChildren(android.view.ViewGroup);
+    method public static kotlin.sequences.Sequence<android.view.View> getDescendants(android.view.ViewGroup);
     method public static inline int getSize(android.view.ViewGroup);
     method public static inline boolean isEmpty(android.view.ViewGroup);
     method public static inline boolean isNotEmpty(android.view.ViewGroup);
@@ -563,6 +564,8 @@
     method public static inline void doOnNextLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static inline androidx.core.view.OneShotPreDrawListener doOnPreDraw(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static android.graphics.Bitmap drawToBitmap(android.view.View, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
+    method public static kotlin.sequences.Sequence<android.view.View> getAllViews(android.view.View);
+    method public static kotlin.sequences.Sequence<android.view.ViewParent> getAncestors(android.view.View);
     method public static inline int getMarginBottom(android.view.View);
     method public static inline int getMarginEnd(android.view.View);
     method public static inline int getMarginLeft(android.view.View);
diff --git a/core/core-ktx/api/public_plus_experimental_1.4.0-alpha01.txt b/core/core-ktx/api/public_plus_experimental_1.4.0-alpha01.txt
index b310061..8b85ea4 100644
--- a/core/core-ktx/api/public_plus_experimental_1.4.0-alpha01.txt
+++ b/core/core-ktx/api/public_plus_experimental_1.4.0-alpha01.txt
@@ -545,6 +545,7 @@
     method public static inline void forEachIndexed(android.view.ViewGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.View,kotlin.Unit> action);
     method public static operator android.view.View get(android.view.ViewGroup, int index);
     method public static kotlin.sequences.Sequence<android.view.View> getChildren(android.view.ViewGroup);
+    method public static kotlin.sequences.Sequence<android.view.View> getDescendants(android.view.ViewGroup);
     method public static inline int getSize(android.view.ViewGroup);
     method public static inline boolean isEmpty(android.view.ViewGroup);
     method public static inline boolean isNotEmpty(android.view.ViewGroup);
@@ -563,6 +564,8 @@
     method public static inline void doOnNextLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static inline androidx.core.view.OneShotPreDrawListener doOnPreDraw(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static android.graphics.Bitmap drawToBitmap(android.view.View, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
+    method public static kotlin.sequences.Sequence<android.view.View> getAllViews(android.view.View);
+    method public static kotlin.sequences.Sequence<android.view.ViewParent> getAncestors(android.view.View);
     method public static inline int getMarginBottom(android.view.View);
     method public static inline int getMarginEnd(android.view.View);
     method public static inline int getMarginLeft(android.view.View);
diff --git a/core/core-ktx/api/public_plus_experimental_current.txt b/core/core-ktx/api/public_plus_experimental_current.txt
index b310061..8b85ea4 100644
--- a/core/core-ktx/api/public_plus_experimental_current.txt
+++ b/core/core-ktx/api/public_plus_experimental_current.txt
@@ -545,6 +545,7 @@
     method public static inline void forEachIndexed(android.view.ViewGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.View,kotlin.Unit> action);
     method public static operator android.view.View get(android.view.ViewGroup, int index);
     method public static kotlin.sequences.Sequence<android.view.View> getChildren(android.view.ViewGroup);
+    method public static kotlin.sequences.Sequence<android.view.View> getDescendants(android.view.ViewGroup);
     method public static inline int getSize(android.view.ViewGroup);
     method public static inline boolean isEmpty(android.view.ViewGroup);
     method public static inline boolean isNotEmpty(android.view.ViewGroup);
@@ -563,6 +564,8 @@
     method public static inline void doOnNextLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static inline androidx.core.view.OneShotPreDrawListener doOnPreDraw(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static android.graphics.Bitmap drawToBitmap(android.view.View, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
+    method public static kotlin.sequences.Sequence<android.view.View> getAllViews(android.view.View);
+    method public static kotlin.sequences.Sequence<android.view.ViewParent> getAncestors(android.view.View);
     method public static inline int getMarginBottom(android.view.View);
     method public static inline int getMarginEnd(android.view.View);
     method public static inline int getMarginLeft(android.view.View);
diff --git a/core/core-ktx/api/restricted_1.4.0-alpha01.txt b/core/core-ktx/api/restricted_1.4.0-alpha01.txt
index b310061..8b85ea4 100644
--- a/core/core-ktx/api/restricted_1.4.0-alpha01.txt
+++ b/core/core-ktx/api/restricted_1.4.0-alpha01.txt
@@ -545,6 +545,7 @@
     method public static inline void forEachIndexed(android.view.ViewGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.View,kotlin.Unit> action);
     method public static operator android.view.View get(android.view.ViewGroup, int index);
     method public static kotlin.sequences.Sequence<android.view.View> getChildren(android.view.ViewGroup);
+    method public static kotlin.sequences.Sequence<android.view.View> getDescendants(android.view.ViewGroup);
     method public static inline int getSize(android.view.ViewGroup);
     method public static inline boolean isEmpty(android.view.ViewGroup);
     method public static inline boolean isNotEmpty(android.view.ViewGroup);
@@ -563,6 +564,8 @@
     method public static inline void doOnNextLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static inline androidx.core.view.OneShotPreDrawListener doOnPreDraw(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static android.graphics.Bitmap drawToBitmap(android.view.View, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
+    method public static kotlin.sequences.Sequence<android.view.View> getAllViews(android.view.View);
+    method public static kotlin.sequences.Sequence<android.view.ViewParent> getAncestors(android.view.View);
     method public static inline int getMarginBottom(android.view.View);
     method public static inline int getMarginEnd(android.view.View);
     method public static inline int getMarginLeft(android.view.View);
diff --git a/core/core-ktx/api/restricted_current.txt b/core/core-ktx/api/restricted_current.txt
index b310061..8b85ea4 100644
--- a/core/core-ktx/api/restricted_current.txt
+++ b/core/core-ktx/api/restricted_current.txt
@@ -545,6 +545,7 @@
     method public static inline void forEachIndexed(android.view.ViewGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.View,kotlin.Unit> action);
     method public static operator android.view.View get(android.view.ViewGroup, int index);
     method public static kotlin.sequences.Sequence<android.view.View> getChildren(android.view.ViewGroup);
+    method public static kotlin.sequences.Sequence<android.view.View> getDescendants(android.view.ViewGroup);
     method public static inline int getSize(android.view.ViewGroup);
     method public static inline boolean isEmpty(android.view.ViewGroup);
     method public static inline boolean isNotEmpty(android.view.ViewGroup);
@@ -563,6 +564,8 @@
     method public static inline void doOnNextLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static inline androidx.core.view.OneShotPreDrawListener doOnPreDraw(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static android.graphics.Bitmap drawToBitmap(android.view.View, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
+    method public static kotlin.sequences.Sequence<android.view.View> getAllViews(android.view.View);
+    method public static kotlin.sequences.Sequence<android.view.ViewParent> getAncestors(android.view.View);
     method public static inline int getMarginBottom(android.view.View);
     method public static inline int getMarginEnd(android.view.View);
     method public static inline int getMarginLeft(android.view.View);
diff --git a/core/core-ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt b/core/core-ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt
index d6b8505..97d1dce 100644
--- a/core/core-ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt
+++ b/core/core-ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt
@@ -201,13 +201,111 @@
         }
     }
 
+    @Test fun childrenEmpty() {
+        viewGroup.children.forEach {
+            fail()
+        }
+    }
+
     @Test fun children() {
         val views = listOf(View(context), View(context), View(context))
         views.forEach { viewGroup.addView(it) }
 
-        viewGroup.children.forEachIndexed { index, child ->
+        val children = viewGroup.children
+
+        var count = 0
+        children.forEachIndexed { index, child ->
+            count++
             assertSame(views[index], child)
         }
+        assertEquals(3, count)
+
+        // Ensure the Sequence can be consumed twice.
+        assertEquals(3, children.count())
+    }
+
+    @Test fun descendantsEmpty() {
+        viewGroup.descendants.forEach {
+            fail()
+        }
+    }
+
+    @Test fun descendants() {
+        val view1 = LinearLayout(context)
+        val view2 = View(context)
+        val view3 = LinearLayout(context)
+        val view4 = View(context)
+        val view5 = View(context)
+
+        //   viewGroup
+        //    /     \
+        // view1    view3
+        //   |      /   \
+        // view2 view4 view5
+        viewGroup.addView(view1)
+        viewGroup.addView(view3)
+        view1.addView(view2)
+        view3.addView(view4)
+        view3.addView(view5)
+
+        val views = listOf(view1, view2, view3, view4, view5)
+        val descendants = viewGroup.descendants
+
+        var count = 0
+        descendants.forEachIndexed { index, descendant ->
+            count++
+            assertSame(views[index], descendant)
+        }
+        assertEquals(5, count)
+
+        // Ensure the Sequence can be consumed twice.
+        assertEquals(5, descendants.count())
+    }
+
+    @Test fun allViewsEmpty() {
+        val allViews = viewGroup.allViews
+
+        var count = 0
+        allViews.forEach { childView ->
+            count++
+            assertSame(viewGroup, childView)
+        }
+        assertEquals(1, count)
+
+        // Ensure the Sequence can be consumed twice.
+        assertEquals(1, allViews.count())
+    }
+
+    @Test fun allViews() {
+        val view1 = LinearLayout(context)
+        val view2 = View(context)
+        val view3 = LinearLayout(context)
+        val view4 = View(context)
+        val view5 = View(context)
+
+        //   viewGroup
+        //    /     \
+        // view1    view3
+        //   |      /   \
+        // view2 view4 view5
+        viewGroup.addView(view1)
+        viewGroup.addView(view3)
+        view1.addView(view2)
+        view3.addView(view4)
+        view3.addView(view5)
+
+        val views = listOf(viewGroup, view1, view2, view3, view4, view5)
+        val allViews = viewGroup.allViews
+
+        var count = 0
+        allViews.forEachIndexed { index, descendant ->
+            count++
+            assertSame(views[index], descendant)
+        }
+        assertEquals(6, count)
+
+        // Ensure the Sequence can be consumed twice.
+        assertEquals(6, allViews.count())
     }
 
     @Test fun setMargins() {
diff --git a/core/core-ktx/src/androidTest/java/androidx/core/view/ViewTest.kt b/core/core-ktx/src/androidTest/java/androidx/core/view/ViewTest.kt
index 6c72308..d80e586 100644
--- a/core/core-ktx/src/androidTest/java/androidx/core/view/ViewTest.kt
+++ b/core/core-ktx/src/androidTest/java/androidx/core/view/ViewTest.kt
@@ -305,4 +305,28 @@
         }
         assertEquals(10, view.marginEnd)
     }
+
+    @Test fun ancestorsEmpty() {
+        view.ancestors.forEach {
+            fail()
+        }
+    }
+
+    @Test fun ancestors() {
+        val views = listOf(LinearLayout(context), LinearLayout(context))
+        views[0].addView(view)
+        views[1].addView(views[0])
+
+        val ancestors = view.ancestors
+
+        var count = 0
+        ancestors.forEachIndexed { index, ancestor ->
+            count++
+            assertSame(views[index], ancestor)
+        }
+        assertEquals(2, count)
+
+        // Ensure the Sequence can be consumed twice.
+        assertEquals(2, ancestors.count())
+    }
 }
diff --git a/core/core-ktx/src/main/java/androidx/core/view/View.kt b/core/core-ktx/src/main/java/androidx/core/view/View.kt
index 0556693..7d4cd46 100644
--- a/core/core-ktx/src/main/java/androidx/core/view/View.kt
+++ b/core/core-ktx/src/main/java/androidx/core/view/View.kt
@@ -22,6 +22,7 @@
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.MarginLayoutParams
+import android.view.ViewParent
 import androidx.annotation.Px
 import androidx.annotation.RequiresApi
 import androidx.core.graphics.applyCanvas
@@ -381,3 +382,27 @@
         val lp = layoutParams
         return if (lp is MarginLayoutParams) MarginLayoutParamsCompat.getMarginEnd(lp) else 0
     }
+
+/**
+ * Returns a [Sequence] of the parent chain of this view by repeatedly calling [View.getParent].
+ * An unattached view will return a zero-element sequence.
+ *
+ * @see ViewGroup.descendants
+ */
+val View.ancestors: Sequence<ViewParent>
+    get() = generateSequence(parent, ViewParent::getParent)
+
+/**
+ * Returns a [Sequence] over this view and its descendants recursively.
+ * This is a depth-first traversal similar to [View.findViewById].
+ * A view with no children will return a single-element sequence of itself.
+ *
+ * @see ViewGroup.descendants
+ */
+val View.allViews: Sequence<View>
+    get() = sequence {
+        yield(this@allViews)
+        if (this@allViews is ViewGroup) {
+            yieldAll(this@allViews.descendants)
+        }
+    }
diff --git a/core/core-ktx/src/main/java/androidx/core/view/ViewGroup.kt b/core/core-ktx/src/main/java/androidx/core/view/ViewGroup.kt
index 8a7152a..3c337cd 100644
--- a/core/core-ktx/src/main/java/androidx/core/view/ViewGroup.kt
+++ b/core/core-ktx/src/main/java/androidx/core/view/ViewGroup.kt
@@ -71,13 +71,37 @@
     override fun remove() = removeViewAt(--index)
 }
 
-/** Returns a [Sequence] over the child views in this view group. */
+/**
+ * Returns a [Sequence] over the immediate child views in this view group.
+ *
+ * @see View.allViews
+ * @see ViewGroup.descendants
+ */
 val ViewGroup.children: Sequence<View>
     get() = object : Sequence<View> {
         override fun iterator() = this@children.iterator()
     }
 
 /**
+ * Returns a [Sequence] over the child views in this view group recursively.
+ * This performs a depth-first traversal.
+ * A view with no children will return a zero-element sequence.
+ *
+ * @see View.allViews
+ * @see ViewGroup.children
+ * @see View.ancestors
+ */
+val ViewGroup.descendants: Sequence<View>
+    get() = sequence {
+        forEach { child ->
+            yield(child)
+            if (child is ViewGroup) {
+                yieldAll(child.descendants)
+            }
+        }
+    }
+
+/**
  * Sets the margins in the ViewGroup's MarginLayoutParams. This version of the method sets all axes
  * to the provided size.
  *
diff --git a/datastore/datastore-preferences/api/1.0.0-alpha01.txt b/datastore/datastore-preferences/api/1.0.0-alpha01.txt
index da4f6cc..f9b97a8 100644
--- a/datastore/datastore-preferences/api/1.0.0-alpha01.txt
+++ b/datastore/datastore-preferences/api/1.0.0-alpha01.txt
@@ -1 +1,35 @@
 // Signature format: 3.0
+package androidx.datastore.preferences {
+
+  public final class Preferences {
+    method public operator boolean contains(String key);
+    method public java.util.Map<java.lang.String,java.lang.Object> getAll();
+    method public boolean getBoolean(String key, boolean defaultValue);
+    method public float getFloat(String key, float defaultValue);
+    method public int getInt(String key, int defaultValue);
+    method public long getLong(String key, long defaultValue);
+    method public String getString(String key, String defaultValue);
+    method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
+    method public androidx.datastore.preferences.Preferences.Builder toBuilder();
+    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+  }
+
+  public static final class Preferences.Builder {
+    ctor public Preferences.Builder();
+    method public androidx.datastore.preferences.Preferences build();
+    method public androidx.datastore.preferences.Preferences.Builder clear();
+    method public androidx.datastore.preferences.Preferences.Builder remove(String key);
+    method public androidx.datastore.preferences.Preferences.Builder setBoolean(String key, boolean newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setFloat(String key, float newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setInt(String key, int newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setLong(String key, long newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setString(String key, String newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setStringSet(String key, java.util.Set<java.lang.String> newValue);
+  }
+
+  public static final class Preferences.Companion {
+    method public androidx.datastore.preferences.Preferences empty();
+  }
+
+}
+
diff --git a/datastore/datastore-preferences/api/current.txt b/datastore/datastore-preferences/api/current.txt
index da4f6cc..f9b97a8 100644
--- a/datastore/datastore-preferences/api/current.txt
+++ b/datastore/datastore-preferences/api/current.txt
@@ -1 +1,35 @@
 // Signature format: 3.0
+package androidx.datastore.preferences {
+
+  public final class Preferences {
+    method public operator boolean contains(String key);
+    method public java.util.Map<java.lang.String,java.lang.Object> getAll();
+    method public boolean getBoolean(String key, boolean defaultValue);
+    method public float getFloat(String key, float defaultValue);
+    method public int getInt(String key, int defaultValue);
+    method public long getLong(String key, long defaultValue);
+    method public String getString(String key, String defaultValue);
+    method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
+    method public androidx.datastore.preferences.Preferences.Builder toBuilder();
+    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+  }
+
+  public static final class Preferences.Builder {
+    ctor public Preferences.Builder();
+    method public androidx.datastore.preferences.Preferences build();
+    method public androidx.datastore.preferences.Preferences.Builder clear();
+    method public androidx.datastore.preferences.Preferences.Builder remove(String key);
+    method public androidx.datastore.preferences.Preferences.Builder setBoolean(String key, boolean newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setFloat(String key, float newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setInt(String key, int newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setLong(String key, long newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setString(String key, String newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setStringSet(String key, java.util.Set<java.lang.String> newValue);
+  }
+
+  public static final class Preferences.Companion {
+    method public androidx.datastore.preferences.Preferences empty();
+  }
+
+}
+
diff --git a/datastore/datastore-preferences/api/public_plus_experimental_1.0.0-alpha01.txt b/datastore/datastore-preferences/api/public_plus_experimental_1.0.0-alpha01.txt
index da4f6cc..f9b97a8 100644
--- a/datastore/datastore-preferences/api/public_plus_experimental_1.0.0-alpha01.txt
+++ b/datastore/datastore-preferences/api/public_plus_experimental_1.0.0-alpha01.txt
@@ -1 +1,35 @@
 // Signature format: 3.0
+package androidx.datastore.preferences {
+
+  public final class Preferences {
+    method public operator boolean contains(String key);
+    method public java.util.Map<java.lang.String,java.lang.Object> getAll();
+    method public boolean getBoolean(String key, boolean defaultValue);
+    method public float getFloat(String key, float defaultValue);
+    method public int getInt(String key, int defaultValue);
+    method public long getLong(String key, long defaultValue);
+    method public String getString(String key, String defaultValue);
+    method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
+    method public androidx.datastore.preferences.Preferences.Builder toBuilder();
+    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+  }
+
+  public static final class Preferences.Builder {
+    ctor public Preferences.Builder();
+    method public androidx.datastore.preferences.Preferences build();
+    method public androidx.datastore.preferences.Preferences.Builder clear();
+    method public androidx.datastore.preferences.Preferences.Builder remove(String key);
+    method public androidx.datastore.preferences.Preferences.Builder setBoolean(String key, boolean newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setFloat(String key, float newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setInt(String key, int newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setLong(String key, long newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setString(String key, String newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setStringSet(String key, java.util.Set<java.lang.String> newValue);
+  }
+
+  public static final class Preferences.Companion {
+    method public androidx.datastore.preferences.Preferences empty();
+  }
+
+}
+
diff --git a/datastore/datastore-preferences/api/public_plus_experimental_current.txt b/datastore/datastore-preferences/api/public_plus_experimental_current.txt
index da4f6cc..f9b97a8 100644
--- a/datastore/datastore-preferences/api/public_plus_experimental_current.txt
+++ b/datastore/datastore-preferences/api/public_plus_experimental_current.txt
@@ -1 +1,35 @@
 // Signature format: 3.0
+package androidx.datastore.preferences {
+
+  public final class Preferences {
+    method public operator boolean contains(String key);
+    method public java.util.Map<java.lang.String,java.lang.Object> getAll();
+    method public boolean getBoolean(String key, boolean defaultValue);
+    method public float getFloat(String key, float defaultValue);
+    method public int getInt(String key, int defaultValue);
+    method public long getLong(String key, long defaultValue);
+    method public String getString(String key, String defaultValue);
+    method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
+    method public androidx.datastore.preferences.Preferences.Builder toBuilder();
+    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+  }
+
+  public static final class Preferences.Builder {
+    ctor public Preferences.Builder();
+    method public androidx.datastore.preferences.Preferences build();
+    method public androidx.datastore.preferences.Preferences.Builder clear();
+    method public androidx.datastore.preferences.Preferences.Builder remove(String key);
+    method public androidx.datastore.preferences.Preferences.Builder setBoolean(String key, boolean newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setFloat(String key, float newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setInt(String key, int newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setLong(String key, long newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setString(String key, String newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setStringSet(String key, java.util.Set<java.lang.String> newValue);
+  }
+
+  public static final class Preferences.Companion {
+    method public androidx.datastore.preferences.Preferences empty();
+  }
+
+}
+
diff --git a/datastore/datastore-preferences/api/restricted_1.0.0-alpha01.txt b/datastore/datastore-preferences/api/restricted_1.0.0-alpha01.txt
index da4f6cc..f9b97a8 100644
--- a/datastore/datastore-preferences/api/restricted_1.0.0-alpha01.txt
+++ b/datastore/datastore-preferences/api/restricted_1.0.0-alpha01.txt
@@ -1 +1,35 @@
 // Signature format: 3.0
+package androidx.datastore.preferences {
+
+  public final class Preferences {
+    method public operator boolean contains(String key);
+    method public java.util.Map<java.lang.String,java.lang.Object> getAll();
+    method public boolean getBoolean(String key, boolean defaultValue);
+    method public float getFloat(String key, float defaultValue);
+    method public int getInt(String key, int defaultValue);
+    method public long getLong(String key, long defaultValue);
+    method public String getString(String key, String defaultValue);
+    method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
+    method public androidx.datastore.preferences.Preferences.Builder toBuilder();
+    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+  }
+
+  public static final class Preferences.Builder {
+    ctor public Preferences.Builder();
+    method public androidx.datastore.preferences.Preferences build();
+    method public androidx.datastore.preferences.Preferences.Builder clear();
+    method public androidx.datastore.preferences.Preferences.Builder remove(String key);
+    method public androidx.datastore.preferences.Preferences.Builder setBoolean(String key, boolean newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setFloat(String key, float newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setInt(String key, int newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setLong(String key, long newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setString(String key, String newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setStringSet(String key, java.util.Set<java.lang.String> newValue);
+  }
+
+  public static final class Preferences.Companion {
+    method public androidx.datastore.preferences.Preferences empty();
+  }
+
+}
+
diff --git a/datastore/datastore-preferences/api/restricted_current.txt b/datastore/datastore-preferences/api/restricted_current.txt
index da4f6cc..f9b97a8 100644
--- a/datastore/datastore-preferences/api/restricted_current.txt
+++ b/datastore/datastore-preferences/api/restricted_current.txt
@@ -1 +1,35 @@
 // Signature format: 3.0
+package androidx.datastore.preferences {
+
+  public final class Preferences {
+    method public operator boolean contains(String key);
+    method public java.util.Map<java.lang.String,java.lang.Object> getAll();
+    method public boolean getBoolean(String key, boolean defaultValue);
+    method public float getFloat(String key, float defaultValue);
+    method public int getInt(String key, int defaultValue);
+    method public long getLong(String key, long defaultValue);
+    method public String getString(String key, String defaultValue);
+    method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
+    method public androidx.datastore.preferences.Preferences.Builder toBuilder();
+    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+  }
+
+  public static final class Preferences.Builder {
+    ctor public Preferences.Builder();
+    method public androidx.datastore.preferences.Preferences build();
+    method public androidx.datastore.preferences.Preferences.Builder clear();
+    method public androidx.datastore.preferences.Preferences.Builder remove(String key);
+    method public androidx.datastore.preferences.Preferences.Builder setBoolean(String key, boolean newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setFloat(String key, float newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setInt(String key, int newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setLong(String key, long newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setString(String key, String newValue);
+    method public androidx.datastore.preferences.Preferences.Builder setStringSet(String key, java.util.Set<java.lang.String> newValue);
+  }
+
+  public static final class Preferences.Companion {
+    method public androidx.datastore.preferences.Preferences empty();
+  }
+
+}
+
diff --git a/datastore/datastore-preferences/build.gradle b/datastore/datastore-preferences/build.gradle
index 2c6e5cc..375b53a 100644
--- a/datastore/datastore-preferences/build.gradle
+++ b/datastore/datastore-preferences/build.gradle
@@ -37,6 +37,10 @@
 dependencies {
     api(KOTLIN_STDLIB)
     api(project(":datastore:datastore-core"))
+
+    testImplementation(JUNIT)
+    testImplementation(TRUTH)
+    testImplementation(project(":internal-testutils-truth"))
 }
 
 androidx {
diff --git a/datastore/datastore-preferences/src/main/java/androidx/datastore/preferences/Preferences.kt b/datastore/datastore-preferences/src/main/java/androidx/datastore/preferences/Preferences.kt
new file mode 100644
index 0000000..fca4cbc
--- /dev/null
+++ b/datastore/datastore-preferences/src/main/java/androidx/datastore/preferences/Preferences.kt
@@ -0,0 +1,277 @@
+/*
+ * 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.datastore.preferences
+
+/**
+ * Preferences provides a schemaless key-value format for use with DataStore. It closely
+ * resembles the SharedPreferences interface, with a few differences to allow compatibility with
+ * DataStore. The differences include:
+ * 1. There is no edit() method. Instead use the toBuilder() to create a new PreferencesBuilder
+ * and pass the result to DataStore.updateData().
+ * 2. There is no (un)registerOnSharedPreferenceChangeListener() methods. Instead, use DataStore
+ * .dataFlow.
+ */
+class Preferences internal constructor(
+    private val preferences: Map<String, Any?> = mapOf()
+) {
+
+    /* Checks whether the Preferences contains a preference. */
+    operator fun contains(key: String): Boolean {
+        return preferences.containsKey(key)
+    }
+
+    /**
+     * Retrieve a boolean value from Preferences.
+     *
+     * @param key The name of the preference to retrieve.
+     * @param defaultValue Value to return if this preference does not exist.
+     *
+     * @return Returns the preference if it exists, otherwise returns defaultValue
+     *
+     * @throws ClassCastException if there is a preference for this key that is not a boolean.
+     */
+    fun getBoolean(key: String, defaultValue: Boolean): Boolean {
+        return getKeyOrDefault(key, defaultValue)
+    }
+
+    /**
+     * Retrieve a float value from Preferences.
+     *
+     * @param key The name of the preference to retrieve.
+     * @param defaultValue Value to return if this preference does not exist.
+     *
+     * @return Returns the preference if it exists, otherwise returns defaultValue
+     *
+     * @throws ClassCastException if there is a preference for this key that is not a float.
+     */
+    fun getFloat(key: String, defaultValue: Float): Float {
+        return getKeyOrDefault(key, defaultValue)
+    }
+
+    /**
+     * Retrieve a int value from Preferences.
+     *
+     * @param key The name of the preference to retrieve.
+     * @param defaultValue Value to return if this preference does not exist.
+     *
+     * @return Returns the preference if it exists, otherwise returns defaultValue
+     *
+     * @throws ClassCastException if there is a preference for this key that is not a int.
+     */
+    fun getInt(key: String, defaultValue: Int): Int {
+        return getKeyOrDefault(key, defaultValue)
+    }
+
+    /**
+     * Retrieve a long value from Preferences.
+     *
+     * @param key The name of the preference to retrieve.
+     * @param defaultValue Value to return if this preference does not exist.
+     *
+     * @return Returns the preference if it exists, otherwise returns defaultValue
+     *
+     * @throws ClassCastException if there is a preference for this key that is not a long.
+     */
+    fun getLong(key: String, defaultValue: Long): Long {
+        return getKeyOrDefault(key, defaultValue)
+    }
+
+    /**
+     * Retrieve a String value from Preferences.
+     *
+     * @param key The name of the preference to retrieve.
+     * @param defaultValue Value to return if this preference does not exist.
+     *
+     * @return Returns the preference if it exists, otherwise returns defaultValue
+     *
+     * @throws ClassCastException if there is a preference for this key that is not a String.
+     */
+    fun getString(key: String, defaultValue: String): String {
+        return getKeyOrDefault(key, defaultValue)
+    }
+
+    /**
+     * Retrieve a set of Strings from Preferences.
+     *
+     * @param key The name of the preference to retrieve.
+     * @param defaultValue Value to return if this preference does not exist.
+     *
+     * @return Returns the preference if it exists, otherwise returns defaultValue
+     *
+     * @throws ClassCastException if there is a preference for this key that is not a Set of
+     * Strings.
+     */
+    fun getStringSet(key: String, defaultValue: Set<String>): Set<String> {
+        return getKeyOrDefault(key, defaultValue).toSet()
+    }
+
+    /**
+     * Retrieve a map of all values from the preferences.
+     *
+     * @return Returns a map containing representing all the preferences in Preferences.
+     */
+    fun getAll(): Map<String, Any?> {
+        return preferences.mapValues {
+            val value = it.value
+            if (value is Set<*>) {
+                value.toSet()
+            } else {
+                value
+            }
+        }
+    }
+
+    // TODO(b/151635324): add getByteArray()... ByteArray, Byte[], List<Byte>?
+
+    override fun equals(other: Any?): Boolean {
+        if (other is Preferences) {
+            return this.preferences == other.preferences
+        }
+        return false
+    }
+
+    override fun hashCode(): Int {
+        return preferences.hashCode()
+    }
+
+    /**
+     * Gets a builder which contains all the preferences in this Preferences. This can be used
+     * to change preferences without building a new Preferences object from scratch.
+     *
+     * @return Returns a PreferencesBuilder with all the preferences from this Preferences.
+     */
+    fun toBuilder(): Builder {
+        return Builder(
+            preferences.toMutableMap()
+        )
+    }
+
+    companion object {
+        /**
+         * Get a new empty Preferences.
+         *
+         * @return Returns a new Preferences instance with no preferences set.
+         */
+        fun empty(): Preferences {
+            return Preferences()
+        }
+    }
+
+    /**
+     * The builder used for constructing Preferences. PreferencesBuilder resembles
+     * SharedPreferences.Editor, with some key differences:
+     * 1. It follows the builder pattern, so it cannot modify the state of any existing Preferences.
+     * 2. There is no apply or commit method. Instead, pass the result of build() to
+     *  DataStore.updateData()
+     */
+    class Builder internal constructor(
+        private val preferencesMap: MutableMap<String, Any?> = mutableMapOf()
+    ) {
+        constructor() : this(mutableMapOf()) {}
+
+        /**
+         * Set a boolean value in the PreferencesBuilder.
+         *
+         * @param key The name of the preference to set.
+         * @param newValue The new value of the preference.
+         *
+         * @return Returns this instance of PreferencesBuilder.
+         */
+        fun setBoolean(key: String, newValue: Boolean) = apply {
+            preferencesMap[key] = newValue
+        }
+
+        /**
+         * Set a float value in the PreferencesBuilder.
+         *
+         * @param key The name of the preference to set.
+         * @param newValue The new value of the preference.
+         *
+         * @return Returns this instance of PreferencesBuilder.
+         */
+        fun setFloat(key: String, newValue: Float) = apply {
+            preferencesMap[key] = newValue
+        }
+
+        /**
+         * Set a int value in the PreferencesBuilder.
+         *
+         * @param key The name of the preference to set.
+         * @param newValue The new value of the preference.
+         *
+         * @return Returns this instance of PreferencesBuilder.
+         */
+        fun setInt(key: String, newValue: Int) = apply {
+            preferencesMap[key] = newValue
+        }
+
+        /**
+         * Set a long value in the PreferencesBuilder.
+         *
+         * @param key The name of the preference to set.
+         * @param newValue The new value of the preference.
+         *
+         * @return Returns this instance of PreferencesBuilder.
+         */
+        fun setLong(key: String, newValue: Long) = apply {
+            preferencesMap[key] = newValue
+        }
+
+        /**
+         * Set a String value in the PreferencesBuilder.
+         *
+         * @param key The name of the preference to set.
+         * @param newValue The new value of the preference.
+         *
+         * @return Returns this instance of PreferencesBuilder.
+         */
+        fun setString(key: String, newValue: String) = apply {
+            preferencesMap[key] = newValue
+        }
+
+        /**
+         * Set a String Set in the PreferencesBuilder.
+         *
+         * @param key The name of the preference to set.
+         * @param newValue The new value of the preference.
+         *
+         * @return Returns this instance of PreferencesBuilder.
+         */
+        fun setStringSet(key: String, newValue: Set<String>) = apply {
+            preferencesMap[key] = newValue.toSet()
+        }
+
+        /* Remove a preferences from the PreferencesBuilder. */
+        fun remove(key: String) = apply {
+            preferencesMap.remove(key)
+        }
+
+        /* Removes all preferences from the PreferencesBuilder. */
+        fun clear() = apply {
+            preferencesMap.clear()
+        }
+
+        // TODO(b/151635324): setByteArray(...)
+
+        fun build(): Preferences {
+            return Preferences(preferencesMap.toMap())
+        }
+    }
+
+    private inline fun <reified T> getKeyOrDefault(key: String, defaultValue: T): T {
+        return preferences.getOrElse(key, { defaultValue }) as T
+    }
+}
diff --git a/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesTest.kt b/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesTest.kt
new file mode 100644
index 0000000..fa4bb98
--- /dev/null
+++ b/datastore/datastore-preferences/src/test/java/androidx/datastore/preferences/PreferencesTest.kt
@@ -0,0 +1,344 @@
+/*
+ * 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.datastore.preferences
+
+import androidx.testutils.assertThrows
+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 PreferencesTest {
+
+    @Test
+    fun testBoolean() {
+        val booleanKey = "boolean_key"
+
+        val prefs = Preferences
+            .empty()
+            .toBuilder()
+            .setBoolean(booleanKey, true)
+            .build()
+
+        assertThat(prefs.contains(booleanKey)).isTrue()
+        assertThat(prefs.getBoolean(booleanKey, false)).isTrue()
+    }
+
+    @Test
+    fun testBooleanDefault() {
+        assertThat(Preferences.empty().getBoolean("nonexistent key", false))
+            .isFalse()
+    }
+
+    @Test
+    fun testFloat() {
+        val floatKey = "float_key"
+
+        val prefs = Preferences
+            .empty()
+            .toBuilder()
+            .setFloat(floatKey, 1.1f)
+            .build()
+
+        assertThat(prefs.contains(floatKey)).isTrue()
+        assertThat(prefs.getFloat(floatKey, 0.0f)).isEqualTo(1.1f)
+    }
+
+    @Test
+    fun testFloatDefault() {
+        assertThat(Preferences.empty().getFloat("nonexistent key", 0.1f))
+            .isEqualTo(0.1f)
+    }
+
+    @Test
+    fun testInt() {
+        val intKey = "int_key"
+
+        val prefs = Preferences
+            .empty()
+            .toBuilder()
+            .setInt(intKey, 1)
+            .build()
+
+        assertThat(prefs.contains(intKey)).isTrue()
+        assertThat(prefs.getInt(intKey, -1)).isEqualTo(1)
+    }
+
+    @Test
+    fun testIntDefault() {
+        assertThat(Preferences.empty().getInt("nonexistent key", 123))
+            .isEqualTo(123)
+    }
+
+    @Test
+    fun testLong() {
+        val longKey = "long_key"
+
+        val bigLong = 1L shr 50; // 2^50 > Int.MAX_VALUE
+
+        val prefs = Preferences
+            .empty()
+            .toBuilder()
+            .setLong(longKey, bigLong)
+            .build()
+
+        assertThat(prefs.contains(longKey)).isTrue()
+        assertThat(prefs.getLong(longKey, -1)).isEqualTo(bigLong)
+    }
+
+    @Test
+    fun testLongDefault() {
+        assertThat(Preferences.empty().getLong("nonexistent key", 123))
+            .isEqualTo(123)
+    }
+
+    @Test
+    fun testString() {
+        val stringKey = "string_key"
+
+        val prefs = Preferences
+            .empty()
+            .toBuilder()
+            .setString(stringKey, "string123")
+            .build()
+
+        assertThat(prefs.contains(stringKey)).isTrue()
+        assertThat(prefs.getString(stringKey, "default string"))
+            .isEqualTo("string123")
+    }
+
+    @Test
+    fun testStringDefault() {
+        assertThat(Preferences.empty().getString("nonexistent key", "default val"))
+            .isEqualTo("default val")
+    }
+
+    @Test
+    fun testStringSet() {
+        val stringSetKey = "string_set_key"
+
+        val prefs = Preferences
+            .empty()
+            .toBuilder()
+            .setStringSet(stringSetKey, setOf("string1", "string2", "string3"))
+            .build()
+
+        assertThat(prefs.contains(stringSetKey)).isTrue()
+        assertThat(prefs.getStringSet(stringSetKey, setOf())).isEqualTo(
+            setOf(
+                "string1",
+                "string2",
+                "string3"
+            )
+        )
+    }
+
+    @Test
+    fun testStringSetDefault() {
+        assertThat(
+            Preferences.empty().getStringSet(
+                "nonexistent key", setOf("default set")
+            )
+        ).isEqualTo(setOf("default set"))
+    }
+
+    @Test
+    fun testModifyingStringSetDoesntModifyInternalState() {
+        val stringSetKey = "string_set_key"
+
+        val prefs = Preferences
+            .empty()
+            .toBuilder()
+            .setStringSet(stringSetKey, setOf("string1", "string2", "string3"))
+            .build()
+
+        val returnedSet: Set<String> = prefs.getStringSet(stringSetKey, setOf())
+        val mutableReturnedSet: MutableSet<String> = returnedSet as MutableSet<String>
+        mutableReturnedSet.clear()
+        mutableReturnedSet.add("Original set does not contain this string")
+
+        assertThat(prefs.getStringSet(stringSetKey, setOf())).isEqualTo(
+            setOf(
+                "string1",
+                "string2",
+                "string3"
+            )
+        )
+    }
+
+    @Test
+    fun testWrongTypeThrowsClassCastException() {
+        val stringKey = "string_key"
+
+        val prefs = Preferences
+            .empty()
+            .toBuilder()
+            .setString(stringKey, "string123")
+            .build()
+
+        assertThat(prefs.contains(stringKey)).isTrue()
+
+        // Trying to get a long where there is a string value throws a ClassCastException.
+        assertThrows<ClassCastException> { prefs.getLong(stringKey, 123) }
+    }
+
+    @Test
+    fun testGetAll() {
+        val intKey = "int_key"
+        val stringSetKey = "string_set_key"
+
+        val prefs = Preferences
+            .empty()
+            .toBuilder()
+            .setInt(intKey, 123)
+            .setStringSet(stringSetKey, setOf("1", "2", "3"))
+            .build()
+
+        val allPreferences = prefs.getAll()
+        assertThat(allPreferences.size).isEqualTo(2)
+
+        assertThat(allPreferences[intKey]).isEqualTo(123)
+        assertThat(allPreferences[stringSetKey]).isEqualTo(setOf("1", "2", "3"))
+    }
+
+    @Test
+    @Suppress("UNCHECKED_CAST")
+    fun testGetAllCantMutateInternalState() {
+        val intKey = "int_key"
+        val stringSetKey = "string_set_key"
+
+        val prefs = Preferences
+            .empty()
+            .toBuilder()
+            .setInt(intKey, 123)
+            .setStringSet(stringSetKey, setOf("1", "2", "3"))
+            .build()
+
+        val mutableAllPreferences = prefs.getAll() as MutableMap
+        mutableAllPreferences[intKey] = 99999
+        (mutableAllPreferences[stringSetKey] as MutableSet<String>).clear()
+
+        assertThat(prefs.getInt(intKey, -1)).isEqualTo(123)
+        assertThat(prefs.getStringSet(stringSetKey, setOf())).isEqualTo(setOf("1", "2", "3"))
+    }
+
+    @Test
+    fun testBuilderClear() {
+        val intKey = "int_key"
+
+        val prefsWithInt = Preferences
+            .empty()
+            .toBuilder()
+            .setInt(intKey, 123)
+            .build()
+
+        val emptyPrefs = prefsWithInt.toBuilder().clear().build()
+
+        assertThat(emptyPrefs).isEqualTo(Preferences.empty())
+    }
+
+    @Test
+    fun testBuilderRemove() {
+        val intKey = "int_key"
+
+        val prefsWithInt = Preferences
+            .empty()
+            .toBuilder()
+            .setInt(intKey, 123)
+            .build()
+
+        val emptyPrefs = prefsWithInt.toBuilder().remove(intKey).build()
+
+        assertThat(emptyPrefs).isEqualTo(Preferences.empty())
+    }
+
+    @Test
+    fun testBuilderPublicConstructor() {
+        val emptyPrefs = Preferences.Builder().build()
+
+        assertThat(emptyPrefs).isEqualTo(Preferences.empty())
+    }
+
+    @Test
+    fun testEqualsDifferentInstances() {
+        val intKey1 = "int_key1"
+
+        val prefs1 = Preferences.empty().toBuilder().setInt(intKey1, 123).build()
+        val prefs2 = Preferences.empty().toBuilder().setInt(intKey1, 123).build()
+
+        assertThat(prefs1).isEqualTo(prefs2)
+    }
+
+    @Test
+    fun testNotEqualsDifferentKeys() {
+        val intKey1 = "int_key1"
+        val intKey2 = "int_key2"
+
+        val prefs1 = Preferences
+            .empty()
+            .toBuilder()
+            .setInt(intKey1, 123)
+            .build()
+
+        val prefs2 = Preferences
+            .empty()
+            .toBuilder()
+            .setInt(intKey2, 123)
+            .build()
+
+        assertThat(prefs1).isNotEqualTo(prefs2)
+    }
+
+    @Test
+    fun testNotEqualsDifferentValues() {
+        val intKey = "int_key"
+
+        val prefs1 = Preferences
+            .empty()
+            .toBuilder()
+            .setInt(intKey, 123)
+            .build()
+
+        val prefs2 = Preferences
+            .empty()
+            .toBuilder()
+            .setInt(intKey, 999)
+            .build()
+
+        assertThat(prefs1).isNotEqualTo(prefs2)
+    }
+
+    @Test
+    fun testNotEqualsDifferentStringSets() {
+        val stringSetKey = "string_set_key"
+
+        val prefs1 = Preferences
+            .empty()
+            .toBuilder()
+            .setStringSet(stringSetKey, setOf("string1", "string2"))
+            .build()
+
+        val prefs2 = Preferences
+            .empty()
+            .toBuilder()
+            .setStringSet(stringSetKey, setOf("different string1", "string2"))
+            .build()
+
+        assertThat(prefs1).isNotEqualTo(prefs2)
+    }
+}
\ No newline at end of file
diff --git a/fragment/fragment/api/1.3.0-alpha04.txt b/fragment/fragment/api/1.3.0-alpha04.txt
index f050b31..cd5b776 100644
--- a/fragment/fragment/api/1.3.0-alpha04.txt
+++ b/fragment/fragment/api/1.3.0-alpha04.txt
@@ -78,7 +78,7 @@
     method public final boolean isStateSaved();
     method public final boolean isVisible();
     method @Deprecated @CallSuper @MainThread public void onActivityCreated(android.os.Bundle?);
-    method public void onActivityResult(int, int, android.content.Intent?);
+    method @Deprecated public void onActivityResult(int, int, android.content.Intent?);
     method @CallSuper @MainThread public void onAttach(android.content.Context);
     method @Deprecated @CallSuper @MainThread public void onAttach(android.app.Activity);
     method @MainThread public void onAttachFragment(androidx.fragment.app.Fragment);
@@ -106,7 +106,7 @@
     method public void onPictureInPictureModeChanged(boolean);
     method @MainThread public void onPrepareOptionsMenu(android.view.Menu);
     method @MainThread public void onPrimaryNavigationFragmentChanged(boolean);
-    method public void onRequestPermissionsResult(int, String![], int[]);
+    method @Deprecated public void onRequestPermissionsResult(int, String![], int[]);
     method @CallSuper @MainThread public void onResume();
     method @MainThread public void onSaveInstanceState(android.os.Bundle);
     method @CallSuper @MainThread public void onStart();
@@ -118,7 +118,7 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultRegistry, androidx.activity.result.ActivityResultCallback<O!>);
     method public void registerForContextMenu(android.view.View);
-    method public final void requestPermissions(String![], int);
+    method @Deprecated public final void requestPermissions(String![], int);
     method public final androidx.fragment.app.FragmentActivity requireActivity();
     method public final android.os.Bundle requireArguments();
     method public final android.content.Context requireContext();
@@ -146,9 +146,9 @@
     method public boolean shouldShowRequestPermissionRationale(String);
     method public void startActivity(android.content.Intent!);
     method public void startActivity(android.content.Intent!, android.os.Bundle?);
-    method public void startActivityForResult(android.content.Intent!, int);
-    method public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int);
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
+    method @Deprecated public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void startPostponedEnterTransition();
     method public void unregisterForContextMenu(android.view.View);
   }
@@ -177,7 +177,7 @@
     method public void setExitSharedElementCallback(androidx.core.app.SharedElementCallback?);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void supportFinishAfterTransition();
     method @Deprecated public void supportInvalidateOptionsMenu();
     method public void supportPostponeEnterTransition();
@@ -258,12 +258,12 @@
     method public int onGetWindowAnimations();
     method public boolean onHasView();
     method public boolean onHasWindowAnimations();
-    method public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
+    method @Deprecated public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
     method public boolean onShouldSaveFragmentState(androidx.fragment.app.Fragment);
     method public boolean onShouldShowRequestPermissionRationale(String);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void onSupportInvalidateOptionsMenu();
   }
 
diff --git a/fragment/fragment/api/current.txt b/fragment/fragment/api/current.txt
index f050b31..cd5b776 100644
--- a/fragment/fragment/api/current.txt
+++ b/fragment/fragment/api/current.txt
@@ -78,7 +78,7 @@
     method public final boolean isStateSaved();
     method public final boolean isVisible();
     method @Deprecated @CallSuper @MainThread public void onActivityCreated(android.os.Bundle?);
-    method public void onActivityResult(int, int, android.content.Intent?);
+    method @Deprecated public void onActivityResult(int, int, android.content.Intent?);
     method @CallSuper @MainThread public void onAttach(android.content.Context);
     method @Deprecated @CallSuper @MainThread public void onAttach(android.app.Activity);
     method @MainThread public void onAttachFragment(androidx.fragment.app.Fragment);
@@ -106,7 +106,7 @@
     method public void onPictureInPictureModeChanged(boolean);
     method @MainThread public void onPrepareOptionsMenu(android.view.Menu);
     method @MainThread public void onPrimaryNavigationFragmentChanged(boolean);
-    method public void onRequestPermissionsResult(int, String![], int[]);
+    method @Deprecated public void onRequestPermissionsResult(int, String![], int[]);
     method @CallSuper @MainThread public void onResume();
     method @MainThread public void onSaveInstanceState(android.os.Bundle);
     method @CallSuper @MainThread public void onStart();
@@ -118,7 +118,7 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultRegistry, androidx.activity.result.ActivityResultCallback<O!>);
     method public void registerForContextMenu(android.view.View);
-    method public final void requestPermissions(String![], int);
+    method @Deprecated public final void requestPermissions(String![], int);
     method public final androidx.fragment.app.FragmentActivity requireActivity();
     method public final android.os.Bundle requireArguments();
     method public final android.content.Context requireContext();
@@ -146,9 +146,9 @@
     method public boolean shouldShowRequestPermissionRationale(String);
     method public void startActivity(android.content.Intent!);
     method public void startActivity(android.content.Intent!, android.os.Bundle?);
-    method public void startActivityForResult(android.content.Intent!, int);
-    method public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int);
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
+    method @Deprecated public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void startPostponedEnterTransition();
     method public void unregisterForContextMenu(android.view.View);
   }
@@ -177,7 +177,7 @@
     method public void setExitSharedElementCallback(androidx.core.app.SharedElementCallback?);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void supportFinishAfterTransition();
     method @Deprecated public void supportInvalidateOptionsMenu();
     method public void supportPostponeEnterTransition();
@@ -258,12 +258,12 @@
     method public int onGetWindowAnimations();
     method public boolean onHasView();
     method public boolean onHasWindowAnimations();
-    method public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
+    method @Deprecated public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
     method public boolean onShouldSaveFragmentState(androidx.fragment.app.Fragment);
     method public boolean onShouldShowRequestPermissionRationale(String);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void onSupportInvalidateOptionsMenu();
   }
 
diff --git a/fragment/fragment/api/public_plus_experimental_1.3.0-alpha04.txt b/fragment/fragment/api/public_plus_experimental_1.3.0-alpha04.txt
index c10ccde..ee84b05 100644
--- a/fragment/fragment/api/public_plus_experimental_1.3.0-alpha04.txt
+++ b/fragment/fragment/api/public_plus_experimental_1.3.0-alpha04.txt
@@ -78,7 +78,7 @@
     method public final boolean isStateSaved();
     method public final boolean isVisible();
     method @Deprecated @CallSuper @MainThread public void onActivityCreated(android.os.Bundle?);
-    method public void onActivityResult(int, int, android.content.Intent?);
+    method @Deprecated public void onActivityResult(int, int, android.content.Intent?);
     method @CallSuper @MainThread public void onAttach(android.content.Context);
     method @Deprecated @CallSuper @MainThread public void onAttach(android.app.Activity);
     method @MainThread public void onAttachFragment(androidx.fragment.app.Fragment);
@@ -106,7 +106,7 @@
     method public void onPictureInPictureModeChanged(boolean);
     method @MainThread public void onPrepareOptionsMenu(android.view.Menu);
     method @MainThread public void onPrimaryNavigationFragmentChanged(boolean);
-    method public void onRequestPermissionsResult(int, String![], int[]);
+    method @Deprecated public void onRequestPermissionsResult(int, String![], int[]);
     method @CallSuper @MainThread public void onResume();
     method @MainThread public void onSaveInstanceState(android.os.Bundle);
     method @CallSuper @MainThread public void onStart();
@@ -118,7 +118,7 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultRegistry, androidx.activity.result.ActivityResultCallback<O!>);
     method public void registerForContextMenu(android.view.View);
-    method public final void requestPermissions(String![], int);
+    method @Deprecated public final void requestPermissions(String![], int);
     method public final androidx.fragment.app.FragmentActivity requireActivity();
     method public final android.os.Bundle requireArguments();
     method public final android.content.Context requireContext();
@@ -146,9 +146,9 @@
     method public boolean shouldShowRequestPermissionRationale(String);
     method public void startActivity(android.content.Intent!);
     method public void startActivity(android.content.Intent!, android.os.Bundle?);
-    method public void startActivityForResult(android.content.Intent!, int);
-    method public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int);
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
+    method @Deprecated public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void startPostponedEnterTransition();
     method public void unregisterForContextMenu(android.view.View);
   }
@@ -177,7 +177,7 @@
     method public void setExitSharedElementCallback(androidx.core.app.SharedElementCallback?);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void supportFinishAfterTransition();
     method @Deprecated public void supportInvalidateOptionsMenu();
     method public void supportPostponeEnterTransition();
@@ -258,12 +258,12 @@
     method public int onGetWindowAnimations();
     method public boolean onHasView();
     method public boolean onHasWindowAnimations();
-    method public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
+    method @Deprecated public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
     method public boolean onShouldSaveFragmentState(androidx.fragment.app.Fragment);
     method public boolean onShouldShowRequestPermissionRationale(String);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void onSupportInvalidateOptionsMenu();
   }
 
diff --git a/fragment/fragment/api/public_plus_experimental_current.txt b/fragment/fragment/api/public_plus_experimental_current.txt
index c10ccde..ee84b05 100644
--- a/fragment/fragment/api/public_plus_experimental_current.txt
+++ b/fragment/fragment/api/public_plus_experimental_current.txt
@@ -78,7 +78,7 @@
     method public final boolean isStateSaved();
     method public final boolean isVisible();
     method @Deprecated @CallSuper @MainThread public void onActivityCreated(android.os.Bundle?);
-    method public void onActivityResult(int, int, android.content.Intent?);
+    method @Deprecated public void onActivityResult(int, int, android.content.Intent?);
     method @CallSuper @MainThread public void onAttach(android.content.Context);
     method @Deprecated @CallSuper @MainThread public void onAttach(android.app.Activity);
     method @MainThread public void onAttachFragment(androidx.fragment.app.Fragment);
@@ -106,7 +106,7 @@
     method public void onPictureInPictureModeChanged(boolean);
     method @MainThread public void onPrepareOptionsMenu(android.view.Menu);
     method @MainThread public void onPrimaryNavigationFragmentChanged(boolean);
-    method public void onRequestPermissionsResult(int, String![], int[]);
+    method @Deprecated public void onRequestPermissionsResult(int, String![], int[]);
     method @CallSuper @MainThread public void onResume();
     method @MainThread public void onSaveInstanceState(android.os.Bundle);
     method @CallSuper @MainThread public void onStart();
@@ -118,7 +118,7 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultRegistry, androidx.activity.result.ActivityResultCallback<O!>);
     method public void registerForContextMenu(android.view.View);
-    method public final void requestPermissions(String![], int);
+    method @Deprecated public final void requestPermissions(String![], int);
     method public final androidx.fragment.app.FragmentActivity requireActivity();
     method public final android.os.Bundle requireArguments();
     method public final android.content.Context requireContext();
@@ -146,9 +146,9 @@
     method public boolean shouldShowRequestPermissionRationale(String);
     method public void startActivity(android.content.Intent!);
     method public void startActivity(android.content.Intent!, android.os.Bundle?);
-    method public void startActivityForResult(android.content.Intent!, int);
-    method public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int);
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
+    method @Deprecated public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void startPostponedEnterTransition();
     method public void unregisterForContextMenu(android.view.View);
   }
@@ -177,7 +177,7 @@
     method public void setExitSharedElementCallback(androidx.core.app.SharedElementCallback?);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void supportFinishAfterTransition();
     method @Deprecated public void supportInvalidateOptionsMenu();
     method public void supportPostponeEnterTransition();
@@ -258,12 +258,12 @@
     method public int onGetWindowAnimations();
     method public boolean onHasView();
     method public boolean onHasWindowAnimations();
-    method public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
+    method @Deprecated public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
     method public boolean onShouldSaveFragmentState(androidx.fragment.app.Fragment);
     method public boolean onShouldShowRequestPermissionRationale(String);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void onSupportInvalidateOptionsMenu();
   }
 
diff --git a/fragment/fragment/api/restricted_1.3.0-alpha04.txt b/fragment/fragment/api/restricted_1.3.0-alpha04.txt
index 8304276..075b569 100644
--- a/fragment/fragment/api/restricted_1.3.0-alpha04.txt
+++ b/fragment/fragment/api/restricted_1.3.0-alpha04.txt
@@ -82,7 +82,7 @@
     method public final boolean isStateSaved();
     method public final boolean isVisible();
     method @Deprecated @CallSuper @MainThread public void onActivityCreated(android.os.Bundle?);
-    method public void onActivityResult(int, int, android.content.Intent?);
+    method @Deprecated public void onActivityResult(int, int, android.content.Intent?);
     method @CallSuper @MainThread public void onAttach(android.content.Context);
     method @Deprecated @CallSuper @MainThread public void onAttach(android.app.Activity);
     method @MainThread public void onAttachFragment(androidx.fragment.app.Fragment);
@@ -110,7 +110,7 @@
     method public void onPictureInPictureModeChanged(boolean);
     method @MainThread public void onPrepareOptionsMenu(android.view.Menu);
     method @MainThread public void onPrimaryNavigationFragmentChanged(boolean);
-    method public void onRequestPermissionsResult(int, String![], int[]);
+    method @Deprecated public void onRequestPermissionsResult(int, String![], int[]);
     method @CallSuper @MainThread public void onResume();
     method @MainThread public void onSaveInstanceState(android.os.Bundle);
     method @CallSuper @MainThread public void onStart();
@@ -122,7 +122,7 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultRegistry, androidx.activity.result.ActivityResultCallback<O!>);
     method public void registerForContextMenu(android.view.View);
-    method public final void requestPermissions(String![], int);
+    method @Deprecated public final void requestPermissions(String![], int);
     method public final androidx.fragment.app.FragmentActivity requireActivity();
     method public final android.os.Bundle requireArguments();
     method public final android.content.Context requireContext();
@@ -150,9 +150,9 @@
     method public boolean shouldShowRequestPermissionRationale(String);
     method public void startActivity(android.content.Intent!);
     method public void startActivity(android.content.Intent!, android.os.Bundle?);
-    method public void startActivityForResult(android.content.Intent!, int);
-    method public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int);
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
+    method @Deprecated public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void startPostponedEnterTransition();
     method public void unregisterForContextMenu(android.view.View);
   }
@@ -182,7 +182,7 @@
     method public void setExitSharedElementCallback(androidx.core.app.SharedElementCallback?);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void supportFinishAfterTransition();
     method @Deprecated public void supportInvalidateOptionsMenu();
     method public void supportPostponeEnterTransition();
@@ -263,12 +263,12 @@
     method public int onGetWindowAnimations();
     method public boolean onHasView();
     method public boolean onHasWindowAnimations();
-    method public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
+    method @Deprecated public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
     method public boolean onShouldSaveFragmentState(androidx.fragment.app.Fragment);
     method public boolean onShouldShowRequestPermissionRationale(String);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void onSupportInvalidateOptionsMenu();
   }
 
diff --git a/fragment/fragment/api/restricted_current.txt b/fragment/fragment/api/restricted_current.txt
index 8304276..075b569 100644
--- a/fragment/fragment/api/restricted_current.txt
+++ b/fragment/fragment/api/restricted_current.txt
@@ -82,7 +82,7 @@
     method public final boolean isStateSaved();
     method public final boolean isVisible();
     method @Deprecated @CallSuper @MainThread public void onActivityCreated(android.os.Bundle?);
-    method public void onActivityResult(int, int, android.content.Intent?);
+    method @Deprecated public void onActivityResult(int, int, android.content.Intent?);
     method @CallSuper @MainThread public void onAttach(android.content.Context);
     method @Deprecated @CallSuper @MainThread public void onAttach(android.app.Activity);
     method @MainThread public void onAttachFragment(androidx.fragment.app.Fragment);
@@ -110,7 +110,7 @@
     method public void onPictureInPictureModeChanged(boolean);
     method @MainThread public void onPrepareOptionsMenu(android.view.Menu);
     method @MainThread public void onPrimaryNavigationFragmentChanged(boolean);
-    method public void onRequestPermissionsResult(int, String![], int[]);
+    method @Deprecated public void onRequestPermissionsResult(int, String![], int[]);
     method @CallSuper @MainThread public void onResume();
     method @MainThread public void onSaveInstanceState(android.os.Bundle);
     method @CallSuper @MainThread public void onStart();
@@ -122,7 +122,7 @@
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultCallback<O!>);
     method public final <I, O> androidx.activity.result.ActivityResultLauncher<I!> registerForActivityResult(androidx.activity.result.contract.ActivityResultContract<I!,O!>, androidx.activity.result.ActivityResultRegistry, androidx.activity.result.ActivityResultCallback<O!>);
     method public void registerForContextMenu(android.view.View);
-    method public final void requestPermissions(String![], int);
+    method @Deprecated public final void requestPermissions(String![], int);
     method public final androidx.fragment.app.FragmentActivity requireActivity();
     method public final android.os.Bundle requireArguments();
     method public final android.content.Context requireContext();
@@ -150,9 +150,9 @@
     method public boolean shouldShowRequestPermissionRationale(String);
     method public void startActivity(android.content.Intent!);
     method public void startActivity(android.content.Intent!, android.os.Bundle?);
-    method public void startActivityForResult(android.content.Intent!, int);
-    method public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int);
+    method @Deprecated public void startActivityForResult(android.content.Intent!, int, android.os.Bundle?);
+    method @Deprecated public void startIntentSenderForResult(android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void startPostponedEnterTransition();
     method public void unregisterForContextMenu(android.view.View);
   }
@@ -182,7 +182,7 @@
     method public void setExitSharedElementCallback(androidx.core.app.SharedElementCallback?);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void supportFinishAfterTransition();
     method @Deprecated public void supportInvalidateOptionsMenu();
     method public void supportPostponeEnterTransition();
@@ -263,12 +263,12 @@
     method public int onGetWindowAnimations();
     method public boolean onHasView();
     method public boolean onHasWindowAnimations();
-    method public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
+    method @Deprecated public void onRequestPermissionsFromFragment(androidx.fragment.app.Fragment, String![], int);
     method public boolean onShouldSaveFragmentState(androidx.fragment.app.Fragment);
     method public boolean onShouldShowRequestPermissionRationale(String);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int);
     method public void onStartActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent!, int, android.os.Bundle?);
-    method public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
+    method @Deprecated public void onStartIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender!, int, android.content.Intent?, int, int, int, android.os.Bundle?) throws android.content.IntentSender.SendIntentException;
     method public void onSupportInvalidateOptionsMenu();
   }
 
diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentInflatedChildTest.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentInflatedChildTest.kt
index 7ef6461..f1d2511 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentInflatedChildTest.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentInflatedChildTest.kt
@@ -81,36 +81,54 @@
     @Test
     fun testInflatedChildDialogFragment() {
         with(ActivityScenario.launch(SimpleContainerActivity::class.java)) {
-            val dialogFragment = TestInflatedChildDialogFragment(
+            val dialogFragment = TestInflatedChildDialogFragment.newInstance(
                 false, inflatedView.getLayoutId(), inflateLocation is OnCreateDialog)
 
             withActivity {
                 supportFragmentManager.beginTransaction()
-                    .add(dialogFragment, null)
+                    .add(dialogFragment, "dialog")
                     .commitNow()
             }
 
             val child = inflatedView.getChildFragment(dialogFragment)
             assertWithMessage("Inflated child fragment should not be null")
                 .that(child).isNotNull()
+
+            recreate()
+
+            val recreatedDialogFragment = withActivity {
+                supportFragmentManager.findFragmentByTag("dialog") as DialogFragment
+            }
+            val recreatedChild = inflatedView.getChildFragment(recreatedDialogFragment)
+            assertWithMessage("Inflated child fragment should not be null")
+                .that(recreatedChild).isNotNull()
         }
     }
 
     @Test
     fun testInflatedChildAppCompatDialogFragment() {
         with(ActivityScenario.launch(TestAppCompatActivity::class.java)) {
-            val dialogFragment = TestInflatedChildDialogFragment(
+            val dialogFragment = TestInflatedChildDialogFragment.newInstance(
                 true, inflatedView.getLayoutId(), inflateLocation is OnCreateDialog)
 
             withActivity {
                 supportFragmentManager.beginTransaction()
-                    .add(dialogFragment, null)
+                    .add(dialogFragment, "dialog")
                     .commitNow()
             }
 
             val child = inflatedView.getChildFragment(dialogFragment)
             assertWithMessage("Inflated child fragment should not be null")
                 .that(child).isNotNull()
+
+            recreate()
+
+            val recreatedDialogFragment = withActivity {
+                supportFragmentManager.findFragmentByTag("dialog") as DialogFragment
+            }
+            val recreatedChild = inflatedView.getChildFragment(recreatedDialogFragment)
+            assertWithMessage("Inflated child fragment should not be null")
+                .that(recreatedChild).isNotNull()
         }
     }
 }
@@ -118,11 +136,29 @@
 // This Activity has an AppCompatTheme
 class TestAppCompatActivity : AppCompatActivity(R.layout.simple_container)
 
-class TestInflatedChildDialogFragment(
-    val useAppCompat: Boolean,
-    val layoutId: Int,
-    val onCreateDialog: Boolean
-) : DialogFragment() {
+class TestInflatedChildDialogFragment : DialogFragment() {
+
+    companion object {
+        private const val USE_APP_COMPAT_KEY = "USE_APP_COMPAT"
+        private const val LAYOUT_ID_KEY = "LAYOUT_ID"
+        private const val ON_CREATE_DIALOG_KEY = "ON_CREATE_DIALOG"
+
+        fun newInstance(
+            useAppCompat: Boolean,
+            layoutId: Int,
+            onCreateDialog: Boolean
+        ) = TestInflatedChildDialogFragment().apply {
+            arguments = Bundle().apply {
+                putBoolean(USE_APP_COMPAT_KEY, useAppCompat)
+                putInt(LAYOUT_ID_KEY, layoutId)
+                putBoolean(ON_CREATE_DIALOG_KEY, onCreateDialog)
+            }
+        }
+    }
+
+    private val useAppCompat get() = requireArguments().getBoolean(USE_APP_COMPAT_KEY)
+    private val layoutId get() = requireArguments().getInt(LAYOUT_ID_KEY, 0)
+    private val onCreateDialog get() = requireArguments().getBoolean(ON_CREATE_DIALOG_KEY)
 
     override fun onCreateView(
         inflater: LayoutInflater,
diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.kt
index ba3314d..11e20cc 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.kt
@@ -63,6 +63,35 @@
     }
 
     @Test
+    fun testFragmentAdditionDuringOnStopViewLifecycle() {
+        with(ActivityScenario.launch(EmptyFragmentTestActivity::class.java)) {
+            val fm = withActivity { supportFragmentManager }
+            val activityLifecycle = withActivity { lifecycle }
+
+            val first = StrictViewFragment()
+            val second = StrictFragment()
+            fm.beginTransaction().add(android.R.id.content, first).commit()
+            executePendingTransactions()
+            first.viewLifecycleOwner.lifecycle.addObserver(object : LifecycleEventObserver {
+                override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+                    if (event == Lifecycle.Event.ON_STOP) {
+                        fm.beginTransaction().add(second, "second").commitNow()
+                        first.viewLifecycleOwner.lifecycle.removeObserver(this)
+                    }
+                }
+            })
+            onActivity {
+                it.onSaveInstanceState(Bundle())
+            }
+            assertThat(first.lifecycle.currentState).isEqualTo(Lifecycle.State.CREATED)
+            assertThat(first.viewLifecycleOwner.lifecycle.currentState)
+                .isEqualTo(Lifecycle.State.CREATED)
+            assertThat(second.lifecycle.currentState).isEqualTo(Lifecycle.State.CREATED)
+            assertThat(activityLifecycle.currentState).isEqualTo(Lifecycle.State.CREATED)
+        }
+    }
+
+    @Test
     fun testNestedFragmentLifecycle() {
         with(ActivityScenario.launch(FragmentArchLifecycleActivity::class.java)) {
 
diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.kt
index 03c660d..c5bf781 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.kt
@@ -64,40 +64,56 @@
     fun testStartActivityForResultOk() {
         startActivityForResult(10, Activity.RESULT_OK, "content 10")
 
-        assertWithMessage("Fragment should receive result").that(fragment.hasResult).isTrue()
-        assertThat(fragment.requestCode).isEqualTo(10)
-        assertThat(fragment.resultCode).isEqualTo(Activity.RESULT_OK)
-        assertThat(fragment.resultContent).isEqualTo("content 10")
+        assertWithMessage("Fragment should receive result").that(fragment.hasResult[0]).isTrue()
+        assertThat(fragment.requestCode[0]).isEqualTo(10)
+        assertThat(fragment.resultCode[0]).isEqualTo(Activity.RESULT_OK)
+        assertThat(fragment.resultContent[0]).isEqualTo("content 10")
+    }
+
+    @Test
+    fun testMultipleStartActivityForResultOk() {
+        startActivityForResult(10, Activity.RESULT_OK, "content 10")
+        startActivityForResult(20, Activity.RESULT_OK, "content 20")
+
+        assertWithMessage("Fragment should receive result").that(fragment.hasResult[0]).isTrue()
+        assertThat(fragment.requestCode[0]).isEqualTo(10)
+        assertThat(fragment.resultCode[0]).isEqualTo(Activity.RESULT_OK)
+        assertThat(fragment.resultContent[0]).isEqualTo("content 10")
+
+        assertWithMessage("Fragment should receive result").that(fragment.hasResult[1]).isTrue()
+        assertThat(fragment.requestCode[1]).isEqualTo(20)
+        assertThat(fragment.resultCode[1]).isEqualTo(Activity.RESULT_OK)
+        assertThat(fragment.resultContent[1]).isEqualTo("content 20")
     }
 
     @Test
     fun testStartActivityForResultCanceled() {
         startActivityForResult(20, Activity.RESULT_CANCELED, "content 20")
 
-        assertWithMessage("Fragment should receive result").that(fragment.hasResult).isTrue()
-        assertThat(fragment.requestCode).isEqualTo(20)
-        assertThat(fragment.resultCode).isEqualTo(Activity.RESULT_CANCELED)
-        assertThat(fragment.resultContent).isEqualTo("content 20")
+        assertWithMessage("Fragment should receive result").that(fragment.hasResult[0]).isTrue()
+        assertThat(fragment.requestCode[0]).isEqualTo(20)
+        assertThat(fragment.resultCode[0]).isEqualTo(Activity.RESULT_CANCELED)
+        assertThat(fragment.resultContent[0]).isEqualTo("content 20")
     }
 
     @Test
     fun testStartIntentSenderForResultOk() {
         startIntentSenderForResult(30, Activity.RESULT_OK, "content 30")
 
-        assertWithMessage("Fragment should receive result").that(fragment.hasResult).isTrue()
-        assertThat(fragment.requestCode).isEqualTo(30)
-        assertThat(fragment.resultCode).isEqualTo(Activity.RESULT_OK)
-        assertThat(fragment.resultContent).isEqualTo("content 30")
+        assertWithMessage("Fragment should receive result").that(fragment.hasResult[0]).isTrue()
+        assertThat(fragment.requestCode[0]).isEqualTo(30)
+        assertThat(fragment.resultCode[0]).isEqualTo(Activity.RESULT_OK)
+        assertThat(fragment.resultContent[0]).isEqualTo("content 30")
     }
 
     @Test
     fun testStartIntentSenderForResultCanceled() {
         startIntentSenderForResult(40, Activity.RESULT_CANCELED, "content 40")
 
-        assertWithMessage("Fragment should receive result").that(fragment.hasResult).isTrue()
-        assertThat(fragment.requestCode).isEqualTo(40)
-        assertThat(fragment.resultCode).isEqualTo(Activity.RESULT_CANCELED)
-        assertThat(fragment.resultContent).isEqualTo("content 40")
+        assertWithMessage("Fragment should receive result").that(fragment.hasResult[0]).isTrue()
+        assertThat(fragment.requestCode[0]).isEqualTo(40)
+        assertThat(fragment.resultCode[0]).isEqualTo(Activity.RESULT_CANCELED)
+        assertThat(fragment.resultContent[0]).isEqualTo("content 40")
     }
 
     @Test
@@ -132,6 +148,7 @@
         return fragment
     }
 
+    @Suppress("DEPRECATION")
     private fun startActivityForResult(
         requestCode: Int,
         resultCode: Int,
@@ -144,10 +161,12 @@
 
             fragment.startActivityForResult(intent, requestCode)
         }
-        assertThat(fragment.resultReceiveLatch.await(1, TimeUnit.SECONDS)).isTrue()
+        assertThat(fragment.resultReceiveLatch[fragment.onActivityResultCount]
+            .await(1, TimeUnit.SECONDS)).isTrue()
         InstrumentationRegistry.getInstrumentation().waitForIdleSync()
     }
 
+    @Suppress("DEPRECATION")
     private fun startIntentSenderForResult(
         requestCode: Int,
         resultCode: Int,
@@ -169,23 +188,25 @@
                 fail("IntentSender failed")
             }
         }
-        assertThat(fragment.resultReceiveLatch.await(1, TimeUnit.SECONDS)).isTrue()
+        assertThat(fragment.resultReceiveLatch[0].await(1, TimeUnit.SECONDS)).isTrue()
         InstrumentationRegistry.getInstrumentation().waitForIdleSync()
     }
 
     class TestFragment : Fragment() {
-        internal var hasResult = false
-        internal var requestCode = -1
-        internal var resultCode = 100
-        internal lateinit var resultContent: String
-        internal val resultReceiveLatch = CountDownLatch(1)
+        internal val hasResult = ArrayList<Boolean>()
+        internal val requestCode = ArrayList<Int>()
+        internal val resultCode = ArrayList<Int>()
+        internal val resultContent = ArrayList<String>()
+        internal val resultReceiveLatch = arrayListOf(CountDownLatch(1), CountDownLatch(1))
+        internal var onActivityResultCount = 0
 
         override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-            hasResult = true
-            this.requestCode = requestCode
-            this.resultCode = resultCode
-            resultContent = data!!.getStringExtra(FragmentResultActivity.EXTRA_RESULT_CONTENT)!!
-            resultReceiveLatch.countDown()
+            hasResult.add(true)
+            this.requestCode.add(requestCode)
+            this.resultCode.add(resultCode)
+            resultContent.add(data!!.getStringExtra(FragmentResultActivity.EXTRA_RESULT_CONTENT)!!)
+            resultReceiveLatch[onActivityResultCount].countDown()
+            onActivityResultCount++
         }
     }
 }
diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.kt
index dba95bc..9c75824 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.kt
@@ -35,6 +35,7 @@
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
+@Suppress("DEPRECATION")
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class NestedFragmentTest {
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/DialogFragment.java b/fragment/fragment/src/main/java/androidx/fragment/app/DialogFragment.java
index a80f5e2..9721ede 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/DialogFragment.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/DialogFragment.java
@@ -477,6 +477,40 @@
         }
     }
 
+    @NonNull
+    @Override
+    FragmentContainer createFragmentContainer() {
+        final FragmentContainer fragmentContainer = super.createFragmentContainer();
+        return new FragmentContainer() {
+            @Nullable
+            @Override
+            public View onFindViewById(int id) {
+                View dialogView = DialogFragment.this.onFindViewById(id);
+                if (dialogView != null) {
+                    return dialogView;
+                }
+                return fragmentContainer.onFindViewById(id);
+            }
+
+            @Override
+            public boolean onHasView() {
+                return DialogFragment.this.onHasView() || fragmentContainer.onHasView();
+            }
+        };
+    }
+
+    @Nullable
+    View onFindViewById(int id) {
+        if (mDialog != null) {
+            return mDialog.findViewById(id);
+        }
+        return null;
+    }
+
+    boolean onHasView() {
+        return mDialogCreated;
+    }
+
     /**
      * {@inheritDoc}
      *
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 eb6200b..b4fd940 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
@@ -54,7 +54,11 @@
 import androidx.activity.result.ActivityResultCaller;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.ActivityResultRegistry;
+import androidx.activity.result.ActivityResultRegistryOwner;
 import androidx.activity.result.contract.ActivityResultContract;
+import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
+import androidx.activity.result.contract.ActivityResultContracts.StartIntentSenderForResult;
 import androidx.annotation.CallSuper;
 import androidx.annotation.ContentView;
 import androidx.annotation.LayoutRes;
@@ -433,7 +437,7 @@
      * through {@link FragmentManager#saveFragmentInstanceState(Fragment)
      * FragmentManager.saveFragmentInstanceState}.
      */
-    @SuppressLint("BanParcelableUsage")
+    @SuppressLint("BanParcelableUsage, ParcelClassLoader")
     public static class SavedState implements Parcelable {
         final Bundle mState;
 
@@ -601,6 +605,7 @@
         }
     }
 
+    @SuppressWarnings("ConstantConditions")
     final void restoreViewState(Bundle savedInstanceState) {
         if (mSavedViewState != null) {
             mView.restoreHierarchyState(mSavedViewState);
@@ -812,6 +817,7 @@
      * {@link FragmentManager#setFragmentResultListener(String, LifecycleOwner,
      * FragmentResultListener)}.
      */
+    @SuppressWarnings("DeprecatedIsStillUsed")
     @Nullable
     @Deprecated
     final public Fragment getTargetFragment() {
@@ -1343,7 +1349,19 @@
     /**
      * Call {@link Activity#startActivityForResult(Intent, int)} from the fragment's
      * containing Activity.
+     *
+     * @param intent The intent to start.
+     * @param requestCode The request code to be returned in
+     * {@link Fragment#onActivityResult(int, int, Intent)} when the activity exits. Must be
+     *                    between 0 and 65535 to be considered valid. If given requestCode is
+     *                    greater than 65535, an IllegalArgumentException would be thrown.
+     *
+     * @deprecated use
+     * {@link #registerForActivityResult(ActivityResultContract, ActivityResultCallback)}
+     * passing in a {@link StartActivityForResult} object for the {@link ActivityResultContract}.
      */
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public void startActivityForResult(@SuppressLint("UnknownNullness") Intent intent,
             int requestCode) {
         startActivityForResult(intent, requestCode, null);
@@ -1352,7 +1370,20 @@
     /**
      * Call {@link Activity#startActivityForResult(Intent, int, Bundle)} from the fragment's
      * containing Activity.
+     *
+     * @param intent The intent to start.
+     * @param requestCode The request code to be returned in
+     * {@link Fragment#onActivityResult(int, int, Intent)} when the activity exits. Must be
+     *                    between 0 and 65535 to be considered valid. If given requestCode is
+     *                    greater than 65535, an IllegalArgumentException would be thrown.
+     * @param options Additional options for how the Activity should be started. See
+     * {@link Context#startActivity(Intent, Bundle)} for more details. This value may be null.
+     *
+     * @deprecated use
+     * {@link #registerForActivityResult(ActivityResultContract, ActivityResultCallback)}
+     * passing in a {@link StartActivityForResult} object for the {@link ActivityResultContract}.
      */
+    @Deprecated
     public void startActivityForResult(@SuppressLint("UnknownNullness") Intent intent,
             int requestCode, @Nullable Bundle options) {
         if (mHost == null) {
@@ -1364,7 +1395,28 @@
     /**
      * Call {@link Activity#startIntentSenderForResult(IntentSender, int, Intent, int, int, int,
      * Bundle)} from the fragment's containing Activity.
+     *
+     * @param intent The IntentSender to launch.
+     * @param requestCode The request code to be returned in
+     * {@link Fragment#onActivityResult(int, int, Intent)} when the activity exits. Must be
+     *                    between 0 and 65535 to be considered valid. If given requestCode is
+     *                    greater than 65535, an IllegalArgumentException would be thrown.
+     * @param fillInIntent If non-null, this will be provided as the intent parameter to
+     * {@link IntentSender#sendIntent(Context, int, Intent, IntentSender.OnFinished, Handler)}.
+     *                     This value may be null.
+     * @param flagsMask Intent flags in the original IntentSender that you would like to change.
+     * @param flagsValues Desired values for any bits set in <code>flagsMask</code>.
+     * @param extraFlags Always set to 0.
+     * @param options Additional options for how the Activity should be started. See
+     * {@link Context#startActivity(Intent, Bundle)} for more details. This value may be null.
+     *
+     * @deprecated use
+     * {@link #registerForActivityResult(ActivityResultContract, ActivityResultCallback)}
+     * passing in a {@link StartIntentSenderForResult} object for the
+     * {@link ActivityResultContract}.
      */
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public void startIntentSenderForResult(@SuppressLint("UnknownNullness") IntentSender intent,
             int requestCode, @Nullable Intent fillInIntent, int flagsMask, int flagsValues,
             int extraFlags, @Nullable Bundle options) throws IntentSender.SendIntentException {
@@ -1388,7 +1440,14 @@
      *                   through its setResult().
      * @param data An Intent, which can return result data to the caller
      *               (various data can be attached to Intent "extras").
+     *
+     * @deprecated use
+     * {@link #registerForActivityResult(ActivityResultContract, ActivityResultCallback)}
+     * with the appropriate {@link ActivityResultContract} and handling the result in the
+     * {@link ActivityResultCallback#onActivityResult(Object) callback}.
      */
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    @Deprecated
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
     }
 
@@ -1459,12 +1518,20 @@
      * </code></pre></p>
      *
      * @param permissions The requested permissions.
-     * @param requestCode Application specific request code to match with a result
-     *    reported to {@link #onRequestPermissionsResult(int, String[], int[])}.
+     * @param requestCode Application specific request code to match with a result reported to
+     * {@link #onRequestPermissionsResult(int, String[], int[])}. Must be between 0 and 65535 to
+     *                    be considered valid. If given requestCode is greater than 65535, an
+     *                    IllegalArgumentException would be thrown.
      *
      * @see #onRequestPermissionsResult(int, String[], int[])
      * @see android.content.Context#checkSelfPermission(String)
+     * @deprecated use
+     * {@link #registerForActivityResult(ActivityResultContract, ActivityResultCallback)} passing
+     * in a {@link RequestMultiplePermissions} object for the {@link ActivityResultContract} and
+     * handling the result in the {@link ActivityResultCallback#onActivityResult(Object) callback}.
      */
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public final void requestPermissions(@NonNull String[] permissions, int requestCode) {
         if (mHost == null) {
             throw new IllegalStateException("Fragment " + this + " not attached to Activity");
@@ -1488,7 +1555,14 @@
      *     or {@link android.content.pm.PackageManager#PERMISSION_DENIED}. Never null.
      *
      * @see #requestPermissions(String[], int)
+     *
+     * @deprecated use
+     * {@link #registerForActivityResult(ActivityResultContract, ActivityResultCallback)} passing
+     * in a {@link RequestMultiplePermissions} object for the {@link ActivityResultContract} and
+     * handling the result in the {@link ActivityResultCallback#onActivityResult(Object) callback}.
      */
+    @SuppressWarnings({"DeprecatedIsStillUsed", "unused"})
+    @Deprecated
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
             @NonNull int[] grantResults) {
         /* callback - do nothing */
@@ -1529,6 +1603,7 @@
      * a previous saved state, this is the state.
      * @return The LayoutInflater used to inflate Views of this Fragment.
      */
+    @SuppressWarnings("deprecation")
     @NonNull
     public LayoutInflater onGetLayoutInflater(@Nullable Bundle savedInstanceState) {
         // TODO: move the implementation in getLayoutInflater to here
@@ -1564,8 +1639,7 @@
      */
     @NonNull
     LayoutInflater performGetLayoutInflater(@Nullable Bundle savedInstanceState) {
-        LayoutInflater layoutInflater = onGetLayoutInflater(savedInstanceState);
-        mLayoutInflater = layoutInflater;
+        mLayoutInflater = onGetLayoutInflater(savedInstanceState);
         return mLayoutInflater;
     }
 
@@ -1578,6 +1652,7 @@
      * @deprecated Override {@link #onGetLayoutInflater(Bundle)} or call
      * {@link #getLayoutInflater()} instead of this method.
      */
+    @SuppressWarnings({"DeprecatedIsStillUsed", "unused"})
     @Deprecated
     @NonNull
     @RestrictTo(LIBRARY_GROUP_PREFIX)
@@ -1632,6 +1707,7 @@
      * @param savedInstanceState If the fragment is being re-created from
      * a previous saved state, this is the state.
      */
+    @SuppressWarnings("deprecation")
     @UiThread
     @CallSuper
     public void onInflate(@NonNull Context context, @NonNull AttributeSet attrs,
@@ -1650,6 +1726,7 @@
      *
      * @deprecated See {@link #onInflate(Context, AttributeSet, Bundle)}.
      */
+    @SuppressWarnings({"DeprecatedIsStillUsed", "unused"})
     @Deprecated
     @UiThread
     @CallSuper
@@ -1667,6 +1744,7 @@
      *
      * @param childFragment child fragment being attached
      */
+    @SuppressWarnings("unused")
     @MainThread
     public void onAttachFragment(@NonNull Fragment childFragment) {
     }
@@ -1675,6 +1753,7 @@
      * Called when a fragment is first attached to its context.
      * {@link #onCreate(Bundle)} will be called after this.
      */
+    @SuppressWarnings("deprecation")
     @MainThread
     @CallSuper
     public void onAttach(@NonNull Context context) {
@@ -1692,6 +1771,7 @@
      *
      * @deprecated See {@link #onAttach(Context)}.
      */
+    @SuppressWarnings({"unused", "DeprecatedIsStillUsed"})
     @Deprecated
     @MainThread
     @CallSuper
@@ -1889,6 +1969,7 @@
      * {@link Lifecycle} in {@link #onAttach(Context)}, removing it when it receives the
      * {@link Lifecycle.State#CREATED} callback.
      */
+    @SuppressWarnings({"DeprecatedIsStillUsed", "unused"})
     @MainThread
     @CallSuper
     @Deprecated
@@ -1965,6 +2046,7 @@
      *
      * @param isInMultiWindowMode True if the activity is in multi-window mode.
      */
+    @SuppressWarnings("unused")
     public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
     }
 
@@ -1974,6 +2056,7 @@
      *
      * @param isInPictureInPictureMode True if the activity is in picture-in-picture mode.
      */
+    @SuppressWarnings("unused")
     public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
     }
 
@@ -2151,6 +2234,7 @@
      *
      * @see #onCreateOptionsMenu
      */
+    @SuppressWarnings("unused")
     @MainThread
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         return false;
@@ -2163,6 +2247,7 @@
      * @param menu The options menu as last shown or first initialized by
      *             onCreateOptionsMenu().
      */
+    @SuppressWarnings("unused")
     @MainThread
     public void onOptionsMenuClosed(@NonNull Menu menu) {
     }
@@ -2233,6 +2318,7 @@
      * @return boolean Return false to allow normal context menu processing to
      *         proceed, true to consume it here.
      */
+    @SuppressWarnings("unused")
     @MainThread
     public boolean onContextItemSelected(@NonNull MenuItem item) {
         return false;
@@ -2746,8 +2832,9 @@
         return mChildFragmentManager.findFragmentByWho(who);
     }
 
-    void performAttach() {
-        mChildFragmentManager.attachController(mHost, new FragmentContainer() {
+    @NonNull
+    FragmentContainer createFragmentContainer() {
+        return new FragmentContainer() {
             @Override
             @Nullable
             public View onFindViewById(int id) {
@@ -2761,7 +2848,11 @@
             public boolean onHasView() {
                 return (mView != null);
             }
-        }, this);
+        };
+    }
+
+    void performAttach() {
+        mChildFragmentManager.attachController(mHost, createFragmentContainer(), this);
         mState = ATTACHED;
         mCalled = false;
         onAttach(mHost.getContext());
@@ -2828,6 +2919,7 @@
         mChildFragmentManager.dispatchActivityCreated();
     }
 
+    @SuppressWarnings("ConstantConditions")
     void performStart() {
         mChildFragmentManager.noteStateNotSaved();
         mChildFragmentManager.execPendingActions(true);
@@ -2845,6 +2937,7 @@
         mChildFragmentManager.dispatchStart();
     }
 
+    @SuppressWarnings("ConstantConditions")
     void performResume() {
         mChildFragmentManager.noteStateNotSaved();
         mChildFragmentManager.execPendingActions(true);
@@ -2937,9 +3030,7 @@
                     return true;
                 }
             }
-            if (mChildFragmentManager.dispatchOptionsItemSelected(item)) {
-                return true;
-            }
+            return mChildFragmentManager.dispatchOptionsItemSelected(item);
         }
         return false;
     }
@@ -2949,9 +3040,7 @@
             if (onContextItemSelected(item)) {
                 return true;
             }
-            if (mChildFragmentManager.dispatchContextItemSelected(item)) {
-                return true;
-            }
+            return mChildFragmentManager.dispatchContextItemSelected(item);
         }
         return false;
     }
@@ -2974,6 +3063,7 @@
         }
     }
 
+    @SuppressWarnings("ConstantConditions")
     void performPause() {
         mChildFragmentManager.dispatchPause();
         if (mView != null) {
@@ -2989,6 +3079,7 @@
         }
     }
 
+    @SuppressWarnings("ConstantConditions")
     void performStop() {
         mChildFragmentManager.dispatchStop();
         if (mView != null) {
@@ -3004,6 +3095,7 @@
         }
     }
 
+    @SuppressWarnings("ConstantConditions")
     void performDestroyView() {
         mChildFragmentManager.dispatchDestroyView();
         if (mView != null) {
@@ -3163,6 +3255,14 @@
         ensureAnimationInfo().mIsHideReplaced = replaced;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * <p>
+     * If the host of this fragment is an {@link ActivityResultRegistryOwner} the
+     * {@link ActivityResultRegistry} of the host will be used. Otherwise, this will use the
+     * registry of the Fragment's Activity.
+     */
     @NonNull
     @Override
     public final <I, O> ActivityResultLauncher<I> registerForActivityResult(
@@ -3171,6 +3271,9 @@
         return prepareCallInternal(contract, new Function<Void, ActivityResultRegistry>() {
             @Override
             public ActivityResultRegistry apply(Void input) {
+                if (mHost instanceof ActivityResultRegistryOwner) {
+                    return ((ActivityResultRegistryOwner) mHost).getActivityResultRegistry();
+                }
                 return requireActivity().getActivityResultRegistry();
             }
         }, callback);
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentActivity.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentActivity.java
index 533937a..571c221 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentActivity.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentActivity.java
@@ -16,6 +16,7 @@
 
 package androidx.fragment.app;
 
+import static androidx.activity.result.contract.ActivityResultContracts.StartIntentSenderForResult;
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX;
 
 import android.annotation.SuppressLint;
@@ -25,6 +26,7 @@
 import android.content.IntentSender;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.Parcelable;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -37,6 +39,10 @@
 import androidx.activity.ComponentActivity;
 import androidx.activity.OnBackPressedDispatcher;
 import androidx.activity.OnBackPressedDispatcherOwner;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultRegistry;
+import androidx.activity.result.ActivityResultRegistryOwner;
+import androidx.activity.result.contract.ActivityResultContract;
 import androidx.annotation.CallSuper;
 import androidx.annotation.ContentView;
 import androidx.annotation.LayoutRes;
@@ -149,6 +155,7 @@
     /**
      * Dispatch incoming result to the correct fragment.
      */
+    @SuppressWarnings("deprecation")
     @Override
     @CallSuper
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
@@ -403,10 +410,8 @@
      */
     @Override
     public void onPanelClosed(int featureId, @NonNull Menu menu) {
-        switch (featureId) {
-            case Window.FEATURE_OPTIONS_PANEL:
-                mFragments.dispatchOptionsMenuClosed(menu);
-                break;
+        if (featureId == Window.FEATURE_OPTIONS_PANEL) {
+            mFragments.dispatchOptionsMenuClosed(menu);
         }
         super.onPanelClosed(featureId, menu);
     }
@@ -655,6 +660,12 @@
     /**
      * Modifies the standard behavior to allow results to be delivered to fragments.
      * This imposes a restriction that requestCode be <= 0xffff.
+     *
+     * @param intent The intent to start.
+     * @param requestCode The request code to be returned in
+     * {@link Fragment#onActivityResult(int, int, Intent)} when the activity exits. Must be
+     *                    between 0 and 65535 to be considered valid. If given requestCode is
+     *                    greater than 65535, an IllegalArgumentException would be thrown.
      */
     @Override
     public void startActivityForResult(@SuppressLint("UnknownNullness") Intent intent,
@@ -669,6 +680,17 @@
         super.startActivityForResult(intent, requestCode);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @param intent The intent to start.
+     * @param requestCode The request code to be returned in
+     * {@link Fragment#onActivityResult(int, int, Intent)} when the activity exits. Must be
+     *                    between 0 and 65535 to be considered valid. If given requestCode is
+     *                    greater than 65535, an IllegalArgumentException would be thrown.
+     * @param options Additional options for how the Activity should be started. See
+     * {@link Context#startActivity(Intent, Bundle)} for more details. This value may be null.
+     */
     @Override
     public void startActivityForResult(@SuppressLint("UnknownNullness") Intent intent,
             int requestCode, @Nullable Bundle options) {
@@ -682,6 +704,22 @@
         super.startActivityForResult(intent, requestCode, options);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @param intent The IntentSender to launch.
+     * @param requestCode The request code to be returned in
+     * {@link Fragment#onActivityResult(int, int, Intent)} when the activity exits. Must be
+     *                    between 0 and 65535 to be considered valid. If given requestCode is
+     *                    greater than 65535, an IllegalArgumentException would be thrown.
+     * @param fillInIntent If non-null, this will be provided as the intent parameter to
+     * {@link IntentSender#sendIntent(Context, int, Intent, IntentSender.OnFinished, Handler)}.
+     *                     This value may be null.
+     * @param flagsMask Intent flags in the original IntentSender that you would like to change.
+     * @param flagsValues Desired values for any bits set in <code>flagsMask</code>.
+     * @param extraFlags Always set to 0.
+     * @throws IntentSender.SendIntentException if the call fails to execute.
+     */
     @Override
     public void startIntentSenderForResult(@SuppressLint("UnknownNullness") IntentSender intent,
             int requestCode, @Nullable Intent fillInIntent, int flagsMask,
@@ -697,6 +735,24 @@
                 extraFlags);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @param intent The IntentSender to launch.
+     * @param requestCode The request code to be returned in
+     * {@link Fragment#onActivityResult(int, int, Intent)} when the activity exits. Must be
+     *                    between 0 and 65535 to be considered valid. If given requestCode is
+     *                    greater than 65535, an IllegalArgumentException would be thrown.
+     * @param fillInIntent If non-null, this will be provided as the intent parameter to
+     * {@link IntentSender#sendIntent(Context, int, Intent, IntentSender.OnFinished, Handler)}.
+     *                     This value may be null.
+     * @param flagsMask Intent flags in the original IntentSender that you would like to change.
+     * @param flagsValues Desired values for any bits set in <code>flagsMask</code>.
+     * @param extraFlags Always set to 0.
+     * @param options Additional options for how the Activity should be started. See
+     * {@link Context#startActivity(Intent, Bundle)} for more details. This value may be null.
+     * @throws IntentSender.SendIntentException if the call fails to execute.
+     */
     @Override
     public void startIntentSenderForResult(@SuppressLint("UnknownNullness") IntentSender intent,
             int requestCode, @Nullable Intent fillInIntent, int flagsMask, int flagsValues,
@@ -754,6 +810,7 @@
      *
      * @see #requestPermissions(String[], int)
      */
+    @SuppressWarnings("deprecation")
     @CallSuper
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
@@ -781,6 +838,13 @@
 
     /**
      * Called by Fragment.startActivityForResult() to implement its behavior.
+     *
+     * @param fragment the Fragment to start the activity from.
+     * @param intent The intent to start.
+     * @param requestCode The request code to be returned in
+     * {@link Fragment#onActivityResult(int, int, Intent)} when the activity exits. Must be
+     *                    between 0 and 65535 to be considered valid. If given requestCode is
+     *                    greater than 65535, an IllegalArgumentException would be thrown.
      */
     public void startActivityFromFragment(@NonNull Fragment fragment,
             @SuppressLint("UnknownNullness") Intent intent, int requestCode) {
@@ -789,6 +853,15 @@
 
     /**
      * Called by Fragment.startActivityForResult() to implement its behavior.
+     *
+     * @param fragment the Fragment to start the activity from.
+     * @param intent The intent to start.
+     * @param requestCode The request code to be returned in
+     * {@link Fragment#onActivityResult(int, int, Intent)} when the activity exits. Must be
+     *                    between 0 and 65535 to be considered valid. If given requestCode is
+     *                    greater than 65535, an IllegalArgumentException would be thrown.
+     * @param options Additional options for how the Activity should be started. See
+     * {@link Context#startActivity(Intent, Bundle)} for more details. This value may be null.
      */
     public void startActivityFromFragment(@NonNull Fragment fragment,
             @SuppressLint("UnknownNullness") Intent intent, int requestCode,
@@ -810,7 +883,30 @@
 
     /**
      * Called by Fragment.startIntentSenderForResult() to implement its behavior.
+     *
+     * @param fragment the Fragment to start the intent sender from.
+     * @param intent The IntentSender to launch.
+     * @param requestCode The request code to be returned in
+     * {@link Fragment#onActivityResult(int, int, Intent)} when the activity exits. Must be
+     *                    between 0 and 65535 to be considered valid. If given requestCode is
+     *                    greater than 65535, an IllegalArgumentException would be thrown.
+     * @param fillInIntent If non-null, this will be provided as the intent parameter to
+     * {@link IntentSender#sendIntent(Context, int, Intent, IntentSender.OnFinished, Handler)}.
+     *                     This value may be null.
+     * @param flagsMask Intent flags in the original IntentSender that you would like to change.
+     * @param flagsValues Desired values for any bits set in <code>flagsMask</code>.
+     * @param extraFlags Always set to 0.
+     * @param options Additional options for how the Activity should be started. See
+     * {@link Context#startActivity(Intent, Bundle)} for more details. This value may be null.
+     * @throws IntentSender.SendIntentException if the call fails to execute.
+     *
+     * @deprecated Fragments should use
+     * {@link Fragment#registerForActivityResult(ActivityResultContract, ActivityResultCallback)}
+     * with the {@link StartIntentSenderForResult} contract. This method will still be called when
+     * Fragments call the deprecated <code>startIntentSenderForResult()</code> method.
      */
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    @Deprecated
     public void startIntentSenderFromFragment(@NonNull Fragment fragment,
             @SuppressLint("UnknownNullness") IntentSender intent, int requestCode,
             @Nullable Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags,
@@ -855,6 +951,13 @@
 
     /**
      * Called by Fragment.requestPermissions() to implement its behavior.
+     *
+     * @param fragment the Fragment to request permissions from.
+     * @param permissions The requested permissions.
+     * @param requestCode Application specific request code to match with a result reported to
+     * {@link #onRequestPermissionsResult(int, String[], int[])}. Must be between 0 and 65535 to
+     *                    be considered valid. If given requestCode is greater than 65535, an
+     *                    IllegalArgumentException would be thrown.
      */
     void requestPermissionsFromFragment(@NonNull Fragment fragment, @NonNull String[] permissions,
             int requestCode) {
@@ -875,7 +978,8 @@
 
     class HostCallbacks extends FragmentHostCallback<FragmentActivity> implements
             ViewModelStoreOwner,
-            OnBackPressedDispatcherOwner {
+            OnBackPressedDispatcherOwner,
+            ActivityResultRegistryOwner {
         public HostCallbacks() {
             super(FragmentActivity.this /*fragmentActivity*/);
         }
@@ -941,6 +1045,7 @@
             FragmentActivity.this.startActivityFromFragment(fragment, intent, requestCode, options);
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void onStartIntentSenderFromFragment(
                 @NonNull Fragment fragment, IntentSender intent, int requestCode,
@@ -950,6 +1055,7 @@
                     fillInIntent, flagsMask, flagsValues, extraFlags, options);
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public void onRequestPermissionsFromFragment(@NonNull Fragment fragment,
                 @NonNull String[] permissions, int requestCode) {
@@ -990,6 +1096,12 @@
             final Window w = getWindow();
             return (w != null && w.peekDecorView() != null);
         }
+
+        @NonNull
+        @Override
+        public ActivityResultRegistry getActivityResultRegistry() {
+            return FragmentActivity.this.getActivityResultRegistry();
+        }
     }
 
     private void markFragmentsCreated() {
@@ -1010,6 +1122,11 @@
                 FragmentManager childFragmentManager = fragment.getChildFragmentManager();
                 hadNotMarked |= markState(childFragmentManager, state);
             }
+            if (fragment.mViewLifecycleOwner != null && fragment.mViewLifecycleOwner
+                    .getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) {
+                fragment.mViewLifecycleOwner.setCurrentState(state);
+                hadNotMarked = true;
+            }
             if (fragment.mLifecycleRegistry.getCurrentState().isAtLeast(Lifecycle.State.STARTED)) {
                 fragment.mLifecycleRegistry.setCurrentState(state);
                 hadNotMarked = true;
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentHostCallback.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentHostCallback.java
index 9ad3a8c..338b2bf 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentHostCallback.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentHostCallback.java
@@ -16,6 +16,9 @@
 
 package androidx.fragment.app;
 
+import static androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions;
+import static androidx.activity.result.contract.ActivityResultContracts.StartIntentSenderForResult;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
@@ -26,6 +29,9 @@
 import android.view.LayoutInflater;
 import android.view.View;
 
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultRegistryOwner;
+import androidx.activity.result.contract.ActivityResultContract;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
@@ -136,7 +142,14 @@
     /**
      * Starts a new {@link IntentSender} from the given fragment.
      * See {@link Activity#startIntentSender(IntentSender, Intent, int, int, int, Bundle)}.
+     *
+     * @deprecated Have your FragmentHostCallback implement {@link ActivityResultRegistryOwner}
+     * to allow Fragments to use
+     * {@link Fragment#registerForActivityResult(ActivityResultContract, ActivityResultCallback)}
+     * with {@link StartIntentSenderForResult}. This method will still be called when Fragments
+     * call the deprecated <code>startIntentSenderForResult()</code> method.
      */
+    @Deprecated
     public void onStartIntentSenderFromFragment(@NonNull Fragment fragment,
             @SuppressLint("UnknownNullness") IntentSender intent, int requestCode,
             @Nullable Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags,
@@ -152,7 +165,14 @@
     /**
      * Requests permissions from the given fragment.
      * See {@link FragmentActivity#requestPermissions(String[], int)}
+     *
+     * @deprecated Have your FragmentHostCallback implement {@link ActivityResultRegistryOwner}
+     * to allow Fragments to use
+     * {@link Fragment#registerForActivityResult(ActivityResultContract, ActivityResultCallback)}
+     * with {@link RequestMultiplePermissions}. This method will still be called when Fragments
+     * call the deprecated <code>requestPermissions()</code> method.
      */
+    @Deprecated
     public void onRequestPermissionsFromFragment(@NonNull Fragment fragment,
             @NonNull String[] permissions, int requestCode) {
     }
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 9fb5596..7c30f81f 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
@@ -2288,6 +2288,10 @@
     }
 
     private ViewGroup getFragmentContainer(@NonNull Fragment f) {
+        // If there's already a container, just return it
+        if (f.mContainer != null) {
+            return f.mContainer;
+        }
         // If the fragment has no containerId we should return null immediately.
         if (f.mContainerId <= 0) {
             return null;
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java
index 4e094b3..fc7fb0b 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentStateManager.java
@@ -22,6 +22,7 @@
 import android.os.Parcelable;
 import android.util.Log;
 import android.util.SparseArray;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -459,6 +460,8 @@
         if (FragmentManager.isLoggingEnabled(Log.DEBUG)) {
             Log.d(TAG, "moveto CREATE_VIEW: " + mFragment);
         }
+        LayoutInflater layoutInflater = mFragment.performGetLayoutInflater(
+                mFragment.mSavedFragmentState);
         ViewGroup container = null;
         if (mFragment.mContainer != null) {
             container = mFragment.mContainer;
@@ -482,8 +485,7 @@
             }
         }
         mFragment.mContainer = container;
-        mFragment.performCreateView(mFragment.performGetLayoutInflater(
-                mFragment.mSavedFragmentState), container, mFragment.mSavedFragmentState);
+        mFragment.performCreateView(layoutInflater, container, mFragment.mSavedFragmentState);
         if (mFragment.mView != null) {
             mFragment.mView.setSaveFromParentEnabled(false);
             mFragment.mView.setTag(R.id.fragment_container_view_tag, mFragment);
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentViewLifecycleOwner.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentViewLifecycleOwner.java
index a62e0ca..ac59229 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentViewLifecycleOwner.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentViewLifecycleOwner.java
@@ -47,6 +47,10 @@
         return mLifecycleRegistry;
     }
 
+    void setCurrentState(@NonNull Lifecycle.State state) {
+        mLifecycleRegistry.setCurrentState(state);
+    }
+
     void handleLifecycleEvent(@NonNull Lifecycle.Event event) {
         mLifecycleRegistry.handleLifecycleEvent(event);
     }
diff --git a/hilt/hilt-common/build.gradle b/hilt/hilt-common/build.gradle
index cd5bbe8..1ea21ae 100644
--- a/hilt/hilt-common/build.gradle
+++ b/hilt/hilt-common/build.gradle
@@ -32,7 +32,7 @@
 
 androidx {
     name = "AndroidX Hilt Extension Annotations"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.HILT
     mavenGroup = LibraryGroups.HILT
     inceptionYear = "2020"
diff --git a/hilt/hilt-common/src/main/java/androidx/hilt/lifecycle/ViewModelInject.java b/hilt/hilt-common/src/main/java/androidx/hilt/lifecycle/ViewModelInject.java
index 185aa70..c5ec2cf 100644
--- a/hilt/hilt-common/src/main/java/androidx/hilt/lifecycle/ViewModelInject.java
+++ b/hilt/hilt-common/src/main/java/androidx/hilt/lifecycle/ViewModelInject.java
@@ -25,6 +25,39 @@
 
 /**
  * Identifies a {@link androidx.lifecycle.ViewModel}'s constructor for injection.
+ * <p>
+ * Similar to {@link javax.inject.Inject}, a {@code ViewModel} containing a constructor annotated
+ * with {@code ViewModelInject} will have its dependencies defined in the constructor parameters
+ * injected by Dagger's Hilt. The {@code ViewModel} will be available for creation by the
+ * {@link androidx.hilt.lifecycle.HiltViewModelFactory} and can be retrieved by default in an {@code
+ * Activity} or {@code Fragment} annotated with {@link dagger.hilt.android.AndroidEntryPoint}.
+ * <p>
+ * Example:
+ * <pre>
+ * public class DonutViewModel {
+ *     {@literal @}ViewModelInject
+ *     public DonutViewModel(SavedStateHandle handle, RecipeRepository repository) {
+ *         // ...
+ *     }
+ * }
+ * </pre>
+ * <pre>
+ * {@literal @}AndroidEntryPoint
+ * public class CookingActivity extends AppCompatActivity {
+ *     public void onCreate(Bundle savedInstanceState) {
+ *         DonutViewModel vm = new ViewModelProvider(this).get(DonutViewModel.class);
+ *     }
+ * }
+ * </pre>
+ * <p>
+ * Only one constructor in the {@code ViewModel} must be annotated with {@code ViewModelInject}. The
+ * constructor can optionally define a {@link androidx.lifecycle.SavedStateHandle} parameter along
+ * with any other dependency. The {@code SavedStateHandle} must not be a type param of
+ * {@link javax.inject.Provider} nor {@link dagger.Lazy} and must not be qualified.
+ * <p>
+ * Only dependencies available in the
+ * {@link dagger.hilt.android.components.ActivityRetainedComponent} can be injected into the
+ * {@code ViewModel}.
  */
 @Target(ElementType.CONSTRUCTOR)
 @Retention(RetentionPolicy.CLASS)
diff --git a/hilt/hilt-common/src/main/java/androidx/hilt/work/WorkerInject.java b/hilt/hilt-common/src/main/java/androidx/hilt/work/WorkerInject.java
index 8fff46d..d7358ef 100644
--- a/hilt/hilt-common/src/main/java/androidx/hilt/work/WorkerInject.java
+++ b/hilt/hilt-common/src/main/java/androidx/hilt/work/WorkerInject.java
@@ -25,6 +25,45 @@
 
 /**
  * Identifies a {@link androidx.work.Worker}'s constructor for injection.
+ * <p>
+ * Similar to {@link javax.inject.Inject}, a {@code Worker} containing a constructor annotated
+ * with {@code WorkerInject} will have its dependencies defined in the constructor parameters
+ * injected by Dagger's Hilt. The {@code Worker} will be available for creation by the
+ * {@link androidx.hilt.work.HiltWorkerFactory} that should be set in {@code WorkManager}'s
+ * configuration via
+ * {@link androidx.work.Configuration.Builder#setWorkerFactory(androidx.work.WorkerFactory)}.
+ * <p>
+ * Example:
+ * <pre>
+ * public class UploadWorker extends Worker {
+ *     {@literal @}WorkerInject
+ *     public UploadWorker(Context context, WorkerParameters params, HttpClient httpClient) {
+ *         // ...
+ *     }
+ * }
+ * </pre>
+ * <pre>
+ * {@literal @}GenerateComponents
+ * {@literal @}AndroidEntryPoint
+ * public class MyApplication extends Application implements Configuration.Provider {
+ *     {@literal @}Inject HiltWorkerFactory workerFactory;
+ *
+ *     {@literal @}Override
+ *     public Configuration getWorkManagerConfiguration() {
+ *         return Configuration.Builder()
+ *                 .setWorkerFactory(workerFactory)
+ *                 .build();
+ *     }
+ * }
+ * </pre>
+ * <p>
+ * Only one constructor in the {@code Worker} must be annotated with {@code WorkerInject}. The
+ * constructor must define parameters for a {@code Context} and a {@code WorkerParameters} along
+ * with any other dependencies. Both the {@code Context} and {@code WorkerParameters} must not be
+ * a type param of {@link javax.inject.Provider} nor {@link dagger.Lazy} and must not be qualified.
+ * <p>
+ * Only dependencies available in the {@link dagger.hilt.android.components.ApplicationComponent}
+ * can be injected into the {@code Worker}.
  */
 @Target(ElementType.CONSTRUCTOR)
 @Retention(RetentionPolicy.CLASS)
diff --git a/hilt/hilt-compiler/build.gradle b/hilt/hilt-compiler/build.gradle
index e5d80e0..d7a2086 100644
--- a/hilt/hilt-compiler/build.gradle
+++ b/hilt/hilt-compiler/build.gradle
@@ -62,7 +62,7 @@
 
 androidx {
     name = "AndroidX Hilt Extension Compiler"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.HILT
     mavenGroup = LibraryGroups.HILT
     inceptionYear = "2020"
diff --git a/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/lifecycle/ViewModelInjectStep.kt b/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/lifecycle/ViewModelInjectStep.kt
index 92510b1..ff3c5db 100644
--- a/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/lifecycle/ViewModelInjectStep.kt
+++ b/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/lifecycle/ViewModelInjectStep.kt
@@ -21,6 +21,7 @@
 import com.google.auto.common.BasicAnnotationProcessor
 import com.google.auto.common.MoreElements
 import com.google.common.collect.SetMultimap
+import com.squareup.javapoet.TypeName
 import javax.annotation.processing.ProcessingEnvironment
 import javax.lang.model.element.Element
 import javax.lang.model.element.ExecutableElement
@@ -68,6 +69,12 @@
     ): ViewModelInjectElements? {
         var valid = true
 
+        if (elements.getTypeElement(ClassNames.VIEW_MODEL_ASSISTED_FACTORY.toString()) == null) {
+            error("To use @ViewModelInject you must add the 'lifecycle-viewmodel' " +
+                    "artifact. androidx.hilt:hilt-lifecyclew-viewmodel:<version>")
+            valid = false
+        }
+
         if (!types.isSubtype(typeElement.asType(),
                 elements.getTypeElement(ClassNames.VIEW_MODEL.toString()).asType())) {
             error("@ViewModelInject is only supported on types that subclass " +
@@ -95,6 +102,16 @@
             valid = false
         }
 
+        // Validate there is at most one SavedStateHandle constructor arg.
+        val savedStateArgs = constructorElement.parameters
+            .map { TypeName.get(it.asType()) }
+            .count { it == ClassNames.SAVED_STATE_HANDLE }
+        if (savedStateArgs > 1) {
+            error("Expected zero or one constructor argument of type androidx.lifecycle" +
+                    ".SavedStateHandle, found $savedStateArgs", constructorElement)
+            valid = false
+        }
+
         if (!valid) return null
 
         return ViewModelInjectElements(
diff --git a/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/work/WorkerInjectStep.kt b/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/work/WorkerInjectStep.kt
index 18046d0..e413090 100644
--- a/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/work/WorkerInjectStep.kt
+++ b/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/work/WorkerInjectStep.kt
@@ -16,13 +16,19 @@
 
 package androidx.hilt.work
 
+import androidx.hilt.ClassNames
+import androidx.hilt.ext.hasAnnotation
 import com.google.auto.common.BasicAnnotationProcessor
 import com.google.auto.common.MoreElements
 import com.google.common.collect.SetMultimap
 import javax.annotation.processing.ProcessingEnvironment
 import javax.lang.model.element.Element
 import javax.lang.model.element.ExecutableElement
+import javax.lang.model.element.Modifier
+import javax.lang.model.element.NestingKind
 import javax.lang.model.element.TypeElement
+import javax.lang.model.util.ElementFilter
+import javax.tools.Diagnostic
 
 /**
  * Processing step that generates code enabling assisted injection of Workers using Hilt.
@@ -31,6 +37,10 @@
     private val processingEnv: ProcessingEnvironment
 ) : BasicAnnotationProcessor.ProcessingStep {
 
+    private val elements = processingEnv.elementUtils
+    private val types = processingEnv.typeUtils
+    private val messager = processingEnv.messager
+
     override fun annotations() = setOf(WorkerInject::class.java)
 
     override fun process(
@@ -58,7 +68,47 @@
         typeElement: TypeElement,
         constructorElement: ExecutableElement
     ): WorkerInjectElements? {
-        // TODO(danysantiago): Validate Worker
+        var valid = true
+
+        if (elements.getTypeElement(ClassNames.WORKER_ASSISTED_FACTORY.toString()) == null) {
+            error("To use @WorkerInject you must add the 'work' artifact. " +
+                    "androidx.hilt:hilt-work:<version>")
+            valid = false
+        }
+
+        if (!types.isSubtype(typeElement.asType(),
+                elements.getTypeElement(ClassNames.WORKER.toString()).asType())) {
+            error("@WorkerInject is only supported on types that subclass " +
+                    "androidx.work.Worker.")
+            valid = false
+        }
+
+        ElementFilter.constructorsIn(typeElement.enclosedElements).filter {
+            it.hasAnnotation(WorkerInject::class)
+        }.let { constructors ->
+            if (constructors.size > 1) {
+                error("Multiple @WorkerInject annotated constructors found.", typeElement)
+                valid = false
+            }
+            constructors.filter { it.modifiers.contains(Modifier.PRIVATE) }.forEach {
+                error("@WorkerInject annotated constructors must not be private.", it)
+                valid = false
+            }
+        }
+
+        if (typeElement.nestingKind == NestingKind.MEMBER &&
+            !typeElement.modifiers.contains(Modifier.STATIC)) {
+            error("@WorkerInject may only be used on inner classes if they are static.",
+                typeElement)
+            valid = false
+        }
+
+        if (!valid) return null
+
         return WorkerInjectElements(typeElement, constructorElement)
     }
+
+    private fun error(message: String, element: Element? = null) {
+        messager.printMessage(Diagnostic.Kind.ERROR, message, element)
+    }
 }
\ No newline at end of file
diff --git a/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/lifecycle/ViewModelGeneratorTest.kt b/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/lifecycle/ViewModelGeneratorTest.kt
index 6e9f67b..7e66ccc 100644
--- a/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/lifecycle/ViewModelGeneratorTest.kt
+++ b/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/lifecycle/ViewModelGeneratorTest.kt
@@ -70,10 +70,11 @@
 
         val compilation = compiler()
             .compile(myViewModel, Sources.VIEW_MODEL, Sources.SAVED_STATE_HANDLE)
-        assertThat(compilation).succeeded()
-        assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
-            .hasSourceEquivalentTo(expected)
+        assertThat(compilation).apply {
+            succeeded()
+            generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
+                .hasSourceEquivalentTo(expected)
+        }
     }
 
     @Test
@@ -118,10 +119,11 @@
 
         val compilation = compiler()
             .compile(myViewModel, Sources.VIEW_MODEL, Sources.SAVED_STATE_HANDLE)
-        assertThat(compilation).succeeded()
-        assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
-            .hasSourceEquivalentTo(expected)
+        assertThat(compilation).apply {
+            succeeded()
+            generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
+                .hasSourceEquivalentTo(expected)
+        }
     }
 
     @Test
@@ -184,10 +186,11 @@
 
         val compilation = compiler()
             .compile(foo, myViewModel, Sources.VIEW_MODEL, Sources.SAVED_STATE_HANDLE)
-        assertThat(compilation).succeeded()
-        assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
-            .hasSourceEquivalentTo(expected)
+        assertThat(compilation).apply {
+            succeeded()
+            generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
+                .hasSourceEquivalentTo(expected)
+        }
     }
 
     @Test
@@ -248,10 +251,11 @@
 
         val compilation = compiler()
             .compile(foo, myViewModel, Sources.VIEW_MODEL, Sources.SAVED_STATE_HANDLE)
-        assertThat(compilation).succeeded()
-        assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
-            .hasSourceEquivalentTo(expected)
+        assertThat(compilation).apply {
+            succeeded()
+            generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
+                .hasSourceEquivalentTo(expected)
+        }
     }
 
     @Test
@@ -322,65 +326,11 @@
 
         val compilation = compiler()
             .compile(myQualifier, myViewModel, Sources.VIEW_MODEL, Sources.SAVED_STATE_HANDLE)
-        assertThat(compilation).succeeded()
-        assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
-            .hasSourceEquivalentTo(expected)
-    }
-
-    @Test
-    fun verifyAssistedFactory_multipleSavedStateArg() {
-        val myViewModel = """
-        package androidx.hilt.lifecycle.test;
-
-        import androidx.hilt.lifecycle.ViewModelInject;
-        import androidx.lifecycle.ViewModel;
-        import androidx.lifecycle.SavedStateHandle;
-        import java.lang.String;
-
-        class MyViewModel extends ViewModel {
-            @ViewModelInject
-            MyViewModel(SavedStateHandle savedState, String s, SavedStateHandle savedState2) { }
+        assertThat(compilation).apply {
+            succeeded()
+            generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
+                .hasSourceEquivalentTo(expected)
         }
-        """.toJFO("androidx.hilt.lifecycle.test.MyViewModel")
-
-        val expected = """
-        package androidx.hilt.lifecycle.test;
-
-        import androidx.annotation.NonNull;
-        import androidx.hilt.lifecycle.ViewModelAssistedFactory;
-        import androidx.lifecycle.SavedStateHandle;
-        import java.lang.Override;
-        import java.lang.String;
-        import $GENERATED_TYPE;
-        import javax.inject.Inject;
-        import javax.inject.Provider;
-
-        $GENERATED_ANNOTATION
-        public final class MyViewModel_AssistedFactory implements
-                ViewModelAssistedFactory<MyViewModel> {
-
-            private final Provider<String> s;
-
-            @Inject
-            MyViewModel_AssistedFactory(Provider<String> s) {
-                this.s = s;
-            }
-
-            @Override
-            @NonNull
-            public MyViewModel create(@NonNull SavedStateHandle arg0) {
-                return new MyViewModel(arg0, s.get(), arg0);
-            }
-        }
-        """.toJFO("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
-
-        val compilation = compiler()
-            .compile(myViewModel, Sources.VIEW_MODEL, Sources.SAVED_STATE_HANDLE)
-        assertThat(compilation).succeeded()
-        assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_AssistedFactory")
-            .hasSourceEquivalentTo(expected)
     }
 
     @Test
@@ -423,10 +373,11 @@
 
         val compilation = compiler()
             .compile(myViewModel, Sources.VIEW_MODEL, Sources.SAVED_STATE_HANDLE)
-        assertThat(compilation).succeeded()
-        assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_HiltModule")
-            .hasSourceEquivalentTo(expected)
+        assertThat(compilation).apply {
+            succeeded()
+            generatedSourceFile("androidx.hilt.lifecycle.test.MyViewModel_HiltModule")
+                .hasSourceEquivalentTo(expected)
+        }
     }
 
     @Test
@@ -497,14 +448,14 @@
 
         val compilation = compiler()
             .compile(viewModel, Sources.VIEW_MODEL, Sources.SAVED_STATE_HANDLE)
-        assertThat(compilation).succeeded()
-        assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.lifecycle.test" +
-                    ".Outer_InnerViewModel_AssistedFactory")
-            .hasSourceEquivalentTo(expectedFactory)
-        assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.lifecycle.test" +
-                    ".Outer_InnerViewModel_HiltModule")
-            .hasSourceEquivalentTo(expectedModule)
+        assertThat(compilation).apply {
+            succeeded()
+            generatedSourceFile("androidx.hilt.lifecycle.test" +
+                        ".Outer_InnerViewModel_AssistedFactory")
+                .hasSourceEquivalentTo(expectedFactory)
+            generatedSourceFile("androidx.hilt.lifecycle.test" +
+                        ".Outer_InnerViewModel_HiltModule")
+                .hasSourceEquivalentTo(expectedModule)
+        }
     }
 }
\ No newline at end of file
diff --git a/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/lifecycle/ViewModelInjectStepTest.kt b/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/lifecycle/ViewModelInjectStepTest.kt
index d66ca3f..58bebfb 100644
--- a/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/lifecycle/ViewModelInjectStepTest.kt
+++ b/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/lifecycle/ViewModelInjectStepTest.kt
@@ -64,11 +64,12 @@
 
         val compilation = compiler()
             .compile(myViewModel, Sources.VIEW_MODEL)
-        assertThat(compilation).failed()
-        assertThat(compilation).hadErrorCount(1)
-        assertThat(compilation)
-            .hadErrorContainingMatch("@ViewModelInject is only supported on types that subclass " +
-                    "androidx.lifecycle.ViewModel.")
+        assertThat(compilation).apply {
+            failed()
+            hadErrorCount(1)
+            hadErrorContainingMatch("@ViewModelInject is only supported on types that subclass " +
+                        "androidx.lifecycle.ViewModel.")
+        }
     }
 
     @Test
@@ -90,10 +91,11 @@
 
         val compilation = compiler()
             .compile(myViewModel, Sources.VIEW_MODEL)
-        assertThat(compilation).failed()
-        assertThat(compilation).hadErrorCount(1)
-        assertThat(compilation)
-            .hadErrorContainingMatch("Multiple @ViewModelInject annotated constructors found.")
+        assertThat(compilation).apply {
+            failed()
+            hadErrorCount(1)
+            hadErrorContainingMatch("Multiple @ViewModelInject annotated constructors found.")
+        }
     }
 
     @Test
@@ -112,11 +114,12 @@
 
         val compilation = compiler()
             .compile(myViewModel, Sources.VIEW_MODEL)
-        assertThat(compilation).failed()
-        assertThat(compilation).hadErrorCount(1)
-        assertThat(compilation)
-            .hadErrorContainingMatch("@ViewModelInject annotated constructors must not be " +
-                    "private.")
+        assertThat(compilation).apply {
+            failed()
+            hadErrorCount(1)
+            hadErrorContainingMatch("@ViewModelInject annotated constructors must not be " +
+                        "private.")
+        }
     }
 
     @Test
@@ -137,10 +140,39 @@
 
         val compilation = compiler()
             .compile(myViewModel, Sources.VIEW_MODEL)
-        assertThat(compilation).failed()
-        assertThat(compilation).hadErrorCount(1)
-        assertThat(compilation)
-            .hadErrorContainingMatch("@ViewModelInject may only be used on inner classes " +
-                    "if they are static.")
+        assertThat(compilation).apply {
+            failed()
+            hadErrorCount(1)
+            hadErrorContainingMatch("@ViewModelInject may only be used on inner classes " +
+                        "if they are static.")
+        }
+    }
+
+    @Test
+    fun verifyAtMostOneSavedStateHandleArg() {
+        val myViewModel = """
+        package androidx.hilt.lifecycle.test;
+
+        import androidx.lifecycle.ViewModel;
+        import androidx.lifecycle.SavedStateHandle;
+        import androidx.hilt.lifecycle.ViewModelInject;
+
+        class MyViewModel extends ViewModel {
+            @ViewModelInject
+            MyViewModel(SavedStateHandle savedState1, SavedStateHandle savedState2) { }
+        }
+        """.toJFO("androidx.hilt.lifecycle.test.MyViewModel")
+
+        val compilation = compiler()
+            .compile(myViewModel,
+                Sources.VIEW_MODEL,
+                Sources.SAVED_STATE_HANDLE
+            )
+        assertThat(compilation).apply {
+            failed()
+            hadErrorCount(1)
+            hadErrorContainingMatch("Expected zero or one constructor argument of type " +
+                        "androidx.lifecycle.SavedStateHandle, found 2")
+        }
     }
 }
\ No newline at end of file
diff --git a/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/work/WorkerGeneratorTest.kt b/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/work/WorkerGeneratorTest.kt
index 411a803..a65b5d5 100644
--- a/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/work/WorkerGeneratorTest.kt
+++ b/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/work/WorkerGeneratorTest.kt
@@ -21,7 +21,7 @@
 import androidx.hilt.Sources
 import androidx.hilt.compiler
 import androidx.hilt.toJFO
-import com.google.testing.compile.CompilationSubject
+import com.google.testing.compile.CompilationSubject.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -93,10 +93,11 @@
 
         val compilation = compiler()
             .compile(foo, myWorker, Sources.WORKER, Sources.WORKER_PARAMETERS)
-        CompilationSubject.assertThat(compilation).succeeded()
-        CompilationSubject.assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.work.test.MyWorker_AssistedFactory")
-            .hasSourceEquivalentTo(expected)
+        assertThat(compilation).apply {
+            succeeded()
+            generatedSourceFile("androidx.hilt.work.test.MyWorker_AssistedFactory")
+                .hasSourceEquivalentTo(expected)
+        }
     }
 
     @Test
@@ -143,9 +144,10 @@
 
         val compilation = compiler()
             .compile(myWorker, Sources.WORKER, Sources.WORKER_PARAMETERS)
-        CompilationSubject.assertThat(compilation).succeeded()
-        CompilationSubject.assertThat(compilation)
-            .generatedSourceFile("androidx.hilt.work.test.MyWorker_HiltModule")
-            .hasSourceEquivalentTo(expected)
+        assertThat(compilation).apply {
+            succeeded()
+            generatedSourceFile("androidx.hilt.work.test.MyWorker_HiltModule")
+                .hasSourceEquivalentTo(expected)
+        }
     }
 }
\ No newline at end of file
diff --git a/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/work/WorkerInjectStepTest.kt b/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/work/WorkerInjectStepTest.kt
new file mode 100644
index 0000000..be6ea3b
--- /dev/null
+++ b/hilt/hilt-compiler/src/test/kotlin/androidx/hilt/work/WorkerInjectStepTest.kt
@@ -0,0 +1,143 @@
+/*
+ * 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.hilt.work
+
+import androidx.hilt.Sources
+import androidx.hilt.compiler
+import androidx.hilt.toJFO
+import com.google.testing.compile.CompilationSubject.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class WorkerInjectStepTest {
+
+    @Test
+    fun verifyEnclosingElementExtendsWorker() {
+        val myWorker = """
+        package androidx.hilt.work.test;
+
+        import androidx.hilt.work.WorkerInject;
+
+        class MyWorker {
+            @WorkerInject
+            MyWorker() { }
+        }
+        """.toJFO("androidx.hilt.work.work.MyWorker")
+
+        val compilation = compiler()
+            .compile(myWorker, Sources.WORKER, Sources.WORKER_PARAMETERS)
+        assertThat(compilation).apply {
+            failed()
+            hadErrorCount(1)
+            hadErrorContainingMatch("@WorkerInject is only supported on types that subclass " +
+                        "androidx.work.Worker.")
+        }
+    }
+
+    @Test
+    fun verifySingleAnnotatedConstructor() {
+        val myWorker = """
+        package androidx.hilt.work.test;
+
+        import android.content.Context;
+        import androidx.hilt.work.WorkerInject;
+        import androidx.work.Worker;
+        import androidx.work.WorkerParameters;
+        import java.lang.String;
+
+        class MyWorker extends Worker {
+            @WorkerInject
+            MyWorker(Context context, WorkerParameters params) {
+                super(context, params);
+            }
+
+            @WorkerInject
+            MyWorker(Context context, WorkerParameters params, String s) {
+                super(context, params);
+            }
+        }
+        """.toJFO("androidx.hilt.work.test.MyWorker")
+
+        val compilation = compiler()
+            .compile(myWorker, Sources.WORKER, Sources.WORKER_PARAMETERS)
+        assertThat(compilation).apply {
+            failed()
+            hadErrorCount(1)
+            hadErrorContainingMatch("Multiple @WorkerInject annotated constructors found.")
+        }
+    }
+
+    @Test
+    fun verifyNonPrivateConstructor() {
+        val myWorker = """
+        package androidx.hilt.work.test;
+
+        import android.content.Context;
+        import androidx.hilt.work.WorkerInject;
+        import androidx.work.Worker;
+        import androidx.work.WorkerParameters;
+
+        class MyWorker extends Worker {
+            @WorkerInject
+            private MyWorker(Context context, WorkerParameters params) {
+                super(context, params);
+            }
+        }
+        """.toJFO("androidx.hilt.work.test.MyWorker")
+
+        val compilation = compiler()
+            .compile(myWorker, Sources.WORKER, Sources.WORKER_PARAMETERS)
+        assertThat(compilation).apply {
+            failed()
+            hadErrorCount(1)
+            hadErrorContainingMatch("@WorkerInject annotated constructors must not be " +
+                        "private.")
+        }
+    }
+
+    @Test
+    fun verifyInnerClassIsStatic() {
+        val myWorker = """
+        package androidx.hilt.work.test;
+
+        import android.content.Context;
+        import androidx.hilt.work.WorkerInject;
+        import androidx.work.Worker;
+        import androidx.work.WorkerParameters;
+
+        class Outer {
+            class MyWorker extends Worker {
+                @WorkerInject
+                MyWorker(Context context, WorkerParameters params) {
+                    super(context, params);
+                }
+            }
+        }
+        """.toJFO("androidx.hilt.work.test.Outer")
+
+        val compilation = compiler()
+            .compile(myWorker, Sources.WORKER, Sources.WORKER_PARAMETERS)
+        assertThat(compilation).apply {
+            failed()
+            hadErrorCount(1)
+            hadErrorContainingMatch("@WorkerInject may only be used on inner classes " +
+                        "if they are static.")
+        }
+    }
+}
\ No newline at end of file
diff --git a/hilt/hilt-lifecycle-viewmodel/build.gradle b/hilt/hilt-lifecycle-viewmodel/build.gradle
index 053561e..30c7cff 100644
--- a/hilt/hilt-lifecycle-viewmodel/build.gradle
+++ b/hilt/hilt-lifecycle-viewmodel/build.gradle
@@ -57,7 +57,7 @@
 
 androidx {
     name = "Android Lifecycle ViewModel Hilt Extension"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.HILT
     mavenGroup = LibraryGroups.HILT
     inceptionYear = "2020"
diff --git a/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/ActivityViewModelFactory.java b/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/ActivityViewModelFactory.java
deleted file mode 100644
index 4979c27..0000000
--- a/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/ActivityViewModelFactory.java
+++ /dev/null
@@ -1,36 +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.hilt.lifecycle;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Qualifier for requesting the activity level {@link ViewModelFactory}
- */
-@Target({METHOD, PARAMETER, FIELD})
-@Retention(RUNTIME)
-@Qualifier
-public @interface ActivityViewModelFactory {
-}
diff --git a/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/FragmentViewModelFactory.java b/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/FragmentViewModelFactory.java
deleted file mode 100644
index b28909f..0000000
--- a/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/FragmentViewModelFactory.java
+++ /dev/null
@@ -1,36 +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.hilt.lifecycle;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Qualifier for requesting the fragment level {@link ViewModelFactory}
- */
-@Target({METHOD, PARAMETER, FIELD})
-@Retention(RUNTIME)
-@Qualifier
-public @interface FragmentViewModelFactory {
-}
diff --git a/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/ViewModelFactory.java b/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/HiltViewModelFactory.java
similarity index 84%
rename from hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/ViewModelFactory.java
rename to hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/HiltViewModelFactory.java
index b2e4e05..17bc790 100644
--- a/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/ViewModelFactory.java
+++ b/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/HiltViewModelFactory.java
@@ -32,14 +32,20 @@
 
 /**
  * View Model Provider Factory for the Hilt Extension.
+ * <p>
+ * A provider for this factory will be installed in the
+ * {@link dagger.hilt.android.components.ActivityComponent} and
+ * {@link dagger.hilt.android.components.FragmentComponent}. An instance of this factory will also
+ * be the default factory by activities and fragments annotated with
+ * {@link dagger.hilt.android.AndroidEntryPoint}.
  */
-public final class ViewModelFactory extends AbstractSavedStateViewModelFactory {
+public final class HiltViewModelFactory extends AbstractSavedStateViewModelFactory {
 
     private final SavedStateViewModelFactory mDelegateFactory;
     private final Map<String,
             Provider<ViewModelAssistedFactory<? extends ViewModel>>> mViewModelFactories;
 
-    ViewModelFactory(
+    HiltViewModelFactory(
             @NonNull SavedStateRegistryOwner owner,
             @Nullable Bundle defaultArgs,
             @NonNull SavedStateViewModelFactory delegateFactory,
diff --git a/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/ViewModelFactoryModules.java b/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/ViewModelFactoryModules.java
index 4d139da..1792a7d 100644
--- a/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/ViewModelFactoryModules.java
+++ b/hilt/hilt-lifecycle-viewmodel/src/main/java/androidx/hilt/lifecycle/ViewModelFactoryModules.java
@@ -26,6 +26,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.SavedStateViewModelFactory;
 import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.savedstate.SavedStateRegistryOwner;
 
 import java.util.Map;
@@ -37,6 +38,9 @@
 import dagger.hilt.InstallIn;
 import dagger.hilt.android.components.ActivityComponent;
 import dagger.hilt.android.components.FragmentComponent;
+import dagger.hilt.android.internal.lifecycle.DefaultActivityViewModelFactory;
+import dagger.hilt.android.internal.lifecycle.DefaultFragmentViewModelFactory;
+import dagger.multibindings.IntoSet;
 import dagger.multibindings.Multibinds;
 
 /**
@@ -59,9 +63,10 @@
         abstract Map<String, ViewModelAssistedFactory<? extends ViewModel>> viewModelFactoriesMap();
 
         @Provides
+        @IntoSet
         @NonNull
-        @ActivityViewModelFactory
-        static ViewModelFactory provideFactory(
+        @DefaultActivityViewModelFactory
+        static ViewModelProvider.Factory provideFactory(
                 @NonNull Activity activity,
                 @NonNull Application application,
                 @NonNull Map<String, Provider<ViewModelAssistedFactory<? extends ViewModel>>>
@@ -72,7 +77,7 @@
                     ? activity.getIntent().getExtras() : null;
             SavedStateViewModelFactory delegate =
                     new SavedStateViewModelFactory(application, owner, defaultArgs);
-            return new ViewModelFactory(owner, defaultArgs, delegate, viewModelFactories);
+            return new HiltViewModelFactory(owner, defaultArgs, delegate, viewModelFactories);
         }
     }
 
@@ -84,9 +89,10 @@
     public static final class FragmentModule {
 
         @Provides
+        @IntoSet
         @NonNull
-        @FragmentViewModelFactory
-        static ViewModelFactory provideFactory(
+        @DefaultFragmentViewModelFactory
+        static ViewModelProvider.Factory provideFactory(
                 @NonNull Fragment fragment,
                 @NonNull Application application,
                 @NonNull Map<String, Provider<ViewModelAssistedFactory<? extends ViewModel>>>
@@ -94,7 +100,7 @@
             Bundle defaultArgs = fragment.getArguments();
             SavedStateViewModelFactory delegate =
                     new SavedStateViewModelFactory(application, fragment, defaultArgs);
-            return new ViewModelFactory(fragment, defaultArgs, delegate, viewModelFactories);
+            return new HiltViewModelFactory(fragment, defaultArgs, delegate, viewModelFactories);
         }
 
         private FragmentModule() {
@@ -103,4 +109,4 @@
 
     private ViewModelFactoryModules() {
     }
-}
+}
\ No newline at end of file
diff --git a/hilt/hilt-work/build.gradle b/hilt/hilt-work/build.gradle
index 8fb0f00..b46d6e8 100644
--- a/hilt/hilt-work/build.gradle
+++ b/hilt/hilt-work/build.gradle
@@ -56,7 +56,7 @@
 
 androidx {
     name = "Android Lifecycle WorkManager Hilt Extension"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
     mavenVersion = LibraryVersions.HILT
     mavenGroup = LibraryGroups.HILT
     inceptionYear = "2020"
diff --git a/hilt/hilt-work/src/main/java/androidx/hilt/work/WorkerFactory.java b/hilt/hilt-work/src/main/java/androidx/hilt/work/HiltWorkerFactory.java
similarity index 87%
rename from hilt/hilt-work/src/main/java/androidx/hilt/work/WorkerFactory.java
rename to hilt/hilt-work/src/main/java/androidx/hilt/work/HiltWorkerFactory.java
index 80c96ac2..79b3f9d 100644
--- a/hilt/hilt-work/src/main/java/androidx/hilt/work/WorkerFactory.java
+++ b/hilt/hilt-work/src/main/java/androidx/hilt/work/HiltWorkerFactory.java
@@ -30,13 +30,16 @@
 
 /**
  * Worker Factory for the Hilt Extension
+ * <p>
+ * A provider for this factory will be installed in the
+ * {@link dagger.hilt.android.components.ApplicationComponent}.
  */
-public final class WorkerFactory extends androidx.work.WorkerFactory {
+public final class HiltWorkerFactory extends androidx.work.WorkerFactory {
 
     private final Map<String,
             Provider<WorkerAssistedFactory<? extends Worker>>> mWorkerFactories;
 
-    public WorkerFactory(@NonNull Map<String,
+    public HiltWorkerFactory(@NonNull Map<String,
             Provider<WorkerAssistedFactory<? extends Worker>>> workerFactories) {
         mWorkerFactories = workerFactories;
     }
diff --git a/hilt/hilt-work/src/main/java/androidx/hilt/work/WorkerFactoryModule.java b/hilt/hilt-work/src/main/java/androidx/hilt/work/WorkerFactoryModule.java
index 2a21160..8d92d10 100644
--- a/hilt/hilt-work/src/main/java/androidx/hilt/work/WorkerFactoryModule.java
+++ b/hilt/hilt-work/src/main/java/androidx/hilt/work/WorkerFactoryModule.java
@@ -46,8 +46,8 @@
 
     @NonNull
     @Provides
-    static WorkerFactory provideFactory(@NonNull Map<String,
+    static HiltWorkerFactory provideFactory(@NonNull Map<String,
             Provider<WorkerAssistedFactory<? extends Worker>>> workerFactories) {
-        return new WorkerFactory(workerFactories);
+        return new HiltWorkerFactory(workerFactories);
     }
 }
diff --git a/hilt/integration-tests/viewmodelapp/src/main/java/androidx/hilt/integration/viewmodelapp/SimpleActivity.kt b/hilt/integration-tests/viewmodelapp/src/main/java/androidx/hilt/integration/viewmodelapp/SimpleActivity.kt
index 9d092ff..d4a63e9 100644
--- a/hilt/integration-tests/viewmodelapp/src/main/java/androidx/hilt/integration/viewmodelapp/SimpleActivity.kt
+++ b/hilt/integration-tests/viewmodelapp/src/main/java/androidx/hilt/integration/viewmodelapp/SimpleActivity.kt
@@ -20,19 +20,11 @@
 import android.util.Log
 import androidx.activity.viewModels
 import androidx.fragment.app.FragmentActivity
-import androidx.hilt.lifecycle.ActivityViewModelFactory
-import androidx.hilt.lifecycle.ViewModelFactory
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class SimpleActivity : FragmentActivity() {
 
-    // TODO(danysantiago): Should be declared in Hilt gen class
-    @Inject
-    @ActivityViewModelFactory
-    lateinit var viewModelFactory: ViewModelFactory
-
     val simpleViewModel by viewModels<SimpleViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -48,7 +40,4 @@
                 .commit()
         }
     }
-
-    // TODO(danysantiago): Should be overridden by Hilt gen class
-    override fun getDefaultViewModelProviderFactory() = viewModelFactory
 }
\ No newline at end of file
diff --git a/hilt/integration-tests/viewmodelapp/src/main/java/androidx/hilt/integration/viewmodelapp/SimpleFragment.kt b/hilt/integration-tests/viewmodelapp/src/main/java/androidx/hilt/integration/viewmodelapp/SimpleFragment.kt
index 9b8df02..5afea57 100644
--- a/hilt/integration-tests/viewmodelapp/src/main/java/androidx/hilt/integration/viewmodelapp/SimpleFragment.kt
+++ b/hilt/integration-tests/viewmodelapp/src/main/java/androidx/hilt/integration/viewmodelapp/SimpleFragment.kt
@@ -21,17 +21,10 @@
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
-import androidx.hilt.lifecycle.FragmentViewModelFactory
-import androidx.hilt.lifecycle.ViewModelFactory
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class SimpleFragment : Fragment() {
-    // TODO(danysantiago): Should be declared in Hilt gen class
-    @Inject
-    @FragmentViewModelFactory
-    lateinit var viewModelFactory: ViewModelFactory
 
     val simpleViewModel by viewModels<SimpleViewModel>()
     val activitySimpleViewModel by activityViewModels<SimpleViewModel>()
@@ -42,7 +35,4 @@
         Log.d("SimpleFragment", simpleViewModel.hi())
         Log.d("SimpleFragment", activitySimpleViewModel.hi())
     }
-
-    // TODO(danysantiago): Should be overridden by Hilt gen class
-    override fun getDefaultViewModelProviderFactory() = viewModelFactory
 }
\ No newline at end of file
diff --git a/hilt/integration-tests/workerapp/src/main/java/androidx/hilt/integration/workerapp/WorkManagerModule.kt b/hilt/integration-tests/workerapp/src/main/java/androidx/hilt/integration/workerapp/WorkManagerModule.kt
index c9541b6..ce2ad75 100644
--- a/hilt/integration-tests/workerapp/src/main/java/androidx/hilt/integration/workerapp/WorkManagerModule.kt
+++ b/hilt/integration-tests/workerapp/src/main/java/androidx/hilt/integration/workerapp/WorkManagerModule.kt
@@ -17,7 +17,7 @@
 package androidx.hilt.integration.workerapp
 
 import android.content.Context
-import androidx.hilt.work.WorkerFactory
+import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import androidx.work.WorkManager
 import dagger.Module
@@ -34,7 +34,7 @@
     @Singleton
     fun provideWorkManager(
         @ApplicationContext context: Context,
-        workerFactory: WorkerFactory
+        workerFactory: HiltWorkerFactory
     ): WorkManager {
         WorkManager.initialize(
             context,
diff --git a/jetifier/jetifier/migration.config b/jetifier/jetifier/migration.config
index e2e95ae..e38b86e 100644
--- a/jetifier/jetifier/migration.config
+++ b/jetifier/jetifier/migration.config
@@ -287,26 +287,6 @@
       "to": "android/support/v4/media/{0}"
     },
     {
-      "from": "android/support/v4/app/LoaderManager(.*)",
-      "to": "androidx/loader/app/LoaderManager{0}"
-    },
-    {
-      "from": "android/support/v4/content/Loader(.*)",
-      "to": "androidx/loader/content/Loader{0}"
-    },
-    {
-      "from": "android/support/v4/content/CursorLoader(.*)",
-      "to": "androidx/loader/content/CursorLoader{0}"
-    },
-    {
-      "from": "android/support/v4/content/AsyncTaskLoader(.*)",
-      "to": "androidx/loader/content/AsyncTaskLoader{0}"
-    },
-    {
-      "from": "android/support/v4/content/ModernAsyncTask(.*)",
-      "to": "androidx/loader/content/ModernAsyncTask{0}"
-    },
-    {
       "from": "android/support/v4/view/AbsSavedState(.*)",
       "to": "androidx/customview/view/AbsSavedState{0}"
     },
@@ -621,6 +601,30 @@
       "to": "ignore"
     },
     {
+      "from": "androidx/loader/app/LoaderManager(.*)",
+      "to": "ignore"
+    },
+    {
+      "from": "androidx/loader/app/LoaderManagerImpl(.*)",
+      "to": "ignore"
+    },
+    {
+      "from": "androidx/loader/content/Loader(.*)",
+      "to": "ignore"
+    },
+    {
+      "from": "androidx/loader/content/CursorLoader(.*)",
+      "to": "ignore"
+    },
+    {
+      "from": "androidx/loader/content/AsyncTaskLoader(.*)",
+      "to": "ignore"
+    },
+    {
+      "from": "androidx/loader/content/ModernAsyncTask(.*)",
+      "to": "ignore"
+    },
+    {
       "from": "android/support/customtabs/ICustomTabsCallback(.*)",
       "to": "ignore"
     },
@@ -1007,7 +1011,7 @@
       "to": "androidx/customview"
     },
     {
-      "from": "android/support/loader",
+      "from": "androidx/loader",
       "to": "androidx/loader"
     },
     {
@@ -2174,9 +2178,9 @@
     },
     {
       "from": {
-        "groupId": "com.android.support",
+        "groupId": "androidx.loader",
         "artifactId": "loader",
-        "version": "{oldSlVersion}"
+        "version": "{newSlVersion}"
       },
       "to": {
         "groupId": "androidx.loader",
@@ -3873,8 +3877,6 @@
       "android/support/v4/app/INotificationSideChannel": "androidx/core/app/INotificationSideChannel",
       "android/support/v4/app/JobIntentService": "androidx/core/app/JobIntentService",
       "android/support/v4/app/ListFragment": "androidx/fragment/app/ListFragment",
-      "android/support/v4/app/LoaderManager": "androidx/loader/app/LoaderManager",
-      "android/support/v4/app/LoaderManagerImpl": "androidx/loader/app/LoaderManagerImpl",
       "android/support/v4/app/NavUtils": "androidx/core/app/NavUtils",
       "android/support/v4/app/NotificationBuilderWithBuilderAccessor": "androidx/core/app/NotificationBuilderWithBuilderAccessor",
       "android/support/v4/app/NotificationCompat": "androidx/core/app/NotificationCompat",
@@ -3892,15 +3894,11 @@
       "android/support/v4/app/SuperNotCalledException": "androidx/fragment/app/SuperNotCalledException",
       "android/support/v4/app/SupportActivity": "androidx/core/app/ComponentActivity",
       "android/support/v4/app/TaskStackBuilder": "androidx/core/app/TaskStackBuilder",
-      "android/support/v4/content/AsyncTaskLoader": "androidx/loader/content/AsyncTaskLoader",
       "android/support/v4/content/ContentResolverCompat": "androidx/core/content/ContentResolverCompat",
       "android/support/v4/content/ContextCompat": "androidx/core/content/ContextCompat",
-      "android/support/v4/content/CursorLoader": "androidx/loader/content/CursorLoader",
       "android/support/v4/content/FileProvider": "androidx/core/content/FileProvider",
       "android/support/v4/content/IntentCompat": "androidx/core/content/IntentCompat",
-      "android/support/v4/content/Loader": "androidx/loader/content/Loader",
       "android/support/v4/content/MimeTypeFilter": "androidx/core/content/MimeTypeFilter",
-      "android/support/v4/content/ModernAsyncTask": "androidx/loader/content/ModernAsyncTask",
       "android/support/v4/content/PermissionChecker": "androidx/core/content/PermissionChecker",
       "android/support/v4/content/SharedPreferencesCompat": "androidx/core/content/SharedPreferencesCompat",
       "android/support/v4/content/WakefulBroadcastReceiver": "androidx/legacy/content/WakefulBroadcastReceiver",
diff --git a/leanback/leanback/src/main/res/values-af/strings.xml b/leanback/leanback/src/main/res/values-af/strings.xml
index 7135f96..718fb69 100644
--- a/leanback/leanback/src/main/res/values-af/strings.xml
+++ b/leanback/leanback/src/main/res/values-af/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigasiekieslys"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Soekhandeling"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Soek"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Praat om te soek"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Deursoek <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Praat om <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> te deursoek"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Speel"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Onderbreek"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Spoel vorentoe"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Spoel vorentoe %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Spoel terug"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Spoel terug %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Slaan volgende oor"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Slaan vorige oor"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Meer handelinge"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Ontkies laaik baie"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Kies laaik baie"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Ontkies laaik niks"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Kies laaik niks"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Herhaal niks"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Herhaal alles"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Herhaal een"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Aktiveer skommel"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Deaktiveer skommel"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Aktiveer hoë gehalte"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Deaktiveer hoë gehalte"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Aktiveer onderskrifte"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Deaktiveer onderskrifte"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Voer prent in prentmodus in"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Mediakontroles word gewys"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Mediakontroles word versteek; druk D-paneel om te wys"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Voltooi"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Gaan voort"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer-foutkode %1$d ekstra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"BEGIN HIER"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Volgende"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigasiekieslys"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Soekhandeling"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Soek"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Praat om te soek"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Deursoek <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Praat om <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> te deursoek"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Speel"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Onderbreek"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Spoel vorentoe"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Spoel vorentoe %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Spoel terug"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Spoel terug %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Slaan volgende oor"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Slaan vorige oor"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Meer handelinge"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Ontkies laaik baie"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Kies laaik baie"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Ontkies laaik niks"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Kies laaik niks"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Herhaal niks"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Herhaal alles"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Herhaal een"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Aktiveer skommel"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Deaktiveer skommel"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Aktiveer hoë gehalte"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Deaktiveer hoë gehalte"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Aktiveer onderskrifte"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Deaktiveer onderskrifte"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Voer prent in prentmodus in"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Mediakontroles word gewys"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Mediakontroles word versteek; druk D-paneel om te wys"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Voltooi"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Gaan voort"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer-foutkode %1$d ekstra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"BEGIN HIER"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Volgende"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-am/strings.xml b/leanback/leanback/src/main/res/values-am/strings.xml
index 79b03b5..5b6437f 100644
--- a/leanback/leanback/src/main/res/values-am/strings.xml
+++ b/leanback/leanback/src/main/res/values-am/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"የዳሰሳ ምናሌ"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"የፍለጋ እርምጃ"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"ይፈልጉ"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"ለመፈለግ ይናገሩ"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ን ይፈልጉ"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ን ለመፈለግ ይናገሩ"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"አጫውት"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"ለአፍታ አቁም"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"በፍጥነት አሳልፍ"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"በ%1$dX ወደፊት አፍጥን"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"አጠንጥን"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"በ%1$dX አጠንጥን"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"የሚቀጥለውን ዝለል"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"ቀዳሚውን ዝለል"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"ተጨማሪ እርምጃዎች"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"አሪፍን አትምረጥ"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"አሪፍን ምረጥ"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"ደባሪን አትምረጥ"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"ደባሪን ምረጥ"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"ምንም አትድገም"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"ሁሉንም ድገም"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"አንዱን ድገም"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"መበወዣን አንቃ"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"መበወዣን አሰናክል"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"ከፍተኛ ጥራትን አንቃ"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"ከፍተኛ ጥራትን አሰናክል"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"ዝግ የመግለጫ ጽሑፎችን አንቃ"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"ዝግ የመግለጫ ጽሑፎችን አሰናክል"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"ስዕል-በስዕል ሁነታ ውስጥ ይግቡ"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"የሚዲያ መቆጣጠሪያዎች እንዲታዩ ተደርገዋል"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"የሚዲያ መቆጣጠሪያዎች ተደብቀዋል፣ ለማሳየት d-pad ን ይጫኑ"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"ጨርስ"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"ቀጥል"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"የMediaPlayer ስህተት ኮድ %1$d ተጨማሪ %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ጀምር"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"ቀጣይ"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"የዳሰሳ ምናሌ"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"የፍለጋ እርምጃ"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"ይፈልጉ"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"ለመፈለግ ይናገሩ"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ን ይፈልጉ"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ን ለመፈለግ ይናገሩ"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"አጫውት"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"ለአፍታ አቁም"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"በፍጥነት አሳልፍ"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"በ%1$dX ወደፊት አፍጥን"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"አጠንጥን"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"በ%1$dX አጠንጥን"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"የሚቀጥለውን ዝለል"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"ቀዳሚውን ዝለል"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"ተጨማሪ እርምጃዎች"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"አሪፍን አትምረጥ"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"አሪፍን ምረጥ"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"ደባሪን አትምረጥ"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"ደባሪን ምረጥ"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"ምንም አትድገም"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"ሁሉንም ድገም"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"አንዱን ድገም"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"መበወዣን አንቃ"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"መበወዣን አሰናክል"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"ከፍተኛ ጥራትን አንቃ"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"ከፍተኛ ጥራትን አሰናክል"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"ዝግ የመግለጫ ጽሑፎችን አንቃ"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"ዝግ የመግለጫ ጽሑፎችን አሰናክል"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"ስዕል-በስዕል ሁነታ ውስጥ ይግቡ"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"የሚዲያ መቆጣጠሪያዎች እንዲታዩ ተደርገዋል"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"የሚዲያ መቆጣጠሪያዎች ተደብቀዋል፣ ለማሳየት d-pad ን ይጫኑ"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"ጨርስ"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"ቀጥል"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"የMediaPlayer ስህተት ኮድ %1$d ተጨማሪ %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ጀምር"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"ቀጣይ"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ar/strings.xml b/leanback/leanback/src/main/res/values-ar/strings.xml
index 5b4dbf4..a754e18 100644
--- a/leanback/leanback/src/main/res/values-ar/strings.xml
+++ b/leanback/leanback/src/main/res/values-ar/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"قائمة التنقل"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"إجراء البحث"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"البحث"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"تحدَّثْ لبدء البحث"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"بحث في <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"تحدَّثْ لبدء البحث في <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"تشغيل"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"إيقاف مؤقت"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"تقديم سريع"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"‏التقديم السريع بمقدار %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"إرجاع"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"‏إرجاع بمقدار %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"تخطي التالي"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"تخطي السابق"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"مزيد من الإجراءات"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"إلغاء اختيار التقييم \"أعجبني\""</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"اختيار التقييم \"أعجبني\""</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"إلغاء اختيار التقييم \"لا يعجبني\""</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"اختيار التقييم \"لا يعجبني\""</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"عدم التكرار"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"تكرار الكل"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"تكرار مقطع واحد"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"تفعيل الترتيب العشوائي"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"إيقاف الترتيب العشوائي"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"تفعيل الجودة العالية"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"إيقاف الجودة العالية"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"تفعيل الترجمة والشرح"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"إيقاف الترجمة والشرح"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"الدخول في الوضع \"نافذة ضمن النافذة\""</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"تم إظهار عناصر التحكم في الوسائط"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"تم إخفاء عناصر التحكم في الوسائط، ويمكنك الضغط على لوحة التحكم لإظهارها"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"إنهاء"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"متابعة"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"‏رمز الخطأ %1$d في MediaPlayer بالإضافة إلى %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"البدء"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"التالي"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"قائمة التنقل"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"إجراء البحث"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"البحث"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"تحدَّثْ لبدء البحث"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"بحث في <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"تحدَّثْ لبدء البحث في <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"تشغيل"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"إيقاف مؤقت"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"تقديم سريع"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"‏التقديم السريع بمقدار %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"ترجيع"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"‏ترجيع بمقدار %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"تخطي التالي"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"تخطي السابق"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"مزيد من الإجراءات"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"إلغاء اختيار التقييم \"أعجبني\""</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"اختيار التقييم \"أعجبني\""</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"إلغاء اختيار التقييم \"لا يعجبني\""</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"اختيار التقييم \"لا يعجبني\""</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"عدم التكرار"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"تكرار الكل"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"تكرار مقطع واحد"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"تفعيل الترتيب العشوائي"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"إيقاف الترتيب العشوائي"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"تفعيل الجودة العالية"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"إيقاف الجودة العالية"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"تفعيل الترجمة والشرح"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"إيقاف الترجمة والشرح"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"الدخول في الوضع \"نافذة ضمن النافذة\""</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"تم إظهار عناصر التحكم في الوسائط"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"تم إخفاء عناصر التحكم في الوسائط، ويمكنك الضغط على لوحة التحكم لإظهارها"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"إنهاء"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"متابعة"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"‏رمز الخطأ %1$d في MediaPlayer بالإضافة إلى %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"البدء"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"التالي"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-as/strings.xml b/leanback/leanback/src/main/res/values-as/strings.xml
index 7284e2d..aaba187 100644
--- a/leanback/leanback/src/main/res/values-as/strings.xml
+++ b/leanback/leanback/src/main/res/values-as/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"নেভিগেশ্বন মেনু"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"সন্ধান সম্পৰ্কীয় কাৰ্য"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"সন্ধান"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"সন্ধান কৰিবলৈ কথা কওক"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> সন্ধান কৰক"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> সন্ধান কৰিবলৈ কথা কওক"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"প্লে কৰক"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"পজ কৰক"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"ফাষ্ট ফৰৱাৰ্ড"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"ফাষ্ট ফৰৱার্ড কৰক %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"ৰিৱাইণ্ড কৰক"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"ৰিৱাইণ্ড কৰক %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"পৰৱৰ্তীটোলৈ এৰি যাওক"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"আগৰটোলৈ এৰি যাওক"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"অধিক কাৰ্য"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"থাম্ব আপ বাছনি নাইকিয়া কৰক"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"থাম্ব আপ বাছনি কৰক"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"থাম্ব ডাউন বাছনি নাইকিয়া কৰক"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"থাম্ব ডাউন বাছনি কৰক"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"একো পুনৰাই প্লে নকৰিব"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"সকলো পুনৰাই প্লে কৰক"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"এটা পুনৰাই প্লে’ কৰক"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"সান-মিহলি সক্ষম কৰক"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"সান-মিহলি অক্ষম কৰক"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"উচ্চ মানৰ প্লেবেক সক্ষম কৰক"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"উচ্চ মান অক্ষম কৰক"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"ছাব-টাইটেল সক্ষম কৰক"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"ছাব-টাইটেল অক্ষম কৰক"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"চিত্ৰৰ ভিতৰত চিত্ৰ ম\'ড আৰম্ভ কৰক"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"মিডিয়াৰ নিয়ন্ত্ৰণসমূহ দেখুওৱা হ’ল"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"মিডিয়াৰ নিয়ন্ত্ৰণসমূহ লুকুৱাই ৰখা হৈছে, দেখুওৱাবলৈ ডি-পেডত টিপক"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"সমাপ্ত"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"অব্যাহত ৰাখক"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer ত্ৰুটি ক\'ড %1$d, অতিৰিক্ত %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"আৰম্ভ কৰক"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"পৰৱৰ্তী"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"নেভিগেশ্বন মেনু"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"সন্ধান সম্পৰ্কীয় কাৰ্য"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"সন্ধান"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"সন্ধান কৰিবলৈ কথা কওক"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> সন্ধান কৰক"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> সন্ধান কৰিবলৈ কথা কওক"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"প্লে কৰক"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"পজ কৰক"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"ফাষ্ট ফৰৱাৰ্ড"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"ফাষ্ট ফৰৱার্ড কৰক %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"ৰিৱাইণ্ড কৰক"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"ৰিৱাইণ্ড কৰক %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"পৰৱৰ্তীটোলৈ এৰি যাওক"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"আগৰটোলৈ এৰি যাওক"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"অধিক কাৰ্য"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"থাম্ব আপ বাছনি নাইকিয়া কৰক"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"থাম্ব আপ বাছনি কৰক"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"থাম্ব ডাউন বাছনি নাইকিয়া কৰক"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"থাম্ব ডাউন বাছনি কৰক"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"একো পুনৰাই প্লে নকৰিব"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"সকলো পুনৰাই প্লে কৰক"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"এটা পুনৰাই প্লে’ কৰক"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"সান-মিহলি সক্ষম কৰক"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"সান-মিহলি অক্ষম কৰক"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"উচ্চ মানৰ প্লেবেক সক্ষম কৰক"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"উচ্চ মান অক্ষম কৰক"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"ছাব-টাইটেল সক্ষম কৰক"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"ছাব-টাইটেল অক্ষম কৰক"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"চিত্ৰৰ ভিতৰত চিত্ৰ ম\'ড আৰম্ভ কৰক"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"মিডিয়াৰ নিয়ন্ত্ৰণসমূহ দেখুওৱা হ’ল"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"মিডিয়াৰ নিয়ন্ত্ৰণসমূহ লুকুৱাই ৰখা হৈছে, দেখুওৱাবলৈ ডি-পেডত টিপক"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"সমাপ্ত"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"অব্যাহত ৰাখক"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer ত্ৰুটি ক\'ড %1$d, অতিৰিক্ত %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"আৰম্ভ কৰক"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"পৰৱৰ্তী"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-az/strings.xml b/leanback/leanback/src/main/res/values-az/strings.xml
index 14596a1..f241b35 100644
--- a/leanback/leanback/src/main/res/values-az/strings.xml
+++ b/leanback/leanback/src/main/res/values-az/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Naviqasiya menyusu"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Axtarış Əməliyyatı"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Axtarın"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Axtarış üçün danışın"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Axtarın: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Axtarış üçün danışın: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Fasilə verin"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Dayandırın"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Sürətli Yönləndirmə"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Sürətli Yönləndirmə %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Geri çəkin"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Geri çəkin %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Növbətini Keçin"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Öncəkini Keçin"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Digər Əməliyyatlar"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Bəyənməkdən imtina edin"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Bəyənin"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Bəyənməməkdən İmtina Edin"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Bəyənməyin"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Təkrarlanmasın"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Hamısını Təkrarlayın"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Biri təkrarlansın"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Qarışdırmanı Aktiv edin"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Qarışdırmanı Deaktiv edin"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Yüksək Keyfiyyəti Aktiv edin"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Yüksək Keyfiyyəti Deaktiv edin"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Qapalı Çəkilişi Aktiv edin"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Qapalı Çəkilişi Deaktiv edin"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Şəkil içində Şəkil Rejiminə daxil olun"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Media nəzarətləri açıqdır"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Media idarəetmələri gizlidir, göstərmək üçün d-pad\'i basın"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Tamamlayın"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Davam edin"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Media Pleyer xəta kodu %1$d əlavə %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"BAŞLAYIN"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Sonrakı"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Naviqasiya menyusu"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Axtarış Əməliyyatı"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Axtarın"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Axtarış üçün danışın"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Axtarın: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Axtarış üçün danışın: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Fasilə verin"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Dayandırın"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Sürətli Yönləndirmə"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Sürətli Yönləndirmə %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Geri çəkin"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Geri çəkin %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Növbətini Keçin"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Öncəkini Keçin"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Digər Əməliyyatlar"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Bəyənməkdən imtina edin"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Bəyənin"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Bəyənməməkdən İmtina Edin"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Bəyənməyin"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Təkrarlanmasın"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Hamısını Təkrarlayın"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Biri təkrarlansın"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Qarışdırmanı Aktiv edin"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Qarışdırmanı Deaktiv edin"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Yüksək Keyfiyyəti Aktiv edin"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Yüksək Keyfiyyəti Deaktiv edin"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Qapalı Çəkilişi Aktiv edin"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Qapalı Çəkilişi Deaktiv edin"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Şəkil içində Şəkil Rejiminə daxil olun"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Media nəzarətləri açıqdır"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Media idarəetmələri gizlidir, göstərmək üçün d-pad\'i basın"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Tamamlayın"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Davam edin"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Media Pleyer xəta kodu %1$d əlavə %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"BAŞLAYIN"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Sonrakı"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-b+sr+Latn/strings.xml b/leanback/leanback/src/main/res/values-b+sr+Latn/strings.xml
index 7b86cc5..9ddbf94 100644
--- a/leanback/leanback/src/main/res/values-b+sr+Latn/strings.xml
+++ b/leanback/leanback/src/main/res/values-b+sr+Latn/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Meni za navigaciju"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Radnja pretrage"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Pretražite"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Izgovorite da biste pretraživali"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Pretražite <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Izgovorite da biste pretražili <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Pusti"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pauziraj"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Premotaj unapred"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Premotaj unapred %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Premotaj unazad"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Premotaj unazad %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Preskoči na sledeće"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Preskoči na prethodno"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Još radnji"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Opozovi izbor „Sviđa mi se“"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Izaberi „Sviđa mi se“"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Opozovi izbor „Ne sviđa mi se“"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Izaberi „Ne sviđa mi se“"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Ne ponavljaj nijednu"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Ponovi sve"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Ponovi jednu"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Omogući nasumično puštanje"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Onemogući nasumično puštanje"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Omogući visok kvalitet"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Onemogući visok kvalitet"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Omogući titlove"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Onemogući titlove"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Uđi u režim Slika u slici"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Kontrole za medije su prikazane"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Kontrole za medije su skrivene, pritisnite d-pad da biste ih prikazali"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Završi"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Nastavi"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Kôd greške MediaPlayer-a: %1$d, dodatno %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ZAPOČNITE"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Dalje"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Meni za navigaciju"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Radnja pretrage"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Pretražite"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Izgovorite da biste pretraživali"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Pretražite <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Izgovorite da biste pretražili <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Pusti"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pauziraj"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Premotaj unapred"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Premotaj unapred %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Premotaj unazad"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Premotaj unazad %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Preskoči na sledeće"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Preskoči na prethodno"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Još radnji"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Opozovi izbor „Sviđa mi se“"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Izaberi „Sviđa mi se“"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Opozovi izbor „Ne sviđa mi se“"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Izaberi „Ne sviđa mi se“"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Ne ponavljaj nijednu"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Ponovi sve"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Ponovi jednu"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Omogući nasumično puštanje"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Onemogući nasumično puštanje"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Omogući visok kvalitet"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Onemogući visok kvalitet"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Omogući titlove"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Onemogući titlove"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Uđi u režim Slika u slici"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Kontrole za medije su prikazane"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Kontrole za medije su skrivene, pritisnite d-pad da biste ih prikazali"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Završi"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Nastavi"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Kôd greške MediaPlayer-a: %1$d, dodatno %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ZAPOČNITE"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Dalje"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-be/strings.xml b/leanback/leanback/src/main/res/values-be/strings.xml
index ad86128..d00cd19 100644
--- a/leanback/leanback/src/main/res/values-be/strings.xml
+++ b/leanback/leanback/src/main/res/values-be/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Меню навігацыі"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Пошук"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Пошук"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Прамоўце пошукавы запыт"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Шукаць тут: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Прамоўце запыт для пошуку тут: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Прайграць"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Паўза"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Перамотка ўперад"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Перамотка ўперад %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Пераматаць"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Перамотка назад %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Перайсці да наступнага элемента"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Перайсці да папярэдняга элемента"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Іншыя дзеянні"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Зняць адзнаку \"Падабаецца\""</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Паставіць адзнаку \"Падабаецца\""</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Зняць адзнаку \"Не падабаецца\""</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Паставіць адзнаку \"Не падабаецца\""</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Не паўтараць нічога"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Паўтарыць усе"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Паўтарыць адзін элемент"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Уключыць перамешванне"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Адключыць перамешванне"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Уключыць высокую якасць"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Адключыць высокую якасць"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Уключыць схаваныя цітры"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Адключыць схаваныя цітры"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Перайсці ў рэжым \"Відарыс у відарысе\""</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Элементы кіравання мультымедыя паказаны"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Элементы кіравання мультымедыя схаваны. Каб паказаць іх, націсніце d-pad"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Завяршыць"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Працягнуць"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Код памылкі MediaPlayer: %1$d (дадатковы: %2$d)"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ПАЧАЦЬ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Далей"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Меню навігацыі"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Пошук"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Пошук"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Прамоўце пошукавы запыт"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Шукаць тут: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Прамоўце запыт для пошуку тут: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Прайграць"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Паўза"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Перамотка ўперад"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Перамотка ўперад %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Пераматаць"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Перамотка назад %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Перайсці да наступнага элемента"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Перайсці да папярэдняга элемента"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Іншыя дзеянні"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Зняць адзнаку \"Падабаецца\""</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Паставіць адзнаку \"Падабаецца\""</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Зняць адзнаку \"Не падабаецца\""</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Паставіць адзнаку \"Не падабаецца\""</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Не паўтараць нічога"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Паўтарыць усе"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Паўтарыць адзін элемент"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Уключыць перамешванне"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Адключыць перамешванне"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Уключыць высокую якасць"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Адключыць высокую якасць"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Уключыць схаваныя цітры"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Адключыць схаваныя цітры"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Перайсці ў рэжым \"Відарыс у відарысе\""</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Элементы кіравання мультымедыя паказаны"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Элементы кіравання мультымедыя схаваны. Каб паказаць іх, націсніце d-pad"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Завяршыць"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Працягнуць"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Код памылкі MediaPlayer: %1$d (дадатковы: %2$d)"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ПАЧАЦЬ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Далей"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-bg/strings.xml b/leanback/leanback/src/main/res/values-bg/strings.xml
index 0eacf0d..368b503 100644
--- a/leanback/leanback/src/main/res/values-bg/strings.xml
+++ b/leanback/leanback/src/main/res/values-bg/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Меню за навигация"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Действие за търсене"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Търсете"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Търсете с глас"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Търсете в/ъв <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Търсете с глас в/ъв <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Възпроизвеждане"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Поставяне на пауза"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Превъртане напред"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Превъртане напред със скорост %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Превъртане назад"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Превъртане назад със скорост %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Към следващия елемент"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Към предишния елемент"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Още действия"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Отмяна на „Харесва ми“"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Избиране на „Харесва ми“"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Отмяна на „Не ми харесва“"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Избиране на „Не ми харесва“"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Без повтаряне"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Повтаряне на всички"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Повтаряне на един елемент"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Активиране на разбъркването"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Деактивиране на разбъркването"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Активиране на високото качество"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Деактивиране на високото качество"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Активиране на субтитрите"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Деактивиране на субтитрите"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Преминаване в режим „Картина в картината“"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Контролите за мултимедия са показани"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Контролите за мултимедия са скрити. Натиснете контролния пад, за да се покажат"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Край"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Напред"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Код на грешката на MediaPlayer %1$d (допълнително: %2$d)"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ПЪРВИ СТЪПКИ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Напред"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Меню за навигация"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Действие за търсене"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Търсете"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Търсете с глас"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Търсете: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Търсете с глас: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Възпроизвеждане"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Поставяне на пауза"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Превъртане напред"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Превъртане напред със скорост %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Превъртане назад"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Превъртане назад със скорост %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Към следващия елемент"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Към предишния елемент"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Още действия"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Отмяна на „Харесва ми“"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Избиране на „Харесва ми“"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Отмяна на „Не ми харесва“"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Избиране на „Не ми харесва“"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Без повтаряне"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Повтаряне на всички"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Повтаряне на един елемент"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Активиране на разбъркването"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Деактивиране на разбъркването"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Активиране на високото качество"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Деактивиране на високото качество"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Активиране на субтитрите"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Деактивиране на субтитрите"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Преминаване в режим „Картина в картината“"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Контролите за мултимедия са показани"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Контролите за мултимедия са скрити. Натиснете контролния пад, за да се покажат"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Край"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Напред"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Код на грешката на MediaPlayer %1$d (допълнително: %2$d)"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ПЪРВИ СТЪПКИ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Напред"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-bn/strings.xml b/leanback/leanback/src/main/res/values-bn/strings.xml
index a7ae625..4ce59b6 100644
--- a/leanback/leanback/src/main/res/values-bn/strings.xml
+++ b/leanback/leanback/src/main/res/values-bn/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"নেভিগেশন মেনু"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"খোঁজার অ্যাক্টিভিটি"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"সার্চ"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"বলার মাধ্যমে খুঁজুন"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> খুঁজুন"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> বলে সেটি খুঁজুন"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"চালান"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"পজ করুন"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"ফাস্ট ফরওয়ার্ড"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX স্পিডে ফাস্ট ফরওয়ার্ড করুন"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"পিছিয়ে যান"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX স্পিডে পিছিয়ে যান"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"সরাসরি পরেরটিতে চলে যান"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"সরাসরি আগেরটিতে চলে যান"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"আরও অ্যাক্টিভিটি"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"উপরের দিকে করা বুড়ো আঙ্গুলের চিহ্নকে বাদ দিন"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"উপরের দিকে করা বুড়ো আঙ্গুলের চিহ্নকে বেছে নিন"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"নিচের দিকে করা বুড়ো আঙ্গুলের চিহ্নকে বাদ দিন"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"নিচের দিকে করা বুড়ো আঙ্গুলের চিহ্নকে বেছে নিন"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"কোনও আইটেম আবার চালাবেন না"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"সবগুলি আইটেম আবার চালান"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"একটি আইটেম আবার চালান"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"শাফেল চালু করুন"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"শাফেল বন্ধ করুন"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"খুব ভাল কোয়ালিটি চালু করুন"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"খুব ভাল কোয়ালিটি বন্ধ করুন"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"সাবটাইটেল চালু করুন"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"সাবটাইটেল বন্ধ করুন"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"\'ছবির মধ্যে ছবি\' মোডে যান"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"মিডিয়ার নিয়ন্ত্রণগুলি দেখানো হয়েছে"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"মিডিয়ার নিয়ন্ত্রণগুলি লুকানো আছে, দেখার জন্য ডি-প্যাড টিপুন"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"শেষ করুন"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"এগিয়ে যান"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer সমস্যা কোড %1$d অতিরিক্ত %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"শুরু করা যাক"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"পরবর্তী"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"নেভিগেশন মেনু"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"খোঁজার অ্যাক্টিভিটি"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"সার্চ"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"বলার মাধ্যমে খুঁজুন"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> খুঁজুন"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> বলে সেটি খুঁজুন"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"চালান"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"পজ করুন"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"ফাস্ট ফরওয়ার্ড"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX স্পিডে ফাস্ট ফরওয়ার্ড করুন"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"পিছিয়ে যান"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX স্পিডে পিছিয়ে যান"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"সরাসরি পরেরটিতে চলে যান"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"সরাসরি আগেরটিতে চলে যান"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"আরও অ্যাক্টিভিটি"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"উপরের দিকে করা বুড়ো আঙ্গুলের চিহ্নকে বাদ দিন"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"উপরের দিকে করা বুড়ো আঙ্গুলের চিহ্নকে বেছে নিন"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"নিচের দিকে করা বুড়ো আঙ্গুলের চিহ্নকে বাদ দিন"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"নিচের দিকে করা বুড়ো আঙ্গুলের চিহ্নকে বেছে নিন"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"কোনও আইটেম আবার চালাবেন না"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"সবগুলি আইটেম আবার চালান"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"একটি আইটেম আবার চালান"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"শাফেল চালু করুন"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"শাফেল বন্ধ করুন"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"খুব ভাল কোয়ালিটি চালু করুন"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"খুব ভাল কোয়ালিটি বন্ধ করুন"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"সাবটাইটেল চালু করুন"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"সাবটাইটেল বন্ধ করুন"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"\'ছবির মধ্যে ছবি\' মোডে যান"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"মিডিয়ার নিয়ন্ত্রণগুলি দেখানো হয়েছে"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"মিডিয়ার নিয়ন্ত্রণগুলি লুকানো আছে, দেখার জন্য ডি-প্যাড টিপুন"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"শেষ করুন"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"এগিয়ে যান"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer সমস্যা কোড %1$d অতিরিক্ত %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"শুরু করা যাক"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"পরবর্তী"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-bs/strings.xml b/leanback/leanback/src/main/res/values-bs/strings.xml
index 6c429a0..68aa6f3 100644
--- a/leanback/leanback/src/main/res/values-bs/strings.xml
+++ b/leanback/leanback/src/main/res/values-bs/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Meni za navigaciju"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Pretraživanje"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Pretražite"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Kažite nešto da pokrenete pretragu"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Pretraži <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Kažite nešto da pokrenete pretragu <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Reproduciraj"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pauza"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Ubrzaj"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Ubrzaj %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Premotavanje unazad"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Premotaj %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Preskoči sljedeće"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Preskoči prethodno"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Više radnji"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Poništi pozitivnu ocjenu"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Odaberi pozitivnu ocjenu"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Poništi negativnu ocjenu"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Odaberi negativnu ocjenu"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Ne ponavljaj"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Ponovi sve"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Ponovi jedno"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Uključi nasumičnu reprodukciju"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Isključi nasumičnu reprodukciju"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Uključi visoki kvalitet"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Isključi visoki kvalitet"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Uključi titlove"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Isključi titlove"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Uđi u način rada Slika u slici"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Kontrole za medije su prikazane"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Kontrole za medije su skrivene. Pritisnite d-pad da ih prikažete"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Završi"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Nastavi"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Kôd greške MediaPlayera %1$d dodatno %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ZAPOČNITE"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Naprijed"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Meni za navigaciju"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Pretraživanje"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Pretražite"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Kažite nešto da pokrenete pretragu"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Pretraži <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Kažite nešto da pokrenete pretragu <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Reproduciraj"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pauza"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Ubrzaj"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Ubrzaj %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Premotavanje unazad"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Premotaj %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Preskoči sljedeće"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Preskoči prethodno"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Više radnji"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Poništi pozitivnu ocjenu"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Odaberi pozitivnu ocjenu"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Poništi negativnu ocjenu"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Odaberi negativnu ocjenu"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Ne ponavljaj"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Ponovi sve"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Ponovi jedno"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Uključi nasumičnu reprodukciju"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Isključi nasumičnu reprodukciju"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Uključi visoki kvalitet"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Isključi visoki kvalitet"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Uključi titlove"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Isključi titlove"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Uđi u način rada Slika u slici"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Kontrole za medije su prikazane"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Kontrole za medije su skrivene. Pritisnite d-pad da ih prikažete"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Završi"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Nastavi"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Kôd greške MediaPlayera %1$d dodatno %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ZAPOČNITE"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Naprijed"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ca/strings.xml b/leanback/leanback/src/main/res/values-ca/strings.xml
index 3a2b592..afd2cd7e 100644
--- a/leanback/leanback/src/main/res/values-ca/strings.xml
+++ b/leanback/leanback/src/main/res/values-ca/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menú de navegació"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Acció de cerca"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Cerca"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Parla per cercar"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Cerca a <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Parla per cercar a <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Reprodueix"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Posa en pausa"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Avança ràpidament"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Avança ràpidament %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Rebobina"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Rebobina %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Passa al següent"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Passa a l\'anterior"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Més accions"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Desselecciona \"M\'agrada\""</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Selecciona \"M\'agrada\""</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Desselecciona \"No m\'agrada\""</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Selecciona \"No m\'agrada\""</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"No en repeteixis cap"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repeteix-ho tot"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repeteix un element"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Activa la reproducció aleatòria"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Desactiva la reproducció aleatòria"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Activa l\'alta qualitat"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Desactiva l\'alta qualitat"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Activa els subtítols"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Desactiva els subtítols"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Entra al mode de pantalla en pantalla"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Es mostren els controls multimèdia"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"S\'han amagat els controls multimèdia; prem la creu direccional per mostrar-los"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Finalitza"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continua"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Codi d\'error de MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"COMENÇA"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Següent"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menú de navegació"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Acció de cerca"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Cerca"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Parla per cercar"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Cerca a <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Parla per cercar a <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Reprodueix"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Posa en pausa"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Avança ràpidament"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Avança ràpidament %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Rebobina"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Rebobina %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Passa al següent"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Passa a l\'anterior"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Més accions"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Desselecciona \"M\'agrada\""</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Selecciona \"M\'agrada\""</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Desselecciona \"No m\'agrada\""</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Selecciona \"No m\'agrada\""</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"No en repeteixis cap"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repeteix-ho tot"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repeteix un element"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Activa la reproducció aleatòria"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Desactiva la reproducció aleatòria"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Activa l\'alta qualitat"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Desactiva l\'alta qualitat"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Activa els subtítols"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Desactiva els subtítols"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Entra al mode de pantalla en pantalla"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Es mostren els controls multimèdia"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"S\'han amagat els controls multimèdia; prem la creu direccional per mostrar-los"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Finalitza"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continua"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Codi d\'error de MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"COMENÇA"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Següent"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-cs/strings.xml b/leanback/leanback/src/main/res/values-cs/strings.xml
index 3b3baa8..3260e72 100644
--- a/leanback/leanback/src/main/res/values-cs/strings.xml
+++ b/leanback/leanback/src/main/res/values-cs/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigační nabídka"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Akce vyhledávání"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Hledat"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Vyhledávejte hlasem"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Hledat <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Vyhledávejte v kontextu <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> hlasem"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$d×"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$d×"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Přehrát"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pozastavit"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Přetočit vpřed"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Přetočit vpřed %1$d×"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Přetočit zpět"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Přetočit zpět %1$d×"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Přeskočit na další"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Přeskočit na předchozí"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Další akce"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Zrušit výběr hodnocení palec nahoru"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Vybrat hodnocení palec nahoru"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Zrušit výběr hodnocení palec dolů"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Vybrat hodnocení palec dolů"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Neopakovat"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Opakovat vše"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Opakovat jednu položku"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Zapnout náhodné přehrávání"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Vypnout náhodné přehrávání"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Zapnout vysokou kvalitu"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Vypnout vysokou kvalitu"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Zapnout titulky"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Vypnout titulky"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Přejít do režimu obraz v obraze"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Ovládací prvky médií jsou zobrazeny"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Ovládací prvky médií jsou skryty, zobrazíte je stisknutím křížového ovladače"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Dokončit"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Pokračovat"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Kód chyby přehrávače MediaPlayer %1$d, další %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ZAČÍT"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Další"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigační nabídka"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Akce vyhledávání"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Hledat"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Vyhledávejte hlasem"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Hledat <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Vyhledávejte v kontextu <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> hlasem"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$d×"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$d×"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Přehrát"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pozastavit"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Přetočit vpřed"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Přetočit vpřed %1$d×"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Přetočit zpět"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Přetočit zpět %1$d×"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Přeskočit na další"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Přeskočit na předchozí"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Další akce"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Zrušit výběr hodnocení palec nahoru"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Vybrat hodnocení palec nahoru"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Zrušit výběr hodnocení palec dolů"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Vybrat hodnocení palec dolů"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Neopakovat"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Opakovat vše"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Opakovat jednu položku"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Zapnout náhodné přehrávání"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Vypnout náhodné přehrávání"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Zapnout vysokou kvalitu"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Vypnout vysokou kvalitu"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Zapnout titulky"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Vypnout titulky"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Přejít do režimu obraz v obraze"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Ovládací prvky médií jsou zobrazeny"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Ovládací prvky médií jsou skryty, zobrazíte je stisknutím křížového ovladače"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Dokončit"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Pokračovat"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Kód chyby přehrávače MediaPlayer %1$d, další %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ZAČÍT"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Další"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-da/strings.xml b/leanback/leanback/src/main/res/values-da/strings.xml
index dfca79dd..42d24ac 100644
--- a/leanback/leanback/src/main/res/values-da/strings.xml
+++ b/leanback/leanback/src/main/res/values-da/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigationsmenu"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Søg handling"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Søg"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Tal for at søge"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Søg efter <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Tal for at søge efter <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Afspil"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Sæt på pause"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Spol frem"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Spol frem %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Spol tilbage"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Spol tilbage %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Spring til næste"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Spring til forrige"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Flere handlinger"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Fravælg tommelfinger op"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Vælg tommelfinger op"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Fravælg tommelfinger ned"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Vælg tommelfinger ned"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Gentag ingen"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Gentag alle"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Gentag én"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Slå bland til"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Slå bland fra"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Slå høj kvalitet til"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Slå høj kvalitet fra"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Slå undertekster til"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Slå undertekster fra"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Tilstand med integreret billede"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Knapperne til afspilning er synlige"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Knapperne til afspilning er skjult. Tryk på D-pad\'en for at se dem"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Afslut"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Fortsæt"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer-fejlkode %1$d ekstra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"KOM GODT I GANG"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Næste"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigationsmenu"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Søg handling"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Søg"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Tal for at søge"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Søg efter <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Tal for at søge efter <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Afspil"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Sæt på pause"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Spol frem"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Spol frem %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Spol tilbage"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Spol tilbage %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Spring til næste"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Spring til forrige"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Flere handlinger"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Fravælg tommelfinger op"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Vælg tommelfinger op"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Fravælg tommelfinger ned"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Vælg tommelfinger ned"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Gentag ingen"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Gentag alle"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Gentag én"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Slå bland til"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Slå bland fra"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Slå høj kvalitet til"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Slå høj kvalitet fra"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Slå undertekster til"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Slå undertekster fra"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Tilstand med integreret billede"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Knapperne til afspilning er synlige"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Knapperne til afspilning er skjult. Tryk på D-pad\'en for at se dem"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Afslut"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Fortsæt"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer-fejlkode %1$d ekstra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"KOM GODT I GANG"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Næste"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-de/strings.xml b/leanback/leanback/src/main/res/values-de/strings.xml
index a9bfe23..b380706 100644
--- a/leanback/leanback/src/main/res/values-de/strings.xml
+++ b/leanback/leanback/src/main/res/values-de/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigationsmenü"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Suchvorgang"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Suche"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Zum Suchen sprechen"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"In <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> suchen"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Zum Suchen in <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> sprechen"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Wiedergeben"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pausieren"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Vorspulen"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Vorspulen %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Zurückspulen"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Zurückspulen %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Nächstes Element überspringen"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Vorheriges Element überspringen"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Weitere Aktionen"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"\"Mag ich\" deaktivieren"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"\"Mag ich\" aktivieren"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"\"Mag ich nicht\" deaktivieren"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"\"Mag ich nicht\" aktivieren"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Kein Element wiederholen"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Alle wiederholen"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Ein Element wiederholen"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Zufallsmix aktivieren"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Zufallsmix deaktivieren"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Hohe Qualität aktivieren"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Hohe Qualität deaktivieren"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Untertitel aktivieren"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Untertitel deaktivieren"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Bild-im-Bild-Modus aktivieren"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Mediensteuerelemente eingeblendet"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Mediensteuerelemente ausgeblendet. Drücke das Steuerkreuz, um die Steuerelemente wieder einzublenden"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Fertig"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Weiter"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer-Fehlercode %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"JETZT STARTEN"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Weiter"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigationsmenü"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Suchvorgang"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Suche"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Zum Suchen sprechen"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"In <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> suchen"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Zum Suchen in <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> sprechen"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Wiedergeben"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pausieren"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Vorspulen"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Vorspulen %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Zurückspulen"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Zurückspulen %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Nächstes Element überspringen"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Vorheriges Element überspringen"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Weitere Aktionen"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"\"Mag ich\" deaktivieren"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"\"Mag ich\" aktivieren"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"\"Mag ich nicht\" deaktivieren"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"\"Mag ich nicht\" aktivieren"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Kein Element wiederholen"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Alle wiederholen"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Ein Element wiederholen"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Zufallsmix aktivieren"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Zufallsmix deaktivieren"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Hohe Qualität aktivieren"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Hohe Qualität deaktivieren"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Untertitel aktivieren"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Untertitel deaktivieren"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Bild-im-Bild-Modus aktivieren"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Mediensteuerelemente eingeblendet"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Mediensteuerelemente ausgeblendet. Drücke das Steuerkreuz, um die Steuerelemente wieder einzublenden"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Fertig"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Weiter"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer-Fehlercode %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"JETZT STARTEN"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Weiter"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-el/strings.xml b/leanback/leanback/src/main/res/values-el/strings.xml
index 27503c5..f7fa9e54 100644
--- a/leanback/leanback/src/main/res/values-el/strings.xml
+++ b/leanback/leanback/src/main/res/values-el/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Μενού πλοήγησης"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Ενέργεια αναζήτησης"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Αναζήτηση"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Μιλήστε για να κάνετε αναζήτηση"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Αναζήτηση <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Μιλήστε για να κάνετε αναζήτηση σε <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Αναπαραγωγή"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Παύση"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Γρήγορη προώθηση"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Γρήγορη προώθηση %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Επαναφορά"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Επαναφορά %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Παράβλεψη επόμενου"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Παράβλεψη προηγούμενου"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Περισσότερες ενέργειες"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Αποεπιλογή αξιολόγησης \"Μου αρέσουν\""</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Επιλογή αξιολόγησης \"Μου αρέσουν\""</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Αποεπιλογή αξιολόγησης \"Δεν εγκρίνω\""</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Επιλογή αξιολόγησης \"Δεν εγκρίνω\""</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Καμία επανάληψη"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Επανάληψη όλων"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Επανάληψη ενός στοιχείου"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Ενεργοποίηση τυχαίας αναπαραγωγής"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Απενεργοποίηση τυχαίας αναπαραγωγής"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Ενεργοποίηση υψηλής ποιότητας"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Απενεργοποίηση υψηλής ποιότητας"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Ενεργοποίηση υποτίτλων"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Απενεργοποίηση υποτίτλων"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Εισαγωγή εικόνας στη λειτουργία παράθεσης εικόνων"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Εμφάνιση στοιχείων ελέγχου μέσων"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Απόκρυψη στοιχείων ελέγχου μέσων, πιέστε το d-pad για εμφάνιση"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Τέλος"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Συνέχεια"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Κωδικός σφάλματος MediaPlayer %1$d επιπλέον %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ΕΝΑΡΞΗ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Επόμενη"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Μενού πλοήγησης"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Ενέργεια αναζήτησης"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Αναζήτηση"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Μιλήστε για να αναζητήσετε"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Αναζήτηση <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Μιλήστε για να αναζητήσετε σε <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Αναπαραγωγή"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Παύση"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Γρήγορη προώθηση"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Γρήγορη προώθηση %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Επαναφορά"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Επαναφορά %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Παράβλεψη επόμενου"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Παράβλεψη προηγούμενου"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Περισσότερες ενέργειες"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Αποεπιλογή αξιολόγησης \"Μου αρέσουν\""</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Επιλογή αξιολόγησης \"Μου αρέσουν\""</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Αποεπιλογή αξιολόγησης \"Δεν εγκρίνω\""</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Επιλογή αξιολόγησης \"Δεν εγκρίνω\""</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Καμία επανάληψη"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Επανάληψη όλων"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Επανάληψη ενός στοιχείου"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Ενεργοποίηση τυχαίας αναπαραγωγής"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Απενεργοποίηση τυχαίας αναπαραγωγής"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Ενεργοποίηση υψηλής ποιότητας"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Απενεργοποίηση υψηλής ποιότητας"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Ενεργοποίηση υποτίτλων"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Απενεργοποίηση υποτίτλων"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Εισαγωγή εικόνας στη λειτουργία παράθεσης εικόνων"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Εμφάνιση στοιχείων ελέγχου μέσων"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Απόκρυψη στοιχείων ελέγχου μέσων, πιέστε το d-pad για εμφάνιση"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Τέλος"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Συνέχεια"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Κωδικός σφάλματος MediaPlayer %1$d επιπλέον %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ΕΝΑΡΞΗ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Επόμενη"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-en-rAU/strings.xml b/leanback/leanback/src/main/res/values-en-rAU/strings.xml
index 6f79fd1..9651def 100644
--- a/leanback/leanback/src/main/res/values-en-rAU/strings.xml
+++ b/leanback/leanback/src/main/res/values-en-rAU/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigation menu"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Search Action"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Search"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Speak to search"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Speak to search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Play"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pause"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Fast Forward"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Fast Forward %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Rewind"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Rewind %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Skip Next"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Skip Previous"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"More Actions"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Deselect Thumb Up"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Select Thumb Up"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Deselect Thumb Down"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Select Thumb Down"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Repeat None"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repeat All"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repeat One"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Enable Shuffle"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Disable Shuffle"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Enable High Quality"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Disable High Quality"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Enable Closed Captioning"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Disable Closed Captioning"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Enter Picture In Picture Mode"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Media controls shown"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Media controls hidden, press d-pad to show"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Finish"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continue"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer error code %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"GET STARTED"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Next"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigation menu"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Search Action"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Search"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Speak to search"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Speak to search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Play"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pause"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Fast Forward"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Fast Forward %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Rewind"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Rewind %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Skip Next"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Skip Previous"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"More Actions"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Deselect Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Select Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Deselect Thumb Down"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Select Thumb Down"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Repeat None"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repeat All"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repeat One"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Enable Shuffle"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Disable Shuffle"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Enable High Quality"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Disable High Quality"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Enable Closed Captioning"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Disable Closed Captioning"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Enter Picture In Picture Mode"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Media controls shown"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Media controls hidden, press d-pad to show"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Finish"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continue"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer error code %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"GET STARTED"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Next"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-en-rCA/strings.xml b/leanback/leanback/src/main/res/values-en-rCA/strings.xml
index 6f79fd1..9651def 100644
--- a/leanback/leanback/src/main/res/values-en-rCA/strings.xml
+++ b/leanback/leanback/src/main/res/values-en-rCA/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigation menu"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Search Action"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Search"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Speak to search"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Speak to search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Play"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pause"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Fast Forward"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Fast Forward %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Rewind"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Rewind %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Skip Next"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Skip Previous"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"More Actions"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Deselect Thumb Up"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Select Thumb Up"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Deselect Thumb Down"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Select Thumb Down"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Repeat None"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repeat All"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repeat One"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Enable Shuffle"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Disable Shuffle"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Enable High Quality"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Disable High Quality"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Enable Closed Captioning"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Disable Closed Captioning"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Enter Picture In Picture Mode"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Media controls shown"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Media controls hidden, press d-pad to show"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Finish"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continue"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer error code %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"GET STARTED"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Next"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigation menu"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Search Action"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Search"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Speak to search"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Speak to search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Play"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pause"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Fast Forward"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Fast Forward %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Rewind"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Rewind %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Skip Next"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Skip Previous"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"More Actions"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Deselect Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Select Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Deselect Thumb Down"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Select Thumb Down"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Repeat None"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repeat All"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repeat One"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Enable Shuffle"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Disable Shuffle"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Enable High Quality"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Disable High Quality"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Enable Closed Captioning"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Disable Closed Captioning"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Enter Picture In Picture Mode"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Media controls shown"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Media controls hidden, press d-pad to show"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Finish"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continue"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer error code %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"GET STARTED"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Next"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-en-rGB/strings.xml b/leanback/leanback/src/main/res/values-en-rGB/strings.xml
index 6f79fd1..9651def 100644
--- a/leanback/leanback/src/main/res/values-en-rGB/strings.xml
+++ b/leanback/leanback/src/main/res/values-en-rGB/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigation menu"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Search Action"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Search"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Speak to search"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Speak to search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Play"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pause"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Fast Forward"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Fast Forward %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Rewind"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Rewind %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Skip Next"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Skip Previous"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"More Actions"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Deselect Thumb Up"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Select Thumb Up"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Deselect Thumb Down"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Select Thumb Down"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Repeat None"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repeat All"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repeat One"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Enable Shuffle"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Disable Shuffle"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Enable High Quality"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Disable High Quality"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Enable Closed Captioning"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Disable Closed Captioning"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Enter Picture In Picture Mode"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Media controls shown"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Media controls hidden, press d-pad to show"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Finish"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continue"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer error code %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"GET STARTED"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Next"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigation menu"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Search Action"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Search"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Speak to search"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Speak to search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Play"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pause"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Fast Forward"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Fast Forward %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Rewind"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Rewind %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Skip Next"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Skip Previous"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"More Actions"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Deselect Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Select Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Deselect Thumb Down"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Select Thumb Down"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Repeat None"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repeat All"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repeat One"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Enable Shuffle"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Disable Shuffle"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Enable High Quality"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Disable High Quality"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Enable Closed Captioning"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Disable Closed Captioning"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Enter Picture In Picture Mode"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Media controls shown"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Media controls hidden, press d-pad to show"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Finish"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continue"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer error code %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"GET STARTED"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Next"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-en-rIN/strings.xml b/leanback/leanback/src/main/res/values-en-rIN/strings.xml
index 6f79fd1..9651def 100644
--- a/leanback/leanback/src/main/res/values-en-rIN/strings.xml
+++ b/leanback/leanback/src/main/res/values-en-rIN/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigation menu"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Search Action"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Search"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Speak to search"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Speak to search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Play"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pause"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Fast Forward"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Fast Forward %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Rewind"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Rewind %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Skip Next"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Skip Previous"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"More Actions"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Deselect Thumb Up"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Select Thumb Up"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Deselect Thumb Down"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Select Thumb Down"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Repeat None"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repeat All"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repeat One"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Enable Shuffle"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Disable Shuffle"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Enable High Quality"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Disable High Quality"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Enable Closed Captioning"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Disable Closed Captioning"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Enter Picture In Picture Mode"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Media controls shown"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Media controls hidden, press d-pad to show"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Finish"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continue"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer error code %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"GET STARTED"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Next"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigation menu"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Search Action"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Search"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Speak to search"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Speak to search <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Play"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pause"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Fast Forward"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Fast Forward %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Rewind"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Rewind %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Skip Next"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Skip Previous"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"More Actions"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Deselect Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Select Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Deselect Thumb Down"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Select Thumb Down"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Repeat None"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repeat All"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repeat One"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Enable Shuffle"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Disable Shuffle"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Enable High Quality"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Disable High Quality"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Enable Closed Captioning"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Disable Closed Captioning"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Enter Picture In Picture Mode"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Media controls shown"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Media controls hidden, press d-pad to show"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Finish"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continue"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer error code %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"GET STARTED"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Next"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-en-rXC/strings.xml b/leanback/leanback/src/main/res/values-en-rXC/strings.xml
index 8e8f04c..1ece94e 100644
--- a/leanback/leanback/src/main/res/values-en-rXC/strings.xml
+++ b/leanback/leanback/src/main/res/values-en-rXC/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎Navigation menu‎‏‎‎‏‎"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎Search Action‎‏‎‎‏‎"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‏‎Search‎‏‎‎‏‎"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎Speak to search‎‏‎‎‏‎"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎Search ‎‏‎‎‏‏‎<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎Speak to search ‎‏‎‎‏‏‎<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎%1$dX‎‏‎‎‏‎"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎%1$dX‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎Play‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎Pause‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎Fast Forward‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎Fast Forward %1$dX‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎Rewind‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎Rewind %1$dX‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎Skip Next‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎Skip Previous‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎More Actions‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎Deselect Thumb Up‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎Select Thumb Up‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎Deselect Thumb Down‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎Select Thumb Down‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎Repeat None‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎Repeat All‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎Repeat One‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎Enable Shuffle‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎Disable Shuffle‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎Enable High Quality‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎Disable High Quality‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎Enable Closed Captioning‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎Disable Closed Captioning‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎Enter Picture In Picture Mode‎‏‎‎‏‎"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎/‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎Media controls shown‎‏‎‎‏‎"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎Media controls hidden, press d-pad to show‎‏‎‎‏‎"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎Finish‎‏‎‎‏‎"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎Continue‎‏‎‎‏‎"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎MediaPlayer error code %1$d extra %2$d‎‏‎‎‏‎"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎GET STARTED‎‏‎‎‏‎"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‏‎Next‎‏‎‎‏‎"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎Navigation menu‎‏‎‎‏‎"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎Search Action‎‏‎‎‏‎"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎Search‎‏‎‎‏‎"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎Speak to search‎‏‎‎‏‎"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎Search ‎‏‎‎‏‏‎<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎Speak to search ‎‏‎‎‏‏‎<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎%1$dX‎‏‎‎‏‎"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎%1$dX‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎Play‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎Pause‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎Fast Forward‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎Fast Forward %1$dX‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎Rewind‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎Rewind %1$dX‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‏‎Skip Next‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎Skip Previous‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎More Actions‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎Deselect Thumb Up‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎Select Thumb Up‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‎Deselect Thumb Down‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎Select Thumb Down‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎Repeat None‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎Repeat All‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎Repeat One‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎Enable Shuffle‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎Disable Shuffle‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎Enable High Quality‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎Disable High Quality‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎Enable Closed Captioning‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎Disable Closed Captioning‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎Enter Picture In Picture Mode‎‏‎‎‏‎"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎/‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎Media controls shown‎‏‎‎‏‎"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎Media controls hidden, press d-pad to show‎‏‎‎‏‎"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‏‎‎Finish‎‏‎‎‏‎"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎Continue‎‏‎‎‏‎"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎MediaPlayer error code %1$d extra %2$d‎‏‎‎‏‎"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎GET STARTED‎‏‎‎‏‎"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎Next‎‏‎‎‏‎"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-es-rUS/strings.xml b/leanback/leanback/src/main/res/values-es-rUS/strings.xml
index 340d9f5..a5a90d6 100644
--- a/leanback/leanback/src/main/res/values-es-rUS/strings.xml
+++ b/leanback/leanback/src/main/res/values-es-rUS/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menú de navegación"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Acción de búsqueda"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Buscar"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Habla para buscar"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Busca <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Habla para buscar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Reproducir"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pausar"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Adelantar"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Adelantar %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Retroceder"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Retroceder %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Ir al siguiente"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Ir al anterior"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Más acciones"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Anular selección de Me gusta"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Seleccionar Me gusta"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Anular selección de No me gusta"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Seleccionar No me gusta"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"No repetir"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repetir todo"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repetir uno"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Habilitar reproducción aleatoria"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Inhabilitar reproducción aleatoria"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Habilitar alta calidad"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Inhabilitar alta calidad"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Habilitar subtítulos opcionales"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Inhabilitar subtítulos opcionales"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Activar el modo de pantalla en pantalla"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Se muestran los controles de contenido multimedia"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Los controles de contenido multimedia están ocultos; presiona el pad direccional para mostrarlos"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Finalizar"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continuar"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Código de error de MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"COMENZAR"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Siguiente"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menú de navegación"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Acción de búsqueda"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Buscar"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Habla para buscar"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Busca <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Habla para buscar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Reproducir"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pausar"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Adelantar"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Adelantar %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Retroceder"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Retroceder %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Ir al siguiente"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Ir al anterior"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Más acciones"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Anular selección de Me gusta"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Seleccionar Me gusta"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Anular selección de No me gusta"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Seleccionar No me gusta"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"No repetir"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repetir todo"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repetir uno"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Habilitar reproducción aleatoria"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Inhabilitar reproducción aleatoria"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Habilitar alta calidad"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Inhabilitar alta calidad"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Habilitar subtítulos opcionales"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Inhabilitar subtítulos opcionales"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Activar el modo de pantalla en pantalla"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Se muestran los controles de contenido multimedia"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Los controles de contenido multimedia están ocultos; presiona el pad direccional para mostrarlos"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Finalizar"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continuar"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Código de error de MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"COMENZAR"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Siguiente"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-es/strings.xml b/leanback/leanback/src/main/res/values-es/strings.xml
index 53e67972..9da2155 100644
--- a/leanback/leanback/src/main/res/values-es/strings.xml
+++ b/leanback/leanback/src/main/res/values-es/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menú de navegación"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Buscar acción"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Haz una búsqueda"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Habla para buscar"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Busca <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Habla para buscar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dx"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dx"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Reproducir"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pausar"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Avanzar rápidamente"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Avanzar rápidamente %1$dx"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Rebobinar"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Rebobinar %1$dx"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Saltar siguiente"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Saltar anterior"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Más acciones"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"No seleccionar Me gusta"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Seleccionar Me gusta"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"No seleccionar No me gusta"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Seleccionar No me gusta"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"No repetir"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repetir todo"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repetir uno"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Habilitar reproducir aleatoriamente"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Inhabilitar reproducir aleatoriamente"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Habilitar alta calidad"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Inhabilitar alta calidad"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Habilitar subtítulos"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Inhabilitar subtítulos"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Activar modo imagen en imagen"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Controles multimedia mostrados"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Controles multimedia ocultos (pulsa la cruceta para mostrarlos)"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Finalizar"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continuar"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Código de error de MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"EMPEZAR"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Siguiente"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menú de navegación"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Buscar acción"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Haz una búsqueda"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Habla para buscar"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Busca <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Habla para buscar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dx"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dx"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Reproducir"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pausar"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Avanzar rápidamente"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Avanzar rápidamente %1$dx"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Rebobinar"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Rebobinar %1$dx"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Saltar siguiente"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Saltar anterior"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Más acciones"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"No seleccionar Me gusta"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Seleccionar Me gusta"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"No seleccionar No me gusta"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Seleccionar No me gusta"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"No repetir"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repetir todo"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repetir uno"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Habilitar reproducir aleatoriamente"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Inhabilitar reproducir aleatoriamente"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Habilitar alta calidad"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Inhabilitar alta calidad"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Habilitar subtítulos"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Inhabilitar subtítulos"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Activar modo imagen en imagen"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Controles multimedia mostrados"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Controles multimedia ocultos (pulsa la cruceta para mostrarlos)"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Finalizar"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continuar"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Código de error de MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"EMPEZAR"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Siguiente"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-et/strings.xml b/leanback/leanback/src/main/res/values-et/strings.xml
index 24a8a9a..62e654b 100644
--- a/leanback/leanback/src/main/res/values-et/strings.xml
+++ b/leanback/leanback/src/main/res/values-et/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigeerimismenüü"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Otsimistoiming"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Otsige"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Rääkige otsimiseks"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Otsige rakendusest <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Rääkige rakendusest <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> otsimiseks"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Esita"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Peata"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Keri edasi"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Keri edasi %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Keri tagasi"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Keri tagasi %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Liigu järgmise üksuse juurde"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Liigu eelmise üksuse juurde"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Rohkem toiminguid"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Tühista valik Meeldib"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Tee valik Meeldib"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Tühista valik Ei meeldi"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Tee valik Ei meeldi"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Ära korda midagi"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Korda kõiki"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Korda ühte"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Luba juhuslikus järjekorras esitamine"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Keela juhuslikus järjekorras esitamine"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Luba kvaliteetne taasesitus"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Keela kvaliteetne taasesitus"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Luba subtiitrid"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Keela subtiitrid"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Sisene režiimi Pilt pildis"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Meedia juhtnupud on kuvatud"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Meedia juhtnupud on peidetud, kuvamiseks vajutage juhtimisklahvistikku"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Lõpeta"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Jätka"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayeri veakood %1$d, lisakood %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ALUSTAGE"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Järgmine"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigeerimismenüü"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Otsimistoiming"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Otsige"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Rääkige otsimiseks"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Otsige rakendusest <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Rääkige rakendusest <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> otsimiseks"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Esita"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Peata"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Keri edasi"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Keri edasi %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Keri tagasi"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Keri tagasi %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Liigu järgmise üksuse juurde"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Liigu eelmise üksuse juurde"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Rohkem toiminguid"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Tühista valik Meeldib"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Tee valik Meeldib"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Tühista valik Ei meeldi"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Tee valik Ei meeldi"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Ära korda midagi"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Korda kõiki"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Korda ühte"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Luba juhuslikus järjekorras esitamine"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Keela juhuslikus järjekorras esitamine"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Luba kvaliteetne taasesitus"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Keela kvaliteetne taasesitus"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Luba subtiitrid"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Keela subtiitrid"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Sisene režiimi Pilt pildis"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Meedia juhtnupud on kuvatud"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Meedia juhtnupud on peidetud, kuvamiseks vajutage juhtimisklahvistikku"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Lõpeta"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Jätka"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayeri veakood %1$d, lisakood %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ALUSTAGE"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Järgmine"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-eu/strings.xml b/leanback/leanback/src/main/res/values-eu/strings.xml
index 50bdcaf..bc7f0f3 100644
--- a/leanback/leanback/src/main/res/values-eu/strings.xml
+++ b/leanback/leanback/src/main/res/values-eu/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Nabigazio-menua"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Bilaketa"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Bilatu"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Esan bilatu nahi duzuna"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Bilatu <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Hitz egin, bilaketa hemen egiteko: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Erreproduzitu"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pausatu"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Aurreratu"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Aurreratu %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Atzeratu"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Atzeratu %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Saltatu hurrengora"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Saltatu aurrekora"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Ekintza gehiago"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Desautatu \"erpurua gora\""</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Hautatu \"erpurua gora\""</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Desautatu \"erpurua behera\""</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Hautatu \"erpurua behera\""</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Ez errepikatu"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Errepikatu guztiak"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Errepikatu bat"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Gaitu ausazko erreprodukzioa"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Desgaitu ausazko erreprodukzioa"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Gaitu kalitate handiko erreprodukzioa"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Desgaitu kalitate handiko erreprodukzioa"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Gaitu azpitituluak"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Desgaitu azpitituluak"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Aktibatu \"Pantaila txiki gainjarri\" modua"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Multimedia-edukia kontrolatzeko aukerak ikusgai"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Ezkutatuta daude multimedia-edukia kontrolatzeko aukerak. Haiek erakusteko, sakatu nabigazio-gurutzea."</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Amaitu"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Egin aurrera"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer errore-kodea: %1$d (%2$d gehigarria)"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"HASI ERABILTZEN"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Hurrengoa"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Nabigazio-menua"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Bilaketa"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Bilatu"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Esan bilatu nahi duzuna"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Bilatu <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Hitz egin, bilaketa hemen egiteko: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Erreproduzitu"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pausatu"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Aurreratu"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Aurreratu %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Atzeratu"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Atzeratu %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Saltatu hurrengora"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Saltatu aurrekora"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Ekintza gehiago"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Desautatu \"erpurua gora\""</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Hautatu \"erpurua gora\""</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Desautatu \"erpurua behera\""</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Hautatu \"erpurua behera\""</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Ez errepikatu"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Errepikatu guztiak"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Errepikatu bat"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Gaitu ausazko erreprodukzioa"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Desgaitu ausazko erreprodukzioa"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Gaitu kalitate handiko erreprodukzioa"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Desgaitu kalitate handiko erreprodukzioa"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Gaitu azpitituluak"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Desgaitu azpitituluak"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Aktibatu \"Pantaila txiki gainjarri\" modua"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Multimedia-edukia kontrolatzeko aukerak ikusgai"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Ezkutatuta daude multimedia-edukia kontrolatzeko aukerak. Haiek erakusteko, sakatu nabigazio-gurutzea."</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Amaitu"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Egin aurrera"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer errore-kodea: %1$d (%2$d gehigarria)"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"HASI ERABILTZEN"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Hurrengoa"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-fa/strings.xml b/leanback/leanback/src/main/res/values-fa/strings.xml
index 3e293ad..3c3bc6d 100644
--- a/leanback/leanback/src/main/res/values-fa/strings.xml
+++ b/leanback/leanback/src/main/res/values-fa/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"منوی پیمایش"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"عملکرد جستجو"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"جستجو"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"برای جستجو، بلند بگویید"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"جستجوی <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"جستجو با بلند گفتن <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"پخش"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"مکث"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"جلو بردن سریع"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"‏جلو بردن سریع ‎%1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"عقب بردن"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"‏عقب بردن ‎%1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"رد شدن از بعدی"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"رد شدن از قبلی"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"اقدام‌های بیشتر"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"لغو انتخاب رأی موافق"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"انتخاب رأی موافق"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"لغو انتخاب رأی مخالف"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"انتخاب رأی مخالف"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"تکرار هیچ‌کدام"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"تکرار همه"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"یک‌بار تکرار"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"فعال کردن پخش تصادفی"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"غیرفعال کردن پخش تصادفی"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"فعال کردن کیفیت بالا"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"غیرفعال کردن کیفیت بالا"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"فعال کردن زیرنویس"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"غیرفعال کردن زیرنویس"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"وارد شدن به حالت تصویر در تصویر"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"کنترل‌های رسانه نشان داده می‌شود"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"کنترل‌های رسانه پنهان است، برای نمایش آن‌ها پد کنترل را فشار دهید"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"پایان"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"ادامه"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"‏کد خطای MediaPlayer‏ %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"شروع به کار"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"بعدی"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"منوی پیمایش"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"عملکرد جستجو"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"جستجو"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"برای جستجو، بلند بگویید"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"جستجوی <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"جستجو با بلند گفتن <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"پخش"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"مکث"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"جلو بردن سریع"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"‏جلو بردن سریع ‎%1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"عقب بردن"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"‏عقب بردن ‎%1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"رد شدن از بعدی"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"رد شدن از قبلی"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"اقدام‌های بیشتر"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"لغو انتخاب رأی موافق"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"انتخاب رأی موافق"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"لغو انتخاب رأی مخالف"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"انتخاب رأی مخالف"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"تکرار هیچ‌کدام"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"تکرار همه"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"یک‌بار تکرار"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"فعال کردن پخش تصادفی"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"غیرفعال کردن پخش تصادفی"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"فعال کردن کیفیت بالا"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"غیرفعال کردن کیفیت بالا"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"فعال کردن زیرنویس"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"غیرفعال کردن زیرنویس"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"وارد شدن به حالت تصویر در تصویر"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"کنترل‌های رسانه نشان داده می‌شود"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"کنترل‌های رسانه پنهان است، برای نمایش آن‌ها پد کنترل را فشار دهید"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"پایان"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"ادامه"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"‏کد خطای MediaPlayer‏ %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"شروع به کار"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"بعدی"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-fi/strings.xml b/leanback/leanback/src/main/res/values-fi/strings.xml
index f3ee15e..d3d90002 100644
--- a/leanback/leanback/src/main/res/values-fi/strings.xml
+++ b/leanback/leanback/src/main/res/values-fi/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigointivalikko"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Hakutoiminto"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Haku"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Hae puhumalla"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Haku: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Puhehaku: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Toista"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Keskeytä"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Kelaa eteenpäin"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Kelaa eteenpäin %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Kelaa taaksepäin"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Kelaa taaksepäin %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Siirry seuraavaan"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Siirry edelliseen"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Lisää toimintoja"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Poista Tykkään-valinta"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Valitse Tykkään"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Poista En tykkää ‑valinta"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Valitse En tykkää"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Ei uudelleentoistoa"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Toista kaikki uudelleen"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Toista yksi uudelleen"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Ota satunnaistoisto käyttöön"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Poista satunnaistoisto käytöstä"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Ota korkea laatu käyttöön"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Poista korkea laatu käytöstä"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Ota tekstitys käyttöön"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Poista tekstitys käytöstä"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Vaihda kuva kuvassa ‑tilaan"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Mediasäätimet näkyvissä"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Mediasäätimet piilotettu, näytä painamalla suuntanäppäimiä."</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Valmis"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Jatka"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayerin virhekoodi %1$d ylimääräinen %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ALOITA"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Seuraava"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigointivalikko"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Hakutoiminto"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Haku"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Hae puhumalla"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Haku: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Puhehaku: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Toista"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Keskeytä"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Kelaa eteenpäin"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Kelaa eteenpäin %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Kelaa taaksepäin"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Kelaa taaksepäin %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Siirry seuraavaan"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Siirry edelliseen"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Lisää toimintoja"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Poista Tykkään-valinta"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Valitse Tykkään"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Poista En tykkää ‑valinta"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Valitse En tykkää"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Ei uudelleentoistoa"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Toista kaikki uudelleen"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Toista yksi uudelleen"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Ota satunnaistoisto käyttöön"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Poista satunnaistoisto käytöstä"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Ota korkea laatu käyttöön"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Poista korkea laatu käytöstä"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Ota tekstitys käyttöön"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Poista tekstitys käytöstä"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Vaihda kuva kuvassa ‑tilaan"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Mediasäätimet näkyvissä"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Mediasäätimet piilotettu, näytä painamalla suuntanäppäimiä."</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Valmis"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Jatka"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayerin virhekoodi %1$d ylimääräinen %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ALOITA"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Seuraava"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-fr-rCA/strings.xml b/leanback/leanback/src/main/res/values-fr-rCA/strings.xml
index ad38e94..4f0d856 100644
--- a/leanback/leanback/src/main/res/values-fr-rCA/strings.xml
+++ b/leanback/leanback/src/main/res/values-fr-rCA/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu de navigation"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Action de recherche"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Rechercher"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Énoncez votre recherche"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Rechercher dans <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Énoncez votre recherche dans <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Lire"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pause"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Avance rapide"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Avance rapide à %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Retour arrière"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Retour rapide à %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Passer à l\'élément suivant"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Retourner à l\'élément précédent"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Autres actions"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Désélectionner la mention « J\'aime »"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Sélectionner la mention « J\'aime »"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Désélectionner la mention « Je n\'aime pas »"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Sélectionner la mention « Je n\'aime pas »"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Aucune répétition"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Tout lire en boucle"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Répéter un élément"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Activer la lecture aléatoire"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Désactiver la lecture aléatoire"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Activer la lecture haute qualité"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Désactiver la lecture haute qualité"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Activer le sous-titrage"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Désactiver le sous-titrage"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Activer le mode Incrustation d\'image"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Les commandes multimédias sont affichées"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Les commandes multimédias sont masquées, appuyez sur le pavé directionnel pour les afficher."</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Terminer"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continuer"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Code d\'erreur MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"COMMENCER"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Suivant"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu de navigation"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Action de recherche"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Rechercher"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Énoncez votre recherche"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Rechercher dans <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Énoncer votre recherche de <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Lire"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pause"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Avance rapide"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Avance rapide à %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Retour arrière"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Retour rapide à %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Passer à l\'élément suivant"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Retourner à l\'élément précédent"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Autres actions"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Désélectionner la mention « J\'aime »"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Sélectionner la mention « J\'aime »"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Désélectionner la mention « Je n\'aime pas »"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Sélectionner la mention « Je n\'aime pas »"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Aucune répétition"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Tout lire en boucle"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Répéter un élément"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Activer la lecture aléatoire"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Désactiver la lecture aléatoire"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Activer la lecture haute qualité"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Désactiver la lecture haute qualité"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Activer le sous-titrage"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Désactiver le sous-titrage"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Activer le mode Incrustation d\'image"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Les commandes multimédias sont affichées"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Les commandes multimédias sont masquées, appuyez sur le pavé directionnel pour les afficher."</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Terminer"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continuer"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Code d\'erreur MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"COMMENCER"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Suivant"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-fr/strings.xml b/leanback/leanback/src/main/res/values-fr/strings.xml
index 7436842..6a8ad18 100644
--- a/leanback/leanback/src/main/res/values-fr/strings.xml
+++ b/leanback/leanback/src/main/res/values-fr/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu de navigation"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Commande de recherche"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Rechercher"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Énoncez votre recherche"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Rechercher dans <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Énoncez votre recherche dans <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Lecture"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pause"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Avance rapide"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Avance rapide de %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Retour arrière"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Retour arrière de %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Ignorer l\'élément suivant"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Ignorer l\'élément précédent"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Autres actions"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Annuler J\'aime"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Sélectionner J\'aime"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Annuler Je n\'aime pas"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Sélectionner Je n\'aime pas"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Ne rien lire en boucle"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Tout lire en boucle"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Lire en boucle un élément"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Activer la lecture en mode aléatoire"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Désactiver la lecture en mode aléatoire"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Activer la haute qualité"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Désactiver la haute qualité"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Activer les sous-titres"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Désactiver les sous-titres"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Activer le mode Picture-in-picture"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Les commandes multimédias sont affichées"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Les commandes multimédias sont masquées. Appuyez sur le pavé directionnel pour les afficher"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Terminer"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continuer"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Code d\'erreur MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"COMMENCER"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Suivante"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu de navigation"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Commande de recherche"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Rechercher"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Énoncez votre recherche"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Rechercher dans <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Énoncez votre recherche dans <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Lecture"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pause"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Avance rapide"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Avance rapide de %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Retour arrière"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Retour arrière de %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Ignorer l\'élément suivant"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Ignorer l\'élément précédent"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Autres actions"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Annuler J\'aime"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Sélectionner J\'aime"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Annuler Je n\'aime pas"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Sélectionner Je n\'aime pas"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Ne rien lire en boucle"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Tout lire en boucle"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Lire en boucle un élément"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Activer la lecture en mode aléatoire"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Désactiver la lecture en mode aléatoire"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Activer la haute qualité"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Désactiver la haute qualité"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Activer les sous-titres"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Désactiver les sous-titres"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Activer le mode Picture-in-picture"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Les commandes multimédias sont affichées"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Les commandes multimédias sont masquées. Appuyez sur le pavé directionnel pour les afficher"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Terminer"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continuer"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Code d\'erreur MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"COMMENCER"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Suivante"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-gl/strings.xml b/leanback/leanback/src/main/res/values-gl/strings.xml
index ae64dd7..3b77766 100644
--- a/leanback/leanback/src/main/res/values-gl/strings.xml
+++ b/leanback/leanback/src/main/res/values-gl/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menú de navegación"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Acción de busca"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Busca"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Fala para buscar"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Busca <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Fala para buscar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Reproducir"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pausar"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Avance rápido"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Avance rápido %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Rebobinar"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Rebobinado %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Saltar ao seguinte"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Saltar ao anterior"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Máis accións"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Anular Gústame"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Seleccionar Gústame"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Anular Non me gusta"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Seleccionar Non me gusta"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Non repetir"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repetir todo"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repetir unha pista"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Activar reprodución aleatoria"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Desactivar reprodución aleatoria"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Activar alta calidade"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Desactivar alta calidade"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Activar subtítulos"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Desactivar subtítulos"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Activar modo Pantalla superposta"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Móstranse os controis multimedia"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Os controis multimedia están ocultos. Preme o botón direccional para mostralos"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Finalizar"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continuar"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Código de erro de MediaPlayer %1$d %2$d de máis"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"COMEZAR"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Seguinte"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menú de navegación"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Acción de busca"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Busca"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Fala para buscar"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Busca <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Fala para buscar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Reproducir"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pausar"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Avance rápido"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Avance rápido %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Rebobinar"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Rebobinado %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Saltar ao seguinte"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Saltar ao anterior"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Máis accións"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Anular Gústame"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Seleccionar Gústame"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Anular Non me gusta"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Seleccionar Non me gusta"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Non repetir"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repetir todo"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repetir unha pista"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Activar reprodución aleatoria"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Desactivar reprodución aleatoria"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Activar alta calidade"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Desactivar alta calidade"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Activar subtítulos"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Desactivar subtítulos"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Activar modo Pantalla superposta"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Móstranse os controis multimedia"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Os controis multimedia están ocultos. Preme o botón direccional para mostralos"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Finalizar"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continuar"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Código de erro de MediaPlayer %1$d %2$d de máis"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"COMEZAR"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Seguinte"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-gu/strings.xml b/leanback/leanback/src/main/res/values-gu/strings.xml
index a6bdbb8..7201838 100644
--- a/leanback/leanback/src/main/res/values-gu/strings.xml
+++ b/leanback/leanback/src/main/res/values-gu/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"નૅવિગેશન મેનૂ"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"શોધવાની ક્રિયા"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"શોધો"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"શોધવા માટે બોલો"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> શોધો"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ને શોધવા માટે બોલો"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"ચલાવો"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"થોભાવો"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"ફાસ્ટ ફૉરવર્ડ કરો"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX ને ફાસ્ટ ફૉરવર્ડ કરો"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"રિવાઇન્ડ કરો"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX ને રિવાઇન્ડ કરો"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"આગળના પર જાઓ"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"પાછળના પર જાઓ"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"વધુ ક્રિયાઓ"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"થમ્બ્સ અપને નાપસંદ કરો"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"થમ્બ્સ અપને પસંદ કરો"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"થમ્બ્સ ડાઉનને નાપસંદ કરો"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"થમ્બ્સ ડાઉનને પસંદ કરો"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"કોઈ રિપીટ કરતા નહીં"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"બધાને રિપીટ કરો"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"એક મીડિયા રિપીટ કરો"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"શફલ કરવું ચાલુ કરો"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"શફલ કરવું બંધ કરો"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"ઉચ્ચ ક્વૉલિટી ચાલુ કરો"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"ઉચ્ચ ક્વૉલિટી બંધ કરો"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"ઉપશીર્ષક બતાવવાનું ચાલુ કરો"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"ઉપશીર્ષક બતાવવાનું બંધ કરો"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"ચિત્ર-માં-ચિત્ર મોડમાં દાખલ થાઓ"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"મીડિયા નિયંત્રણો બતાવેલા છે"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"મીડિયા નિયંત્રણો છુપાયેલા છે, તે બતાવવા માટે ડી-પૅડ દબાવો"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"સમાપ્ત કરો"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"આગળ વધો"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer ભૂલનો કોડ %1$d અતિરિક્ત %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"પ્રારંભ કરો"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"આગળ"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"નૅવિગેશન મેનૂ"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"શોધવાની ક્રિયા"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"શોધો"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"શોધવા માટે બોલો"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> શોધો"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ને શોધવા માટે બોલો"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"ચલાવો"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"થોભાવો"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"ફાસ્ટ ફૉરવર્ડ કરો"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX ને ફાસ્ટ ફૉરવર્ડ કરો"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"રિવાઇન્ડ કરો"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX ને રિવાઇન્ડ કરો"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"આગળના પર જાઓ"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"પાછળના પર જાઓ"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"વધુ ક્રિયાઓ"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"થમ્બ્સ અપને નાપસંદ કરો"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"થમ્બ્સ અપને પસંદ કરો"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"થમ્બ્સ ડાઉનને નાપસંદ કરો"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"થમ્બ્સ ડાઉનને પસંદ કરો"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"કોઈ રિપીટ કરતા નહીં"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"બધાને રિપીટ કરો"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"એક મીડિયા રિપીટ કરો"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"શફલ કરવું ચાલુ કરો"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"શફલ કરવું બંધ કરો"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"ઉચ્ચ ક્વૉલિટી ચાલુ કરો"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"ઉચ્ચ ક્વૉલિટી બંધ કરો"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"ઉપશીર્ષક બતાવવાનું ચાલુ કરો"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"ઉપશીર્ષક બતાવવાનું બંધ કરો"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"ચિત્ર-માં-ચિત્ર મોડમાં દાખલ થાઓ"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"મીડિયા નિયંત્રણો બતાવેલા છે"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"મીડિયા નિયંત્રણો છુપાયેલા છે, તે બતાવવા માટે ડી-પૅડ દબાવો"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"સમાપ્ત કરો"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"આગળ વધો"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer ભૂલનો કોડ %1$d અતિરિક્ત %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"પ્રારંભ કરો"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"આગળ"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-hi/strings.xml b/leanback/leanback/src/main/res/values-hi/strings.xml
index eed7ee3..9441767 100644
--- a/leanback/leanback/src/main/res/values-hi/strings.xml
+++ b/leanback/leanback/src/main/res/values-hi/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"नेविगेशन मेन्यू"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"ज़्यादा विकल्प खाेजें"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"खोजें"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"बोलकर खोजें"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> खाेजें"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> खोजने के लिए बोलें"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"चलाएं"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"रोकें"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"तेज़ी से आगे बढ़ाएं"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX तेज़ी से आगे बढ़ाएं"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"पीछे ले जाएं"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX तेज़ी से पीछे ले जाएं"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"अगले पर जाएं"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"पिछले पर जाएं"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"ज़्यादा विकल्प"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"पसंद करने के विकल्प से चुना हुआ हटाएं"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"पसंद करने का विकल्प चुनें"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"नापसंद करने के विकल्प से चुना हुआ हटाएं"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"नापसंद का विकल्प चुनें"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"कुछ न दोहराएं"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"सभी को दोहराएं"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"एक काे दोहराएं"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"शफ़ल करने की सुविधा चालू करें"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"शफ़ल करने की सुविधा बंद करें"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"अच्छी क्वालिटी में चलाने की सुविधा चालू करें"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"अच्छी क्वालिटी में चलाने की सुविधा बंद करें"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"सबटाइटल की सुविधा चालू करें"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"सबटाइटल की सुविधा बंद करें"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"पिक्चर में पिक्चर माेड चालू करें"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"माैजूदा मीडिया नियंत्रण"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"मीडिया नियंत्रण छिपे हुए हैं, स्क्रीन पर दिखाने के लिए डी-पैड दबाएं"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"खत्म करें"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"जारी रखें"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"मीडिया प्लेयर का गड़बड़ी कोड %1$d और %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"शुरू करें"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"आगे जाएं"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"नेविगेशन मेन्यू"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"ज़्यादा विकल्प खाेजें"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"खोजें"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"बोलकर खोजें"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> खाेजें"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> खोजने के लिए बोलें"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"चलाएं"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"रोकें"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"तेज़ी से आगे बढ़ाएं"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX तेज़ी से आगे बढ़ाएं"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"पीछे ले जाएं"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX तेज़ी से पीछे ले जाएं"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"अगले पर जाएं"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"पिछले पर जाएं"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"ज़्यादा विकल्प"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"पसंद करने के विकल्प से चुना हुआ हटाएं"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"पसंद करने का विकल्प चुनें"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"नापसंद करने के विकल्प से चुना हुआ हटाएं"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"नापसंद का विकल्प चुनें"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"कुछ न दोहराएं"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"सभी को दोहराएं"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"एक काे दोहराएं"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"शफ़ल करने की सुविधा चालू करें"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"शफ़ल करने की सुविधा बंद करें"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"अच्छी क्वालिटी में चलाने की सुविधा चालू करें"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"अच्छी क्वालिटी में चलाने की सुविधा बंद करें"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"सबटाइटल की सुविधा चालू करें"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"सबटाइटल की सुविधा बंद करें"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"पिक्चर में पिक्चर माेड चालू करें"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"माैजूदा मीडिया नियंत्रण"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"मीडिया नियंत्रण छिपे हुए हैं, स्क्रीन पर दिखाने के लिए डी-पैड दबाएं"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"खत्म करें"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"जारी रखें"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"मीडिया प्लेयर का गड़बड़ी कोड %1$d और %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"शुरू करें"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"आगे जाएं"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-hr/strings.xml b/leanback/leanback/src/main/res/values-hr/strings.xml
index 1d26d99..e4b5995 100644
--- a/leanback/leanback/src/main/res/values-hr/strings.xml
+++ b/leanback/leanback/src/main/res/values-hr/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigacijski izbornik"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Radnja pretraživanja"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Pretražite"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Izgovorite upit za pretraživanje"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Tražite <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Izgovorite upit za pretraživanje <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Pokreni"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pauza"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Brzo unaprijed"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Brzo unaprijed %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Unatrag"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Unatrag %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Preskoči na sljedeće"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Preskoči na prethodno"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Više radnji"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Poništi odabir palca gore"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Odaberi palac gore"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Poništi odabir palca dolje"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Odaberi palac dolje"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Bez ponavljanja"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Ponovi sve"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Ponovi jedno"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Omogući nasumičnu reprodukciju"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Onemogući nasumičnu reprodukciju"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Omogući visoku kvalitetu"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Onemogući visoku kvalitetu"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Omogući titlove"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Onemogući titlove"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Pokretanje načina slike u slici"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Medijske kontrole prikazane"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Medijske kontrole skrivene su, pritisnite D-pad za prikaz"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Završi"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Nastavi"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Kôd pogreške MediaPlayera: %1$d, dodatno %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"POČETAK"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Dalje"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigacijski izbornik"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Radnja pretraživanja"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Pretražite"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Izgovorite upit za pretraživanje"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Tražite <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Izgovorite upit i pretražite <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Pokreni"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pauza"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Brzo unaprijed"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Brzo unaprijed %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Unatrag"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Unatrag %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Preskoči na sljedeće"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Preskoči na prethodno"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Više radnji"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Poništi odabir palca gore"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Odaberi palac gore"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Poništi odabir palca dolje"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Odaberi palac dolje"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Bez ponavljanja"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Ponovi sve"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Ponovi jedno"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Omogući nasumičnu reprodukciju"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Onemogući nasumičnu reprodukciju"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Omogući visoku kvalitetu"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Onemogući visoku kvalitetu"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Omogući titlove"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Onemogući titlove"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Pokretanje načina slike u slici"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Medijske kontrole prikazane"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Medijske kontrole skrivene su, pritisnite D-pad za prikaz"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Završi"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Nastavi"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Kôd pogreške MediaPlayera: %1$d, dodatno %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"POČETAK"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Dalje"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-hu/strings.xml b/leanback/leanback/src/main/res/values-hu/strings.xml
index a27d394e..42b2cc3 100644
--- a/leanback/leanback/src/main/res/values-hu/strings.xml
+++ b/leanback/leanback/src/main/res/values-hu/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigációs menü"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Keresési művelet"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Keresés"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Beszéljen a keresés indításához"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Keresés itt: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Mondjon valamit, hogy itt keressen: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Lejátszás"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Szünet"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Gyors előretekerés"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Előretekerés %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Visszatekerés"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Visszatekerés %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Ugrás a következőre"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Ugrás az előzőre"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"További műveletek"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"„Tetszik” értékelés visszavonása"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"„Tetszik” értékelés kiválasztása"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"„Nem tetszik” értékelés visszavonása"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"„Nem tetszik” értékelés kiválasztása"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Nincs ismétlés"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Összes ismétlése"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Egy ismétlése"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Véletlenszerű lejátszás engedélyezése"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Véletlenszerű lejátszás letiltása"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Jó minőségű lejátszás engedélyezése"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Jó minőségű lejátszás letiltása"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Feliratok engedélyezése"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Feliratok letiltása"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Kép a képben mód indítása"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Médiavezérlők megjelenítve"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"A médiavezérlők el vannak rejtve. Megjelenítésükhöz nyomja le a d-padet."</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Befejezés"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Tovább"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer-hibakód: %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"KEZDŐ LÉPÉSEK"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Tovább"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigációs menü"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Keresési művelet"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Keresés"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Beszéljen a keresés indításához"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Keresés itt: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Mondj valamit a kereséshez – <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Lejátszás"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Szünet"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Gyors előretekerés"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Előretekerés %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Visszatekerés"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Visszatekerés %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Ugrás a következőre"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Ugrás az előzőre"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"További műveletek"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"„Tetszik” értékelés visszavonása"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"„Tetszik” értékelés kiválasztása"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"„Nem tetszik” értékelés visszavonása"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"„Nem tetszik” értékelés kiválasztása"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Nincs ismétlés"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Összes ismétlése"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Egy ismétlése"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Véletlenszerű lejátszás engedélyezése"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Véletlenszerű lejátszás letiltása"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Jó minőségű lejátszás engedélyezése"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Jó minőségű lejátszás letiltása"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Feliratok engedélyezése"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Feliratok letiltása"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Kép a képben mód indítása"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Médiavezérlők megjelenítve"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"A médiavezérlők el vannak rejtve. Megjelenítésükhöz nyomja le a d-padet."</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Befejezés"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Tovább"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer-hibakód: %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"KEZDŐ LÉPÉSEK"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Tovább"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-hy/strings.xml b/leanback/leanback/src/main/res/values-hy/strings.xml
index 8a4036b..84bcfdd 100644
--- a/leanback/leanback/src/main/res/values-hy/strings.xml
+++ b/leanback/leanback/src/main/res/values-hy/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Նավարկման ընտրացանկ"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Որոնում"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Որոնում"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Խոսեք՝ որոնելու համար"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Որոնեք <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Խոսեք՝ <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> որոնելու համար"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Նվագարկել"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Ընդհատել"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Առաջ գնալ"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Առաջ գնալ՝ %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Հետ գնալ"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Հետ գնալ՝ %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Անցնել հաջորդին"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Անցնել նախորդին"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Այլ գործողություններ"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Չեղարկել «Հավանում եմ»-ը"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Սեղմել «Հավանում եմ»"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Չեղարկել «Չեմ հավանում»-ը"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Սեղմել «Չեմ հավանում»"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Չկրկնել"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Կրկնել բոլորը"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Կրկնել մեկը"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Միացնել խառը նվագարկումը"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Անջատել խառը նվագարկումը"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Միացնել բարձր որակը"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Անջատել բարձր որակը"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Միացնել ենթագրերը"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Անջատել ենթագրերը"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Միացնել «Նկար նկարի մեջ» ռեժիմը"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Մեդիայի կառավարման տարրերը ցուցադրված են"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Մեդիայի կառավարման տարրերը թաքցված են։ Ցուցադրելու համար սեղմեք D-pad-ը:"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Ավարտել"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Շարունակել"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Մեդիա նվագարկիչի սխալի կոդ` %1$d (լրացուցիչ %2$d)"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ՍԿՍԵL"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Հաջորդը"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Նավարկման ընտրացանկ"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Որոնում"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Որոնում"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Խոսեք՝ որոնելու համար"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Որոնեք <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Խոսեք՝ <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> որոնելու համար"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Նվագարկել"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Ընդհատել"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Առաջ գնալ"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Առաջ գնալ՝ %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Հետ գնալ"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Հետ գնալ՝ %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Անցնել հաջորդին"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Անցնել նախորդին"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Այլ գործողություններ"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Չեղարկել «Հավանում եմ»-ը"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Սեղմել «Հավանում եմ»"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Չեղարկել «Չեմ հավանում»-ը"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Սեղմել «Չեմ հավանում»"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Չկրկնել"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Կրկնել բոլորը"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Կրկնել մեկը"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Միացնել խառը նվագարկումը"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Անջատել խառը նվագարկումը"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Միացնել բարձր որակը"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Անջատել բարձր որակը"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Միացնել ենթագրերը"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Անջատել ենթագրերը"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Միացնել «Նկար նկարի մեջ» ռեժիմը"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Մեդիայի կառավարման տարրերը ցուցադրված են"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Մեդիայի կառավարման տարրերը թաքցված են։ Ցուցադրելու համար սեղմեք D-pad-ը:"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Ավարտել"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Շարունակել"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Մեդիա նվագարկիչի սխալի կոդ` %1$d (լրացուցիչ %2$d)"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ՍԿՍԵL"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Հաջորդը"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-in/strings.xml b/leanback/leanback/src/main/res/values-in/strings.xml
index 85d92a8..5317bb6 100644
--- a/leanback/leanback/src/main/res/values-in/strings.xml
+++ b/leanback/leanback/src/main/res/values-in/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu navigasi"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Tindakan Penelusuran"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Telusuri"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Ucapkan untuk menelusuri"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Telusuri <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Ucapkan untuk menelusuri <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Putar"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Jeda"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Maju"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Maju %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Mundur"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Mundur %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Lewati ke Berikutnya"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Lewati ke Sebelumnya"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Tindakan Lainnya"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Batal Pilih Yang Disukai"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Pilih Yang Disukai"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Batal Pilih Yang Tidak Disukai"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Pilih Yang Tidak Disukai"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Jangan Ulangi"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Ulangi Semua"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Ulangi 1"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Aktifkan Acak"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Nonaktifkan Acak"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Aktifkan Kualitas Tinggi"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Nonaktifkan Kualitas Tinggi"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Aktifkan Pemberian Subtitel"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Nonaktifkan Pemberian Subtitel"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Masuk Mode Picture In Picture"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Kontrol media ditampilkan"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Kontrol media disembunyikan, tekan d-pad untuk menampilkannya"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Selesai"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Lanjutkan"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Kode error MediaPlayer %1$d ekstra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"MULAI"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Berikutnya"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu navigasi"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Tindakan Penelusuran"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Telusuri"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Ucapkan untuk menelusuri"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Telusuri <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Ucapkan untuk menelusuri <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Putar"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Jeda"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Maju"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Maju %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Mundur"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Mundur %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Lewati ke Berikutnya"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Lewati ke Sebelumnya"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Tindakan Lainnya"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Batal Pilih Yang Disukai"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Pilih Yang Disukai"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Batal Pilih Yang Tidak Disukai"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Pilih Yang Tidak Disukai"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Jangan Ulangi"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Ulangi Semua"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Ulangi 1"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Aktifkan Acak"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Nonaktifkan Acak"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Aktifkan Kualitas Tinggi"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Nonaktifkan Kualitas Tinggi"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Aktifkan Pemberian Subtitel"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Nonaktifkan Pemberian Subtitel"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Masuk Mode Picture In Picture"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Kontrol media ditampilkan"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Kontrol media disembunyikan, tekan d-pad untuk menampilkannya"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Selesai"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Lanjutkan"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Kode error MediaPlayer %1$d ekstra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"MULAI"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Berikutnya"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-is/strings.xml b/leanback/leanback/src/main/res/values-is/strings.xml
index 0c12c62..b30341e 100644
--- a/leanback/leanback/src/main/res/values-is/strings.xml
+++ b/leanback/leanback/src/main/res/values-is/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Yfirlitsvalmynd"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Leitaraðgerð"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Leita"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Talaðu til að leita"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Leita í <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Talaðu til að leita í <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Spila"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Hlé"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Spóla áfram"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Spóla áfram %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Spóla til baka"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Spóla til baka %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Fara í næsta"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Fara í fyrra"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Fleiri aðgerðir"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Hætta við þumal upp"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Gefa þumal upp"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Hætta við þumal niður"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Gefa þumal niður"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Endurtaka ekkert"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Endurtaka allt"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Endurtaka eitt"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Kveikja á stokkun"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Slökkva á stokkun"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Kveikja á miklum gæðum"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Slökkva á miklum gæðum"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Kveikja á skjátextum"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Slökkva á skjátextum"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Skoða mynd í myndsniði"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Spilunarstýringar sýndar"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Spilunarstýringar faldar, ýttu á stefnuhnappa til að sýna þær"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Ljúka"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Áfram"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Villukóði MediaPlayer %1$d aukalegt %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"HEFJAST HANDA"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Áfram"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Yfirlitsvalmynd"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Leitaraðgerð"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Leita"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Talaðu til að leita"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Leita í <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Talaðu til að leita í <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Spila"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Hlé"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Spóla áfram"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Spóla áfram %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Spóla til baka"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Spóla til baka %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Fara í næsta"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Fara í fyrra"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Fleiri aðgerðir"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Hætta við þumal upp"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Gefa þumal upp"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Hætta við þumal niður"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Gefa þumal niður"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Endurtaka ekkert"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Endurtaka allt"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Endurtaka eitt"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Kveikja á stokkun"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Slökkva á stokkun"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Kveikja á miklum gæðum"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Slökkva á miklum gæðum"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Kveikja á skjátextum"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Slökkva á skjátextum"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Skoða mynd í myndsniði"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Spilunarstýringar sýndar"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Spilunarstýringar faldar, ýttu á stefnuhnappa til að sýna þær"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Ljúka"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Áfram"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Villukóði MediaPlayer %1$d aukalegt %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"HEFJAST HANDA"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Áfram"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-it/strings.xml b/leanback/leanback/src/main/res/values-it/strings.xml
index ead1577..96756b7 100644
--- a/leanback/leanback/src/main/res/values-it/strings.xml
+++ b/leanback/leanback/src/main/res/values-it/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu di navigazione"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Azione di ricerca"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Cerca"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Parla per cercare"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Cerca in <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Parla per cercare in <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Riproduci"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Metti in pausa"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Avanti veloce"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Avanti veloce: %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Riavvolgi"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Riavvolgi: %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Passa ai contenuti successivi"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Passa ai contenuti precedenti"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Altre azioni"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Deseleziona Mi piace"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Seleziona Mi piace"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Deseleziona Non mi piace"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Seleziona Non mi piace"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Non ripetere nulla"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Ripeti tutti"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Ripeti uno"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Attiva la riproduzione casuale"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Disattiva la riproduzione casuale"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Attiva alta qualità"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Disattiva alta qualità"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Attiva sottotitoli"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Disattiva sottotitoli"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Attiva la modalità Picture in picture"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Controlli multimediali visualizzati"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Controlli multimediali nascosti, premi il d-pad per visualizzarli"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Fine"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continua"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Codice di errore MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"INIZIA"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Avanti"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu di navigazione"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Azione di ricerca"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Cerca"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Parla per cercare"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Cerca <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Parla per cercare <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Riproduci"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Metti in pausa"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Avanti veloce"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Avanti veloce: %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Riavvolgi"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Riavvolgi: %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Passa ai contenuti successivi"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Passa ai contenuti precedenti"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Altre azioni"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Deseleziona Mi piace"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Seleziona Mi piace"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Deseleziona Non mi piace"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Seleziona Non mi piace"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Non ripetere nulla"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Ripeti tutti"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Ripeti uno"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Attiva la riproduzione casuale"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Disattiva la riproduzione casuale"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Attiva alta qualità"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Disattiva alta qualità"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Attiva sottotitoli"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Disattiva sottotitoli"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Attiva la modalità Picture in picture"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Controlli multimediali visualizzati"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Controlli multimediali nascosti, premi il d-pad per visualizzarli"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Fine"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continua"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Codice di errore MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"INIZIA"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Avanti"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-iw/strings.xml b/leanback/leanback/src/main/res/values-iw/strings.xml
index d31a805..e5d424e 100644
--- a/leanback/leanback/src/main/res/values-iw/strings.xml
+++ b/leanback/leanback/src/main/res/values-iw/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"תפריט ניווט"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"פעולת חיפוש"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"חיפוש"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"יש לדבר בקול כדי לחפש"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"חיפוש של <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"יש לדבר כדי לחפש את <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"‎%1$dX‎‎"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"‎%1$dX‎‎"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"הפעלה"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"השהיה"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"הרצה קדימה"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"‏הרצה קדימה של %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"הרצה אחורה"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"‏הרצה אחורה של %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"דילוג אל הפריט הבא"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"דילוג אל הפריט הקודם"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"פעולות נוספות"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"ביטול בחירה בסימון \'אהבתי\'"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"בחירה בסימון \'אהבתי\'"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"ביטול בחירה בסימון \'לא אהבתי\'"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"בחירה בסימון \'לא אהבתי\'"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"אל תחזור על כלום"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"חזרה על הכל"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"חזרה על פריט אחד"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"הפעלת ערבוב"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"השבתת ערבוב"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"הפעלת איכות גבוהה"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"השבתת איכות גבוהה"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"הפעלת כתוביות"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"השבתת כתוביות"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"מעבר למצב תמונה בתוך תמונה"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"פקדי המדיה מוצגים"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"‏פקדי המדיה מוסתרים. יש להקיש על ה-d-pad כדי להציג אותם"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"סיום"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"המשך"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"‏קוד שגיאה %1$d‏ של MediaPlayer ועוד %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"קדימה, לעבודה"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"הבא"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"תפריט ניווט"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"פעולת חיפוש"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"חיפוש"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"יש לדבר בקול כדי לחפש"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"חיפוש של <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"יש לדבר כדי לחפש <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"‎%1$dX‎‎"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"‎%1$dX‎‎"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"הפעלה"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"השהיה"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"הרצה קדימה"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"‏הרצה קדימה של %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"הרצה אחורה"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"‏הרצה אחורה של %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"דילוג אל הפריט הבא"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"דילוג אל הפריט הקודם"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"פעולות נוספות"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"ביטול בחירה בסימון \'אהבתי\'"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"בחירה בסימון \'אהבתי\'"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"ביטול בחירה בסימון \'לא אהבתי\'"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"בחירה בסימון \'לא אהבתי\'"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"אל תחזור על כלום"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"חזרה על הכל"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"חזרה על פריט אחד"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"הפעלת ערבוב"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"השבתת ערבוב"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"הפעלת איכות גבוהה"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"השבתת איכות גבוהה"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"הפעלת כתוביות"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"השבתת כתוביות"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"מעבר למצב תמונה בתוך תמונה"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"פקדי המדיה מוצגים"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"‏פקדי המדיה מוסתרים. יש להקיש על ה-d-pad כדי להציג אותם"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"סיום"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"המשך"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"‏קוד שגיאה %1$d‏ של MediaPlayer ועוד %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"קדימה, לעבודה"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"הבא"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ja/strings.xml b/leanback/leanback/src/main/res/values-ja/strings.xml
index 96f27e28..bee210b 100644
--- a/leanback/leanback/src/main/res/values-ja/strings.xml
+++ b/leanback/leanback/src/main/res/values-ja/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"ナビゲーション メニュー"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"検索操作"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"検索"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"音声検索"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> を検索"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> を音声検索"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"再生"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"一時停止"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"早送り"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"早送り %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"巻き戻し"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"巻き戻し %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"次の曲にスキップ"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"前の曲にスキップ"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"その他の操作"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"高評価の選択を解除"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"高評価を選択"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"低評価の選択を解除"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"低評価を選択"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"リピートなし"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"全曲をリピート"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"1 曲をリピート"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"シャッフルを有効にする"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"シャッフルを無効にする"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"高画質を有効にする"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"高画質を無効にする"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"クローズド キャプションを有効にする"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"クローズド キャプションを無効にする"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"ピクチャー イン ピクチャー モードに移動"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"メディア コントロールは表示されています"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"メディア コントロールは非表示になっています。表示するには D-pad を押してください"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"終了"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"続行"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer エラーコード: %1$d、追加: %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"使ってみる"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"次へ"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"ナビゲーション メニュー"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"検索操作"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"検索"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"音声検索"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> を検索"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> を音声検索"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"再生"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"一時停止"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"早送り"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"早送り %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"巻き戻し"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"巻き戻し %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"次の曲にスキップ"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"前の曲にスキップ"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"その他の操作"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"高評価の選択を解除"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"高評価を選択"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"低評価の選択を解除"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"低評価を選択"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"リピートなし"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"全曲をリピート"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"1 曲をリピート"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"シャッフルを有効にする"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"シャッフルを無効にする"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"高画質を有効にする"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"高画質を無効にする"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"クローズド キャプションを有効にする"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"クローズド キャプションを無効にする"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"ピクチャー イン ピクチャー モードに移動"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"メディア コントロールは表示されています"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"メディア コントロールは非表示になっています。表示するには D-pad を押してください"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"終了"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"続行"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer エラーコード: %1$d、追加: %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"使ってみる"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"次へ"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ka/strings.xml b/leanback/leanback/src/main/res/values-ka/strings.xml
index 2f61e14..0dbc531 100644
--- a/leanback/leanback/src/main/res/values-ka/strings.xml
+++ b/leanback/leanback/src/main/res/values-ka/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"ნავიგაციის მენიუ"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"ძიების მოქმედება"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"ძიება"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"თქვით საძიებო ფრაზა"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>-ის ძიება"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"თქვით <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>-ის საძიებლად"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"დაკვრა"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"პაუზა"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"წინ გადახვევა"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"სწრაფი გადამისამართება %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"უკან გადახვევა"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"გადახვევა %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"შემდეგის გამოტოვება"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"წინას გამოტოვება"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"დამატებითი ქმედებები"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"მაღალი შეფასების არჩევის გაუქმება"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"მაღალი შეფასების არჩევა"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"დაბალი შეფასების არჩევის გაუქმება"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"დაბალი შეფასების არჩევა"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"არცერთის გამეორება"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"ყველას გამეორება"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"ერთის გამეორება"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"არეულად დაკვრის ჩართვა"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"არეულად დაკვრის გამორთვა"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"მაღალი ხარისხის ჩართვა"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"მაღალი ხარისხის გამორთვა"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"დახურული წარწერების ჩართვა"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"დახურული წარწერების გაუქმება"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"რეჟიმზე „ეკრანი ეკრანში“ გადასვლა"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"ნაჩვენებია მედიის მართვის საშუალებები"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"მედიის მართვის საშუალებები დამალულია, გამოსაჩენად დააჭირეთ D-pad-ს"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"დასრულება"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"გაგრძელება"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer-ის შეცდომის კოდი: %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"დაწყება"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"შემდეგი"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"ნავიგაციის მენიუ"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"ძიების მოქმედება"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"ძიება"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"თქვით საძიებო ფრაზა"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>-ის ძიება"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"თქვით <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>-ის საძიებლად"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"დაკვრა"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"პაუზა"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"წინ გადახვევა"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"სწრაფი გადამისამართება %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"უკან გადახვევა"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"გადახვევა %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"შემდეგის გამოტოვება"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"წინას გამოტოვება"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"დამატებითი ქმედებები"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"მაღალი შეფასების არჩევის გაუქმება"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"მაღალი შეფასების არჩევა"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"დაბალი შეფასების არჩევის გაუქმება"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"დაბალი შეფასების არჩევა"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"არცერთის გამეორება"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"ყველას გამეორება"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"ერთის გამეორება"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"არეულად დაკვრის ჩართვა"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"არეულად დაკვრის გამორთვა"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"მაღალი ხარისხის ჩართვა"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"მაღალი ხარისხის გამორთვა"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"დახურული წარწერების ჩართვა"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"დახურული წარწერების გაუქმება"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"რეჟიმზე „ეკრანი ეკრანში“ გადასვლა"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"ნაჩვენებია მედიის მართვის საშუალებები"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"მედიის მართვის საშუალებები დამალულია, გამოსაჩენად დააჭირეთ D-pad-ს"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"დასრულება"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"გაგრძელება"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer-ის შეცდომის კოდი: %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"დაწყება"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"შემდეგი"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-kk/strings.xml b/leanback/leanback/src/main/res/values-kk/strings.xml
index 742aeaa..0cf1773 100644
--- a/leanback/leanback/src/main/res/values-kk/strings.xml
+++ b/leanback/leanback/src/main/res/values-kk/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Навигация мәзірі"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Іздеу әрекеті"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Іздеу"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Іздеу үшін сөйлеңіз"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> іздеу"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> іздеу үшін сөйлеңіз"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Ойнату"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Кідірту"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Алға айналдыру"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX алға айналдыру"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Артқа айналдыру"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX артқа айналдыру"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Келесіге өту"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Алдыңғыға өту"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Қосымша әрекеттер"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"\"Ұнайды\" белгісін алу"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"\"Ұнайды\" белгісін қою"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"\"Ұнамайды\" белгісін алу"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"\"Ұнамайды\" белгісін қою"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Ешқайсысын қайталамау"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Барлығын қайталау"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Біреуін қайталау"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Еркін ойнатуды қосу"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Еркін ойнатуды өшіру"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Жоғары сапаны қосу"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Жоғары сапаны өшіру"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Субтитрлерді қосу"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Cубтитрлерді өшіру"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"\"Сурет ішіндегі сурет\" режиміне кіру"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Мультимедианы басқару элементтері көрсетілген"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Мультимедианы басқару элементтері жасырылған, оларды көрсету үшін бағыт пернесін басыңыз"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Аяқтау"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Жалғастыру"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer қате коды: %1$d, қосымша: %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"БАСТАУ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Келесі"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Навигация мәзірі"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Іздеу әрекеті"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Іздеу"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Іздеу үшін сөйлеңіз"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> іздеу"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> іздеу үшін сөйлеңіз"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Ойнату"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Кідірту"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Алға айналдыру"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX алға айналдыру"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Артқа айналдыру"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX артқа айналдыру"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Келесіге өту"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Алдыңғыға өту"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Қосымша әрекеттер"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"\"Ұнайды\" белгісін алу"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"\"Ұнайды\" белгісін қою"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"\"Ұнамайды\" белгісін алу"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"\"Ұнамайды\" белгісін қою"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Ешқайсысын қайталамау"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Барлығын қайталау"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Біреуін қайталау"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Еркін ойнатуды қосу"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Еркін ойнатуды өшіру"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Жоғары сапаны қосу"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Жоғары сапаны өшіру"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Субтитрлерді қосу"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Cубтитрлерді өшіру"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"\"Сурет ішіндегі сурет\" режиміне кіру"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Мультимедианы басқару элементтері көрсетілген"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Мультимедианы басқару элементтері жасырылған, оларды көрсету үшін бағыт пернесін басыңыз"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Аяқтау"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Жалғастыру"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer қате коды: %1$d, қосымша: %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"БАСТАУ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Келесі"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-km/strings.xml b/leanback/leanback/src/main/res/values-km/strings.xml
index c6946d7..5a40a66 100644
--- a/leanback/leanback/src/main/res/values-km/strings.xml
+++ b/leanback/leanback/src/main/res/values-km/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"ម៉ឺនុយរុករក"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"​ស្វែងរក​សកម្មភាព"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"ស្វែងរក"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"និយាយ​​ដើម្បី​ស្វែងរក"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"ស្វែងរក <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"និយាយ​ដើម្បី​ស្វែងរក <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"ចាក់"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"ផ្អាក"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"ទៅមុខ​រហ័ស"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"ទៅមុខ​រហ័ស %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"ខា​ថយ​ក្រោយ"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"ខា​ថយ​ក្រោយ %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"រំលងទៅ​បន្ទាប់"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"រំលង​ទៅពី​មុន"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"សកម្មភាព​ច្រើន​ទៀត"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"ឈប់​ជ្រើស​រើស​ការ​លើក​មេដៃ"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"ជ្រើសរើស​ការ​លើកមេ​ដៃ"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"ឈប់​ជ្រើស​រើស​ការឲ្យ​មេដៃ​ចុះ"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"ជ្រើស​រើស​ការឲ្យ​មេ​ដៃ​ចុះ"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"មិន​ចាក់​ឡើង​វិញ​"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"ចាក់​ឡើងវិញ​ទាំងអស់"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"ចាក់​ឡើងវិញ​មួយ"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"បើក​ការ​​ច្របល់"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"បិទ​ការ​ច្របល់"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"បើក​គុណភាព​ខ្ពស់"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"បិទ​គុណភាព​ខ្ពស់"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"បើក​អក្សរ​រត់"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"បិទ​អក្សរ​រត់"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"បញ្ចូល​មុខងារ​រូបក្នុងរូប"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"ការ​គ្រប់គ្រង​មេឌៀ​ត្រូវ​បាន​បង្ហាញ"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"ការ​គ្រប់គ្រង​មេឌៀ​ត្រូវ​បាន​លាក់ សូមចុច d-pad ដើម្បី​បង្ហាញ"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"បញ្ចប់"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"បន្ត"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"លេខកូដ​បញ្ហា​ MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ចាប់ផ្ដើម"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"បន្ទាប់"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"ម៉ឺនុយរុករក"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"​ស្វែងរក​សកម្មភាព"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"ស្វែងរក"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"និយាយ​​ដើម្បី​ស្វែងរក"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"ស្វែងរក <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"និយាយ​ដើម្បី​ស្វែងរក <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"ចាក់"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"ផ្អាក"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"ទៅមុខ​រហ័ស"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"ទៅមុខ​រហ័ស %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"ខា​ថយ​ក្រោយ"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"ខា​ថយ​ក្រោយ %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"រំលងទៅ​បន្ទាប់"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"រំលង​ទៅពី​មុន"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"សកម្មភាព​ច្រើន​ទៀត"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"ឈប់​ជ្រើស​រើស​ការ​លើក​មេដៃ"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"ជ្រើសរើស​ការ​លើកមេ​ដៃ"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"ឈប់​ជ្រើស​រើស​ការឲ្យ​មេដៃ​ចុះ"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"ជ្រើស​រើស​ការឲ្យ​មេ​ដៃ​ចុះ"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"មិន​ចាក់​ឡើង​វិញ​"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"ចាក់​ឡើងវិញ​ទាំងអស់"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"ចាក់​ឡើងវិញ​មួយ"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"បើក​ការ​​ច្របល់"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"បិទ​ការ​ច្របល់"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"បើក​គុណភាព​ខ្ពស់"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"បិទ​គុណភាព​ខ្ពស់"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"បើក​អក្សរ​រត់"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"បិទ​អក្សរ​រត់"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"បញ្ចូល​មុខងារ​រូបក្នុងរូប"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"ការ​គ្រប់គ្រង​មេឌៀ​ត្រូវ​បាន​បង្ហាញ"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"ការ​គ្រប់គ្រង​មេឌៀ​ត្រូវ​បាន​លាក់ សូមចុច d-pad ដើម្បី​បង្ហាញ"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"បញ្ចប់"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"បន្ត"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"លេខកូដ​បញ្ហា​ MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ចាប់ផ្ដើម"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"បន្ទាប់"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-kn/strings.xml b/leanback/leanback/src/main/res/values-kn/strings.xml
index 509ffa9..4cdd8a6 100644
--- a/leanback/leanback/src/main/res/values-kn/strings.xml
+++ b/leanback/leanback/src/main/res/values-kn/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"ನ್ಯಾವಿಗೇಶನ್‌ ಮೆನು"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"ಹುಡುಕಾಟ ಕ್ರಿಯೆ"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"ಹುಡುಕಿ"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"ಹುಡುಕಲು ಮಾತನಾಡಿ"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ಹುಡುಕಿ"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ಮಾತನಾಡಿ ಹುಡುಕಾಟ ನಡೆಸಿ"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"ಪ್ಲೇ"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"ವಿರಾಮ"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"ಫಾಸ್ಟ್ ಫಾರ್ವರ್ಡ್"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"ಫಾಸ್ಟ್ ಫಾರ್ವರ್ಡ್ %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"ರಿವೈಂಡ್"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"ರಿವೈಂಡ್ %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"ಮುಂದೆ ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"ಹಿಂದೆ ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"ಇನ್ನಷ್ಟು ಕ್ರಿಯೆಗಳು"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"ಥಂಬ್ ಅಪ್ ಆಯ್ಕೆರದ್ದುಮಾಡಿ"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"ಥಂಬ್ ಅಪ್ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"ಥಂಬ್ ಡೌನ್ ಆಯ್ಕೆರದ್ದುಮಾಡಿ"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"ಥಂಬ್ ಡೌನ್ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"ಯಾವುದನ್ನೂ ಪುನರಾವರ್ತಿಸಬೇಡಿ"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"ಎಲ್ಲವನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"ಒಂದನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"ಶಫಲ್ ಮಾಡುವುದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"ಶಫಲ್ ಮಾಡುವುದನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"ಹೆಚ್ಚು ಗುಣಮಟ್ಟವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"ಹೆಚ್ಚು ಗುಣಮಟ್ಟವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"ಮುಚ್ಚಿದ ಶೀರ್ಷಿಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"ಮುಚ್ಚಿದ ಶೀರ್ಷಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"ಚಿತ್ರವನ್ನು ಚಿತ್ರ ಮೋಡ್‌ನಲ್ಲಿ ಪ್ರವೇಶಿಸಿ"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"ಮಾಧ್ಯಮ ನಿಯಂತ್ರಣಗಳನ್ನು ತೋರಿಸಲಾಗಿದೆ"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"ಮಾಧ್ಯಮ ನಿಯಂತ್ರಣಗಳನ್ನು ಮರೆಮಾಡಲಾಗಿದೆ, ತೋರಿಸಲು d-pad ಒತ್ತಿರಿ"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"ಪೂರ್ಣಗೊಳಿಸಿ"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"ಮುಂದುವರಿಸಿ"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"ಮೀಡಿಯಾ ಪ್ಲೇಯರ್ ದೋಷ ಕೋಡ್ %1$d ಹೆಚ್ಚುವರಿ %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ಪ್ರಾರಂಭಿಸಿ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"ಮುಂದೆ"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"ನ್ಯಾವಿಗೇಶನ್‌ ಮೆನು"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"ಹುಡುಕಾಟ ಕ್ರಿಯೆ"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"ಹುಡುಕಿ"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"ಹುಡುಕಲು ಮಾತನಾಡಿ"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ಹುಡುಕಿ"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ಮಾತನಾಡಿ ಹುಡುಕಾಟ ನಡೆಸಿ"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"ಪ್ಲೇ"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"ವಿರಾಮ"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"ಫಾಸ್ಟ್ ಫಾರ್ವರ್ಡ್"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"ಫಾಸ್ಟ್ ಫಾರ್ವರ್ಡ್ %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"ರಿವೈಂಡ್"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"ರಿವೈಂಡ್ %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"ಮುಂದೆ ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"ಹಿಂದೆ ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"ಇನ್ನಷ್ಟು ಕ್ರಿಯೆಗಳು"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"ಥಂಬ್ ಅಪ್ ಆಯ್ಕೆರದ್ದುಮಾಡಿ"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"ಥಂಬ್ ಅಪ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"ಥಂಬ್ ಡೌನ್ ಆಯ್ಕೆರದ್ದುಮಾಡಿ"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"ಥಂಬ್ ಡೌನ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"ಯಾವುದನ್ನೂ ಪುನರಾವರ್ತಿಸಬೇಡಿ"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"ಎಲ್ಲವನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"ಒಂದನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"ಶಫಲ್ ಮಾಡುವುದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"ಶಫಲ್ ಮಾಡುವುದನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"ಹೆಚ್ಚು ಗುಣಮಟ್ಟವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"ಹೆಚ್ಚು ಗುಣಮಟ್ಟವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"ಮುಚ್ಚಿದ ಶೀರ್ಷಿಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"ಮುಚ್ಚಿದ ಶೀರ್ಷಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"ಚಿತ್ರವನ್ನು ಚಿತ್ರ ಮೋಡ್‌ನಲ್ಲಿ ಪ್ರವೇಶಿಸಿ"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"ಮಾಧ್ಯಮ ನಿಯಂತ್ರಣಗಳನ್ನು ತೋರಿಸಲಾಗಿದೆ"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"ಮಾಧ್ಯಮ ನಿಯಂತ್ರಣಗಳನ್ನು ಮರೆಮಾಡಲಾಗಿದೆ, ತೋರಿಸಲು d-pad ಒತ್ತಿರಿ"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"ಪೂರ್ಣಗೊಳಿಸಿ"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"ಮುಂದುವರಿಸಿ"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"ಮೀಡಿಯಾ ಪ್ಲೇಯರ್ ದೋಷ ಕೋಡ್ %1$d ಹೆಚ್ಚುವರಿ %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"ಮುಂದೆ"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ko/strings.xml b/leanback/leanback/src/main/res/values-ko/strings.xml
index b1587b91..6279efc 100644
--- a/leanback/leanback/src/main/res/values-ko/strings.xml
+++ b/leanback/leanback/src/main/res/values-ko/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"탐색 메뉴"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"검색 작업"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"검색"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"음성 검색"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> 검색"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> 음성 검색"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$d배속"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$d배속"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"재생"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"일시중지"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"빨리 감기"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$d배속 빨리 감기"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"되감기"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$d배속 되감기"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"다음으로 건너뛰기"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"이전으로 건너뛰기"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"추가 작업"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"좋아요 선택 해제"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"좋아요 선택"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"싫어요 선택 해제"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"싫어요 선택"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"반복 안함"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"전체 반복"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"한 개 반복"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"셔플 사용 설정"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"셔플 사용 중지"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"고품질 사용 설정"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"고품질 사용 중지"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"자막 사용 설정"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"자막 사용 중지"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"PIP 모드 시작"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"미디어 컨트롤이 표시되었습니다."</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"미디어 컨트롤이 숨겨져 있습니다. 표시하려면 D패드를 누르세요."</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"완료"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"계속"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer 오류 코드 %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"시작하기"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"다음"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"탐색 메뉴"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"검색 작업"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"검색"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"음성 검색"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> 검색"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> 음성 검색"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$d배속"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$d배속"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"재생"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"일시중지"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"빨리 감기"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$d배속 빨리 감기"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"되감기"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$d배속 되감기"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"다음으로 건너뛰기"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"이전으로 건너뛰기"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"추가 작업"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"좋아요 선택 해제"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"좋아요 선택"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"싫어요 선택 해제"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"싫어요 선택"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"반복 안함"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"전체 반복"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"한 개 반복"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"셔플 사용 설정"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"셔플 사용 중지"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"고품질 사용 설정"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"고품질 사용 중지"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"자막 사용 설정"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"자막 사용 중지"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"PIP 모드 시작"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"미디어 컨트롤이 표시되었습니다."</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"미디어 컨트롤이 숨겨져 있습니다. 표시하려면 D패드를 누르세요."</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"완료"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"계속"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer 오류 코드 %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"시작하기"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"다음"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ky/strings.xml b/leanback/leanback/src/main/res/values-ky/strings.xml
index 12f3255..3eee16b 100644
--- a/leanback/leanback/src/main/res/values-ky/strings.xml
+++ b/leanback/leanback/src/main/res/values-ky/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Чабыттоо менюсу"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Издөө аракети"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Издөө"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Издөө үчүн сүйлөңүз"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> издөө"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> издөө үчүн сүйлөңүз"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Угуу"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Тыным"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Алдыга түрүү"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Алдыга түрүү %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Артка түрүү"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Артка түрүү %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Кийинкини өткөрүп жиберүү"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Мурункуну өткөрүп жиберүү"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Дагы көнүгүүлөр"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"\"Жакты\" белгисин өчүрүү"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Жакты деп белгилөө"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Жактырбоону тандоодон чыгаруу"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Жактырбоону тандоо"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Эч бирин кайталабоо"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Баарын кайталоо"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Бирөөнү кайталоо"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Аралаштырууну иштетүү"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Аралаштырууну өчүрүү"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Жогорку сапатты иштетүү"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Жогорку сапатты өчүрүү"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Жабык субтитрлерди иштетүү"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Жабык субтитрлерди өчүрүү"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Сүрөт режиминде сүрөт киргизүү"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Медиа файлды башкаруу көрсөтүлдү"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Медиа файлды башкаруу жашырылган, көрүү үчүн d-pad көзөмөлдөө каражатын басыңыз"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Бүттү"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Улантуу"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer\'деги катанын коду: %1$d, кошумча: %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"БАШТОО"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Кийинки"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Чабыттоо менюсу"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Издөө аракети"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Издөө"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Издөө үчүн сүйлөңүз"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> издөө"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> издөө үчүн сүйлөңүз"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Угуу"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Тыным"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Алдыга түрүү"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Алдыга түрүү %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Артка түрүү"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Артка түрүү %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Кийинкини өткөрүп жиберүү"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Мурункуну өткөрүп жиберүү"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Дагы көнүгүүлөр"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"\"Жакты\" белгисин өчүрүү"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Жакты деп белгилөө"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Жактырбоону тандоодон чыгаруу"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Жактырбоону тандоо"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Эч бирин кайталабоо"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Баарын кайталоо"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Бирөөнү кайталоо"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Аралаштырууну иштетүү"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Аралаштырууну өчүрүү"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Жогорку сапатты иштетүү"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Жогорку сапатты өчүрүү"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Жабык субтитрлерди иштетүү"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Жабык субтитрлерди өчүрүү"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Сүрөт режиминде сүрөт киргизүү"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Медиа файлды башкаруу көрсөтүлдү"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Медиа файлды башкаруу жашырылган, көрүү үчүн d-pad көзөмөлдөө каражатын басыңыз"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Бүттү"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Улантуу"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer\'деги катанын коду: %1$d, кошумча: %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"БАШТОО"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Кийинки"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-lo/strings.xml b/leanback/leanback/src/main/res/values-lo/strings.xml
index a188b25..0614fab 100644
--- a/leanback/leanback/src/main/res/values-lo/strings.xml
+++ b/leanback/leanback/src/main/res/values-lo/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"ເມນູນຳທາງ"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"ຊອກຫາຄຳສັ່ງ"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"ຊອກຫາ"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"ເວົ້າເພື່ອຊອກຫາ"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"ຊອກຫາ <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"ເວົ້າເພື່ອຊອກຫາ <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"ຫຼິ້ນ"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"ຢຸດຊົ່ວຄາວ"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"ເລື່ອນໄປໜ້າ"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"ເລື່ອນໄປໜ້າ %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"ເລື່ອນກັບຫຼັງ"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"ເລື່ອນກັບຫຼັງ %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"ຂ້າມໄປອັນໜ້າ"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"ຂ້າມໄປອັນກ່ອນ"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"ຄຳສັ່ງເພີ່ມເຕີມ"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"ຢຸດເລືອກຍົກໂປ້ແລ້ວ"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"ເລືອກຍົກໂປ້ແລ້ວ"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"ຢຸດຊີ້ໂປ້ລົງແລ້ວ"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"ເລືອກຊີ້ໂປ້ລົງແລ້ວ"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"ບໍ່ຫຼິ້ນຊ້ຳ"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"ຫຼິ້ນຊ້ຳທັງໝົດ"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"ຫຼິ້ນຊ້ຳເທື່ອດຽວ"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"ເປີດນຳໃຊ້ການສະຫຼັບ"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"ປິດນຳໃຊ້ການສະຫຼັບ"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"ເປີດຄຸນນະພາບສູງ"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"ປິດຄຸນນະພາບສູງ"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"ເປີດນຳໃຊ້ຄຳບັນຍາຍແບບປິດ"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"ປິດນຳໃຊ້ຄຳບັນຍາຍແບບປິດ"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"ປ້ອນຮູບພາບໃນໂໝດຮູບພາບ"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"ສະແດງຕົວຄວບຄຸມມີເດຍແລ້ວ"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"ເຊື່ອງຕົວຄວບຄຸມມີເດຍແລ້ວ, ກົດປຸ່ມທິດທາງເພື່ອສະແດງ"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"ແລ້ວໆ"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"ສືບຕໍ່"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"ລະຫັດ MediaPlayer ຜິດພາດ %1$d ເພີ່ມເຕີມ %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ເລີ່ມເລີຍ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"ຕໍ່ໄປ"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"ເມນູນຳທາງ"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"ຊອກຫາຄຳສັ່ງ"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"ຊອກຫາ"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"ເວົ້າເພື່ອຊອກຫາ"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"ຊອກຫາ <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"ເວົ້າເພື່ອຊອກຫາ <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"ຫຼິ້ນ"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"ຢຸດຊົ່ວຄາວ"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"ເລື່ອນໄປໜ້າ"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"ເລື່ອນໄປໜ້າ %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"ເລື່ອນກັບຫຼັງ"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"ເລື່ອນກັບຫຼັງ %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"ຂ້າມໄປອັນໜ້າ"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"ຂ້າມໄປອັນກ່ອນ"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"ຄຳສັ່ງເພີ່ມເຕີມ"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"ຢຸດເລືອກຍົກໂປ້ແລ້ວ"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"ເລືອກຍົກໂປ້ແລ້ວ"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"ຢຸດຊີ້ໂປ້ລົງແລ້ວ"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"ເລືອກຊີ້ໂປ້ລົງແລ້ວ"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"ບໍ່ຫຼິ້ນຊ້ຳ"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"ຫຼິ້ນຊ້ຳທັງໝົດ"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"ຫຼິ້ນຊ້ຳເທື່ອດຽວ"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"ເປີດນຳໃຊ້ການສະຫຼັບ"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"ປິດນຳໃຊ້ການສະຫຼັບ"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"ເປີດຄຸນນະພາບສູງ"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"ປິດຄຸນນະພາບສູງ"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"ເປີດນຳໃຊ້ຄຳບັນຍາຍແບບປິດ"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"ປິດນຳໃຊ້ຄຳບັນຍາຍແບບປິດ"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"ປ້ອນຮູບພາບໃນໂໝດຮູບພາບ"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"ສະແດງຕົວຄວບຄຸມມີເດຍແລ້ວ"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"ເຊື່ອງຕົວຄວບຄຸມມີເດຍແລ້ວ, ກົດປຸ່ມທິດທາງເພື່ອສະແດງ"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"ແລ້ວໆ"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"ສືບຕໍ່"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"ລະຫັດ MediaPlayer ຜິດພາດ %1$d ເພີ່ມເຕີມ %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ເລີ່ມເລີຍ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"ຕໍ່ໄປ"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-lt/strings.xml b/leanback/leanback/src/main/res/values-lt/strings.xml
index e4e6741..64796ea 100644
--- a/leanback/leanback/src/main/res/values-lt/strings.xml
+++ b/leanback/leanback/src/main/res/values-lt/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Naršymo meniu"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Paieškos veiksmas"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Ieškoti"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Pasakykite, kad ieškotumėte"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Ieškoti „<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>“"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Kalbėkite, kad ieškotumėte „<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>“"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$d k."</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$d k."</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Leisti"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pristabdyti"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Sukti pirmyn"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Sukti pirmyn %1$d k. greičiau"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Sukti atgal"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Sukti atgal %1$d k. greičiau"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Praleisti kitą"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Praleisti ankstesnį"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Daugiau veiksmų"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Panaikinti parinkties „Patinka“ pasirinkimą"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Pasirinkti parinktį „Patinka“"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Panaikinti parinkties „Nepatinka“ pasirinkimą"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Pasirinkti parinktį „Nepatinka“"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Nekartoti nieko"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Kartoti viską"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Kartoti vieną"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Įgalinti maišymą"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Išjungti maišymą"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Įgalinti aukštą kokybę"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Išjungti aukštą kokybę"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Įgalinti subtitrus"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Išjungti subtitrus"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Įjungti vaizdo vaizde režimą"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Medijos valdikliai rodomi"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Medijos valdikliai paslėpti. Paspauskite valdymo pultą, kad būtų rodomi"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Užbaigti"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Tęsti"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"%1$d ir %2$d „MediaPlayer“ klaidos kodas"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"PRADĖTI"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Kitas"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Naršymo meniu"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Paieškos veiksmas"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Ieškoti"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Pasakykite, kad ieškotumėte"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Ieškoti „<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>“"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Kalbėkite, kad ieškotumėte „<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>“"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$d k."</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$d k."</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Leisti"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pristabdyti"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Sukti pirmyn"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Sukti pirmyn %1$d k. greičiau"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Sukti atgal"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Sukti atgal %1$d k. greičiau"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Praleisti kitą"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Praleisti ankstesnį"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Daugiau veiksmų"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Panaikinti parinkties „Patinka“ pasirinkimą"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Pasirinkti parinktį „Patinka“"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Panaikinti parinkties „Nepatinka“ pasirinkimą"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Pasirinkti parinktį „Nepatinka“"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Nekartoti nieko"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Kartoti viską"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Kartoti vieną"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Įgalinti maišymą"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Išjungti maišymą"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Įgalinti aukštą kokybę"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Išjungti aukštą kokybę"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Įgalinti subtitrus"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Išjungti subtitrus"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Įjungti vaizdo vaizde režimą"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Medijos valdikliai rodomi"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Medijos valdikliai paslėpti. Paspauskite valdymo pultą, kad būtų rodomi"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Užbaigti"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Tęsti"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"%1$d ir %2$d „MediaPlayer“ klaidos kodas"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"PRADĖTI"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Kitas"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-lv/strings.xml b/leanback/leanback/src/main/res/values-lv/strings.xml
index db07d64..5a370ef 100644
--- a/leanback/leanback/src/main/res/values-lv/strings.xml
+++ b/leanback/leanback/src/main/res/values-lv/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigācijas izvēlne"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Meklēšanas darbība"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Meklēt"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Runāt, lai meklētu"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Meklējiet: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Runājiet, lai meklētu <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Atskaņot"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pauzēt"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Pārtīt uz priekšu"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Pārtīt uz priekšu %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Attīt"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Attīt atpakaļ %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Izlaist nākamo"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Izlaist iepriekšējo"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Citas darbības"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Atcelt “Patīk” atlasi"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Atlasīt “Patīk”"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Atcelt “Nepatīk” atlasi"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Atlasīt “Nepatīk”"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Neatkārtot nevienu"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Atkārtot visu"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Atkārtot vienu"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Iespējot atskaņošanu jauktā secībā"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Atspējot atskaņošanu jauktā secībā"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Iespējot augstas kvalitātes vienumu atskaņošanu"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Atspējot augstas kvalitātes vienumu atskaņošanu"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Iespējot slēgtos parakstus"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Atspējot slēgtos parakstus"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Aktivizēt funkciju Attēls attēlā"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Multivides vadīklas ir redzamas."</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Multivides vadīklas ir paslēptas. Nospiediet virzienu tastatūru, lai tās tiktu parādītas."</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Pabeigt"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Turpināt"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer kļūdas kods: %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"SĀKT DARBU"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Nākamā"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigācijas izvēlne"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Meklēšanas darbība"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Meklēt"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Runāt, lai meklētu"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Meklējiet: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Runājiet, lai meklētu <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Atskaņot"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pauzēt"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Pārtīt uz priekšu"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Pārtīt uz priekšu %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Attīt"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Attīt atpakaļ %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Izlaist nākamo"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Izlaist iepriekšējo"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Citas darbības"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Atcelt “Patīk” atlasi"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Atlasīt “Patīk”"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Atcelt “Nepatīk” atlasi"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Atlasīt “Nepatīk”"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Neatkārtot nevienu"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Atkārtot visu"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Atkārtot vienu"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Iespējot atskaņošanu jauktā secībā"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Atspējot atskaņošanu jauktā secībā"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Iespējot augstas kvalitātes vienumu atskaņošanu"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Atspējot augstas kvalitātes vienumu atskaņošanu"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Iespējot slēgtos parakstus"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Atspējot slēgtos parakstus"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Aktivizēt funkciju Attēls attēlā"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Multivides vadīklas ir redzamas."</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Multivides vadīklas ir paslēptas. Nospiediet virzienu tastatūru, lai tās tiktu parādītas."</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Pabeigt"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Turpināt"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer kļūdas kods: %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"SĀKT DARBU"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Nākamā"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-mk/strings.xml b/leanback/leanback/src/main/res/values-mk/strings.xml
index 87df75b..2e7f3f8 100644
--- a/leanback/leanback/src/main/res/values-mk/strings.xml
+++ b/leanback/leanback/src/main/res/values-mk/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Мени за навигација"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Дејство на пребарување"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Пребарајте"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Зборувајте за да пребарувате"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Пребарувајте <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Кажете за да се пребарува <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Пушти"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Паузирај"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Премотај напред"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Премотај напред %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Премотај наназад"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Премотај наназад %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Прескокни на следна"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Прескокни на претходна"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Повеќе дејства"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Отштиклирај палец нагоре"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Штиклирај палец нагоре"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Отштиклирај палец надолу"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Штиклирај палец надолу"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Не повторувај ниедна"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Повтори ги сите"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Повтори една"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Овозможи мешање"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Оневозможи мешање"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Овозможи висок квалитет"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Оневозможи висок квалитет"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Овозможи затворени титлови"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Оневозможи затворени титлови"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Влези во режимот „Слика во слика“"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Контролите на аудиовизуелните датотеки се прикажани"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Контролите на аудиовизуелните датотеки се сокриени. Притиснете на навигациските копчиња за да се прикажат"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Готово"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Продолжи"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Код за грешка на MediaPlayer %1$d дополнително %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ЗАПОЧНЕТЕ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Следно"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Мени за навигација"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Дејство на пребарување"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Пребарајте"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Зборувајте за да пребарувате"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Пребарувајте <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Кажете за да се пребарува <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Пушти"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Паузирај"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Премотај напред"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Премотај напред %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Премотај наназад"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Премотај наназад %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Прескокни на следна"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Прескокни на претходна"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Повеќе дејства"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Отштиклирај палец нагоре"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Штиклирај палец нагоре"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Отштиклирај палец надолу"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Штиклирај палец надолу"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Не повторувај ниедна"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Повтори ги сите"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Повтори една"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Овозможи мешање"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Оневозможи мешање"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Овозможи висок квалитет"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Оневозможи висок квалитет"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Овозможи затворени титлови"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Оневозможи затворени титлови"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Влези во режимот „Слика во слика“"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Контролите на аудиовизуелните датотеки се прикажани"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Контролите на аудиовизуелните датотеки се сокриени. Притиснете на навигациските копчиња за да се прикажат"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Готово"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Продолжи"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Код за грешка на MediaPlayer %1$d дополнително %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ЗАПОЧНЕТЕ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Следно"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ml/strings.xml b/leanback/leanback/src/main/res/values-ml/strings.xml
index fab25dd..2122b08 100644
--- a/leanback/leanback/src/main/res/values-ml/strings.xml
+++ b/leanback/leanback/src/main/res/values-ml/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"നാവിഗേഷൻ മെനു"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"തിരയൽ പ്രവർത്തനം"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"തിരയുക"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"ശബ്‌ദം ഉപയോഗിച്ച് തിരയുക"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> തിരയുക"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> തിരയുന്നതിന് സംസാരിക്കുക"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"പ്ലേ ചെയ്യുക"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"താൽക്കാലികമായി നിർത്തുക"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"വേഗത്തിൽ മുന്നോട്ട് നീക്കുക"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX വേഗത്തിൽ മുന്നോട്ട് നീക്കുക"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"പിന്നിലേക്ക് പോവുക"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX റിവൈൻഡ് ചെയ്യുക"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"അടുത്തതിലേക്ക് പോകുക"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"മുമ്പത്തേതിലേക്ക് പോകുക"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"കൂടുതൽ പ്രവർത്തനങ്ങൾ"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"തമ്പ് അപ്പ് തിരഞ്ഞെടുത്തത് മാറ്റുക"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"തമ്പ് അപ്പ് തിരഞ്ഞെടുക്കുക"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"തമ്പ് ഡൗൺ തിരഞ്ഞെടുത്തത് മാറ്റുക"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"തമ്പ് ഡൗൺ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"ഒന്നും ആവർത്തിക്കരുത്"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"എല്ലാം ആവർത്തിക്കുക"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"ഒന്ന് ആവർത്തിക്കുക"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"ഷഫിൾ ചെയ്യുന്നത് പ്രവർത്തനക്ഷമമാക്കുക"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"ഷഫിൾ ചെയ്യുന്നത് പ്രവർത്തനരഹിതമാക്കുക"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"ഉയർന്ന നിലവാരം പ്രവർത്തനക്ഷമമാക്കുക"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"ഉയർന്ന നിലവാരം പ്രവർത്തനരഹിതമാക്കുക"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"അടിക്കുറിപ്പ് നൽകൽ പ്രവർത്തനക്ഷമമാക്കുക"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"അടിക്കുറിപ്പ് നൽകൽ പ്രവർത്തനരഹിതമാക്കുക"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"\'ചിത്രത്തിനുള്ളിൽ ചിത്രം\' മോഡിലേക്ക് പ്രവേശിക്കുക"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"മീഡിയ നിയന്ത്രണങ്ങൾ ‌കാണിച്ചിരിക്കുന്നു"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"മീഡിയ നിയന്ത്രണങ്ങൾ ‌അദൃശ്യമാക്കിയിരിക്കുന്നു, കാണിക്കുന്നതിന് ഡി-‌പാഡ് അമർത്തുക"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"പൂർത്തിയാക്കുക"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"തുടരുക"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"മീഡിയ പ്ലേയർ പിശക് കോഡ് %1$d, കൂടെ %2$d എന്നതും"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ആരംഭിക്കുക"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"അടുത്തത്"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"നാവിഗേഷൻ മെനു"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"തിരയൽ പ്രവർത്തനം"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"തിരയുക"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"ശബ്‌ദം ഉപയോഗിച്ച് തിരയുക"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> തിരയുക"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> തിരയുന്നതിന് സംസാരിക്കുക"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"പ്ലേ ചെയ്യുക"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"താൽക്കാലികമായി നിർത്തുക"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"വേഗത്തിൽ മുന്നോട്ട് നീക്കുക"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX വേഗത്തിൽ മുന്നോട്ട് നീക്കുക"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"പിന്നിലേക്ക് പോവുക"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX റിവൈൻഡ് ചെയ്യുക"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"അടുത്തതിലേക്ക് പോകുക"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"മുമ്പത്തേതിലേക്ക് പോകുക"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"കൂടുതൽ പ്രവർത്തനങ്ങൾ"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"തമ്പ് അപ്പ് തിരഞ്ഞെടുത്തത് മാറ്റുക"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"തമ്പ് അപ്പ് തിരഞ്ഞെടുക്കുക"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"തമ്പ് ഡൗൺ തിരഞ്ഞെടുത്തത് മാറ്റുക"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"തമ്പ് ഡൗൺ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"ഒന്നും ആവർത്തിക്കരുത്"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"എല്ലാം ആവർത്തിക്കുക"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"ഒന്ന് ആവർത്തിക്കുക"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"ഷഫിൾ ചെയ്യുന്നത് പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"ഷഫിൾ ചെയ്യുന്നത് പ്രവർത്തനരഹിതമാക്കുക"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"ഉയർന്ന നിലവാരം പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"ഉയർന്ന നിലവാരം പ്രവർത്തനരഹിതമാക്കുക"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"അടിക്കുറിപ്പ് നൽകൽ പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"അടിക്കുറിപ്പ് നൽകൽ പ്രവർത്തനരഹിതമാക്കുക"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"\'ചിത്രത്തിനുള്ളിൽ ചിത്രം\' മോഡിലേക്ക് പ്രവേശിക്കുക"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"മീഡിയ നിയന്ത്രണങ്ങൾ ‌കാണിച്ചിരിക്കുന്നു"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"മീഡിയ നിയന്ത്രണങ്ങൾ ‌അദൃശ്യമാക്കിയിരിക്കുന്നു, കാണിക്കുന്നതിന് ഡി-‌പാഡ് അമർത്തുക"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"പൂർത്തിയാക്കുക"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"തുടരുക"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"മീഡിയ പ്ലേയർ പിശക് കോഡ് %1$d, കൂടെ %2$d എന്നതും"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ആരംഭിക്കുക"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"അടുത്തത്"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-mn/strings.xml b/leanback/leanback/src/main/res/values-mn/strings.xml
index 8677caf..397f231 100644
--- a/leanback/leanback/src/main/res/values-mn/strings.xml
+++ b/leanback/leanback/src/main/res/values-mn/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Навигацийн цэс"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Хайлтын үйлдэл"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Хайх"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Хайхын тулд ярина уу"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> хайх"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> хайхын тулд ярина уу"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Тоглуулах"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Түр зогсоох"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Хурдан урагшлуулах"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Хурдан урагшлуулах %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Ухраах"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Ухраах %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Дараахийг алгасах"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Өмнөхийг алгасах"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Өөр үйлдлүүд"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Дээш  эрхий хурууны сонголтыг цуцлах"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Дээш эрхий хурууг сонгох"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Доош эрхий хурууны сонголтыг цуцлах"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Доош эрхий хурууг сонгох"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Алийг нь ч давтахгүй"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Бүгдийг давтах"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Нэгийг давтах"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Холихыг идэвхжүүлэх"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Холихыг идэвхгүй болгох"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Өндөр чанарыг идэвхжүүлэх"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Өндөр чанарыг идэвхгүй болгох"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Текст тайлбарыг идэвхжүүлэх"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Текст тайлбарыг идэвхгүй болгох"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Зурган доторх зураг горимд оруулна уу"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Медиа удирдлагыг харуулж байна"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Медиа удирдлага нуугдсан байна, харуулахын тулд d-pad-г дарна уу"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Дуусгах"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Үргэлжлүүлэх"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer-н алдааны код %1$d нэмэлт %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ЭХЛҮҮЛЭХ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Дараах"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Навигацийн цэс"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Хайлтын үйлдэл"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Хайх"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Хайхын тулд ярина уу"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> хайх"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> хайхын тулд ярина уу"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Тоглуулах"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Түр зогсоох"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Хурдан урагшлуулах"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Хурдан урагшлуулах %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Ухраах"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Ухраах %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Дараахийг алгасах"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Өмнөхийг алгасах"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Өөр үйлдлүүд"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Дээш  эрхий хурууны сонголтыг цуцлах"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Дээш эрхий хурууг сонгох"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Доош эрхий хурууны сонголтыг цуцлах"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Доош эрхий хурууг сонгох"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Алийг нь ч давтахгүй"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Бүгдийг давтах"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Нэгийг давтах"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Холихыг идэвхжүүлэх"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Холихыг идэвхгүй болгох"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Өндөр чанарыг идэвхжүүлэх"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Өндөр чанарыг идэвхгүй болгох"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Текст тайлбарыг идэвхжүүлэх"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Текст тайлбарыг идэвхгүй болгох"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Зурган доторх зураг горимд оруулна уу"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Медиа удирдлагыг харуулж байна"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Медиа удирдлага нуугдсан байна, харуулахын тулд d-pad-г дарна уу"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Дуусгах"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Үргэлжлүүлэх"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer-н алдааны код %1$d нэмэлт %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ЭХЛҮҮЛЭХ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Дараах"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-mr/strings.xml b/leanback/leanback/src/main/res/values-mr/strings.xml
index f3d3e05..17a5a38 100644
--- a/leanback/leanback/src/main/res/values-mr/strings.xml
+++ b/leanback/leanback/src/main/res/values-mr/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"नेव्हिगेशन मेनू"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"शोध क्रिया"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"शोधा"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"शोधण्यासाठी बोला"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> शोधा"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> शोधण्यासाठी बोला"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"प्ले"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"विराम द्या"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"पुढे ढकला"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"फास्ट फॉरवर्ड %1$d"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"रीवाइंड करा"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"रीवाइंड %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"पुढील वगळा"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"मागील वगळा"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"आणखी क्रिया"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"थंब अप निवड रद्द करा"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"थंब अप निवडा"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"थंब डाउन निवड रद्द करा"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"थंब डाउन निवडा"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"काहीही रिपीट करू नका"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"सर्व रिपीट करा"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"एक रिपीट करा"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"शफल करा सुरू करा"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"शफल करा बंद करा"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"उच्च गुणवत्ता सुरू करा"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"उच्च गुणवत्ता बंद करा"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"सबटायटल बंद करा"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"सबटायटल बंद करा"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"चित्रात-चित्र मोडमध्ये एंटर करा"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"मीडिया नियंत्रणे दर्शवली आहेत"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"मीडिया नियंत्रणे लपलेली आहेत, दर्शवण्‍यासाठी d-pad दाबा"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"समाप्त"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"सुरू ठेवा"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"मीडियाप्लेअर एरर कोड %1$d अतिरिक्त %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"सुरू करा"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"पुढील"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"नेव्हिगेशन मेनू"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"शोध क्रिया"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"शोधा"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"शोधण्यासाठी बोला"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> शोधा"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> शोधण्यासाठी बोला"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"प्ले"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"विराम द्या"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"पुढे ढकला"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"फास्ट फॉरवर्ड %1$d"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"रीवाइंड करा"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"रीवाइंड %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"पुढील वगळा"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"मागील वगळा"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"आणखी क्रिया"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"थंब अप निवड रद्द करा"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"थंब अप निवडा"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"थंब डाउन निवड रद्द करा"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"थंब डाउन निवडा"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"काहीही रिपीट करू नका"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"सर्व रिपीट करा"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"एक रिपीट करा"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"शफल करा सुरू करा"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"शफल करा बंद करा"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"उच्च गुणवत्ता सुरू करा"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"उच्च गुणवत्ता बंद करा"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"सबटायटल बंद करा"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"सबटायटल बंद करा"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"चित्रात-चित्र मोडमध्ये एंटर करा"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"मीडिया नियंत्रणे दर्शवली आहेत"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"मीडिया नियंत्रणे लपलेली आहेत, दर्शवण्‍यासाठी d-pad दाबा"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"समाप्त"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"सुरू ठेवा"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"मीडियाप्लेअर एरर कोड %1$d अतिरिक्त %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"सुरू करा"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"पुढील"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ms/strings.xml b/leanback/leanback/src/main/res/values-ms/strings.xml
index 3af74cb..7a91fdc 100644
--- a/leanback/leanback/src/main/res/values-ms/strings.xml
+++ b/leanback/leanback/src/main/res/values-ms/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu navigasi"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Tindakan Carian"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Cari"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Tutur untuk membuat carian"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Cari <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Tutur untuk mencari <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Main"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Jeda"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Mundar Laju"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Mundar Laju %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Mandir"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Mandir %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Langkau Seterusnya"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Langkau Sebelumnya"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Lagi Tindakan"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Nyahpilih Menyukai"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Pilih Menyukai"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Nyahpilih Tidak Menyukai"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Pilih Tidak Menyukai"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Jangan Ulang"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Ulang Semua"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Ulang Satu"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Dayakan Rombak"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Lumpuhkan Rombak"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Dayakan Kualiti Tinggi"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Lumpuhkan Kualiti Tinggi"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Dayakan Kapsyen Tertutup"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Lumpuhkan Kapsyen Tertutup"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Masuki Mod Gambar Dalam Gambar"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Kawalan media ditunjukkan"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Kawalan media disembunyikan, tekan d-pad untuk menunjukkan kawalan"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Selesai"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Teruskan"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Kod ralat MediaPlayer %1$d tambahan %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"BERMULA"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Seterusnya"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu navigasi"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Tindakan Carian"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Cari"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Tutur untuk membuat carian"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Cari <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Tutur untuk mencari <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Main"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Jeda"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Mundar Laju"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Mundar Laju %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Mandir"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Mandir %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Langkau Seterusnya"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Langkau Sebelumnya"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Lagi Tindakan"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Nyahpilih Menyukai"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Pilih Menyukai"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Nyahpilih Tidak Menyukai"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Pilih Tidak Menyukai"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Jangan Ulang"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Ulang Semua"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Ulang Satu"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Dayakan Rombak"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Lumpuhkan Rombak"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Dayakan Kualiti Tinggi"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Lumpuhkan Kualiti Tinggi"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Dayakan Kapsyen Tertutup"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Lumpuhkan Kapsyen Tertutup"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Masuki Mod Gambar Dalam Gambar"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Kawalan media ditunjukkan"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Kawalan media disembunyikan, tekan d-pad untuk menunjukkan kawalan"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Selesai"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Teruskan"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Kod ralat MediaPlayer %1$d tambahan %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"BERMULA"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Seterusnya"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-my/strings.xml b/leanback/leanback/src/main/res/values-my/strings.xml
index 1ded010..ebf708b 100644
--- a/leanback/leanback/src/main/res/values-my/strings.xml
+++ b/leanback/leanback/src/main/res/values-my/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"လမ်းညွှန် မီနူး"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"ရှာဖွေရန် လုပ်ဆောင်ချက်"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"ရှာဖွေရန်"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"ရှာဖွေရန် ပြောပါ"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ကို ရှာဖွေရန်"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ကို ရှာဖွေရန် ပြောပါ"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"ဖွင့်ရန်"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"ခဏရပ်ရန်"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"ရှေ့သို့ အမြန်သွားရန်"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"ရှေ့သို့ အမြန်သွားရန် %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"နောက်သို့ ရစ်ရန်"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"နောက်သို့ ရစ်ရန် %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"နောက်တစ်ပုဒ်သို့ ကျော်ရန်"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"ယခင်တစ်ပုဒ်သို့ သွားရန်"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"နောက်ထပ် လုပ်ဆောင်ချက်များ"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"လက်မထောင် သင်္ကေတအား မရွေးရန်"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"လက်မထောင် သင်္ကေတအား ရွေးရန်"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"လက်မအောက်စိုက် သင်္ကေတအား မရွေးရန်"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"လက်မအောက်စိုက် သင်္ကေတအား ရွေးရန်"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"မည်သည်ကိုမျှ ပြန်မကျော့ရန်"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"အားလုံး ပြန်ကျော့ရန်"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"တစ်ခုကို ပြန်ကျော့ရန်"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"ရောသမမွှေခြင်း ပြုရန်"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"ရောသမမွှေခြင်း မပြုရန်"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"\'အရည်အသွေးမြင့်\' ဖွင့်ရန်"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"\'အရည်အသွေးမြင့်\' ပိတ်ထားရန်"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"စာတမ်းများ ဖွင့်ရန်"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"စာတမ်းများ ပိတ်ရန်"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"\'တစ်ခုပေါ်တစ်ခုထပ်၍ ဖွင့်ခြင်းမုဒ်\' ကို ထည့်ရန်"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"မီဒီယာ ခလုတ်များကို ပြထားပါသည်"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"မီဒီယာခလုတ်များကို ဖျောက်ထားပါသည်။ ပြရန် d ခလုတ်ခုံကို နှိပ်ပါ"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"အပြီးသတ်ရန်"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"ရှေ့ဆက်ရန်"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"မီဒီယာပလေယာ မှားယွင်းမှုကုဒ် %1$d နှင့် အပို %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"စတင်ရန်"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"ရှေ့သို့"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"လမ်းညွှန် မီနူး"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"ရှာဖွေရန် လုပ်ဆောင်ချက်"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"ရှာဖွေရန်"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"ရှာဖွေရန် ပြောပါ"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ကို ရှာဖွေရန်"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ကို ရှာဖွေရန် ပြောပါ"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"ဖွင့်ရန်"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"ခဏရပ်ရန်"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"ရှေ့သို့ အမြန်သွားရန်"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"ရှေ့သို့ အမြန်သွားရန် %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"နောက်သို့ ရစ်ရန်"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"နောက်သို့ ရစ်ရန် %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"နောက်တစ်ပုဒ်သို့ ကျော်ရန်"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"ယခင်တစ်ပုဒ်သို့ သွားရန်"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"နောက်ထပ် လုပ်ဆောင်ချက်များ"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"လက်မထောင် သင်္ကေတအား မရွေးရန်"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"လက်မထောင် သင်္ကေတအား ရွေးရန်"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"လက်မအောက်စိုက် သင်္ကေတအား မရွေးရန်"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"လက်မအောက်စိုက် သင်္ကေတအား ရွေးရန်"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"မည်သည်ကိုမျှ ပြန်မကျော့ရန်"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"အားလုံး ပြန်ကျော့ရန်"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"တစ်ခုကို ပြန်ကျော့ရန်"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"ရောသမမွှေခြင်း ပြုရန်"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"ရောသမမွှေခြင်း မပြုရန်"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"\'အရည်အသွေးမြင့်\' ဖွင့်ရန်"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"\'အရည်အသွေးမြင့်\' ပိတ်ထားရန်"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"စာတမ်းများ ဖွင့်ရန်"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"စာတမ်းများ ပိတ်ရန်"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"\'တစ်ခုပေါ်တစ်ခုထပ်၍ ဖွင့်ခြင်းမုဒ်\' ကို ထည့်ရန်"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"မီဒီယာ ခလုတ်များကို ပြထားပါသည်"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"မီဒီယာခလုတ်များကို ဖျောက်ထားပါသည်။ ပြရန် d ခလုတ်ခုံကို နှိပ်ပါ"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"အပြီးသတ်ရန်"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"ရှေ့ဆက်ရန်"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"မီဒီယာပလေယာ မှားယွင်းမှုကုဒ် %1$d နှင့် အပို %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"စတင်ရန်"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"ရှေ့သို့"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-nb/strings.xml b/leanback/leanback/src/main/res/values-nb/strings.xml
index 99de7f6..d8e0e75 100644
--- a/leanback/leanback/src/main/res/values-nb/strings.xml
+++ b/leanback/leanback/src/main/res/values-nb/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigasjonsmeny"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Søkehandling"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Søk"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Snakk for å søke"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Søk i <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Snakk for å søke i <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Spill av"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Sett på pause"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Spol fremover"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Spol fremover %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Spol tilbake"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Spol tilbake %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Hopp til neste"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Hopp til forrige"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Flere handlinger"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Fjern valg av «liker»"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Velg «liker»"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Fjern valg av «liker ikke»"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Velg «liker ikke»"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Ikke gjenta noen"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Gjenta alle"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Gjenta én"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Slå på avspilling i tilfeldig rekkefølge"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Slå av avspilling i tilfeldig rekkefølge"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Slå på høy kvalitet"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Slå av høy kvalitet"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Slå på teksting for hørselshemmede"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Slå av teksting for hørselshemmede"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Slå på bilde-i-bilde-modus"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Mediekontrollene vises"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Mediekontrollene er skjult – trykk på styrepilene for å vise dem"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Fullfør"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Fortsett"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer-feilkode %1$d ekstra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"KOM I GANG"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Neste"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigasjonsmeny"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Søkehandling"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Søk"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Snakk for å søke"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Søk i <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Snakk for å søke i <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Spill av"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Sett på pause"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Spol fremover"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Spol fremover %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Spol tilbake"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Spol tilbake %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Hopp til neste"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Hopp til forrige"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Flere handlinger"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Fjern valg av «liker»"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Velg «liker»"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Fjern valg av «liker ikke»"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Velg «liker ikke»"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Ikke gjenta noen"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Gjenta alle"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Gjenta én"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Slå på avspilling i tilfeldig rekkefølge"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Slå av avspilling i tilfeldig rekkefølge"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Slå på høy kvalitet"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Slå av høy kvalitet"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Slå på teksting for hørselshemmede"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Slå av teksting for hørselshemmede"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Slå på bilde-i-bilde-modus"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Mediekontrollene vises"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Mediekontrollene er skjult – trykk på styrepilene for å vise dem"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Fullfør"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Fortsett"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer-feilkode %1$d ekstra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"KOM I GANG"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Neste"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ne/strings.xml b/leanback/leanback/src/main/res/values-ne/strings.xml
index 5cf37cd..ff431f5 100644
--- a/leanback/leanback/src/main/res/values-ne/strings.xml
+++ b/leanback/leanback/src/main/res/values-ne/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"नेभिगेसन मेनु"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"कारबाही खोज्नुहोस्"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"खोज्नुहोस्"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"खोज्नका लागि बोल्नुहोस्"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> खोज्नुहोस्"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> खोज्नका लागि बोल्नुहोस्"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"प्ले गर्नुहोस्"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"पज गर्नुहोस्"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"फास्ट फर्वार्ड गर्नुहोस्"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"फास्ट फर्वार्ड %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"रिवाइन्ड गर्नुहोस्"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"रिवाइन्ड गर्नुहोस् %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"अर्कोमा जानुहोस्"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"अघिल्लोमा जानुहोस्"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"थप कारबाहीहरू"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"मन परेको जनाउने बटनलाई चयनबाट हटाउनुहोस्"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"मन परेको जनाउने बटन चयन गर्नुहोस्"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"मन नपरेको जनाउने बटनलाई चयनबाट हटाउनुहोस्"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"मन नपरेको जनाउने बटन चयन गर्नुहोस्"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"कुनै पनि नदोहोर्‍याउनुहोला"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"सबै दोहोर्‍याउनुहोस्"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"एउटा दोहोर्‍याउनुहोस्"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"मिसाएर प्ले गर्ने सुविधा सक्षम पार्नुहोस्"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"मिसाएर प्ले गर्ने सुविधा असक्षम पार्नुहोस्"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"उच्च गुणस्तरलाई सक्षम पार्नुहोस्"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"उच्च गुणस्तरलाई असक्षम पार्नुहोस्"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"उप शीर्षकहरू देखाउने सुविधालाई सक्षम पार्नुहोस्"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"उप शीर्षकहरू देखाउने सुविधालाई असक्षम पार्नुहोस्"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"तस्बिरभित्र तस्बिर नामक मोडमा प्रविष्टि गर्नुहोस्"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"मिडियाका नियन्त्रणहरू देखाइएका छन्"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"मिडियाका नियन्त्रणहरूलाई लुकाइएको छ, देखाउनका लागि d-pad नामक बटन थिच्नुहोस्"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"पूरा गर्नुहोस्"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"जारी राख्नुहोस्"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer को त्रुटिको कोड %1$d, यसको अतिरिक्त %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"सुरु गरौँ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"अर्को"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"नेभिगेसन मेनु"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"कारबाही खोज्नुहोस्"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"खोज्नुहोस्"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"खोज्नका लागि बोल्नुहोस्"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> खोज्नुहोस्"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> खोज्नका लागि बोल्नुहोस्"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"प्ले गर्नुहोस्"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"पज गर्नुहोस्"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"फास्ट फर्वार्ड गर्नुहोस्"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"फास्ट फर्वार्ड %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"रिवाइन्ड गर्नुहोस्"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"रिवाइन्ड गर्नुहोस् %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"अर्कोमा जानुहोस्"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"अघिल्लोमा जानुहोस्"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"थप कारबाहीहरू"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"मन परेको जनाउने बटनलाई चयनबाट हटाउनुहोस्"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"मन परेको जनाउने बटन चयन गर्नुहोस्"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"मन नपरेको जनाउने बटनलाई चयनबाट हटाउनुहोस्"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"मन नपरेको जनाउने बटन चयन गर्नुहोस्"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"कुनै पनि नदोहोर्‍याउनुहोला"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"सबै दोहोर्‍याउनुहोस्"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"एउटा दोहोर्‍याउनुहोस्"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"मिसाएर प्ले गर्ने सुविधा सक्षम पार्नुहोस्"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"मिसाएर प्ले गर्ने सुविधा असक्षम पार्नुहोस्"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"उच्च गुणस्तरलाई सक्षम पार्नुहोस्"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"उच्च गुणस्तरलाई असक्षम पार्नुहोस्"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"उप शीर्षकहरू देखाउने सुविधालाई सक्षम पार्नुहोस्"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"उप शीर्षकहरू देखाउने सुविधालाई असक्षम पार्नुहोस्"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"तस्बिरभित्र तस्बिर नामक मोडमा प्रविष्टि गर्नुहोस्"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"मिडियाका नियन्त्रणहरू देखाइएका छन्"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"मिडियाका नियन्त्रणहरूलाई लुकाइएको छ, देखाउनका लागि d-pad नामक बटन थिच्नुहोस्"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"पूरा गर्नुहोस्"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"जारी राख्नुहोस्"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer को त्रुटिको कोड %1$d, यसको अतिरिक्त %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"सुरु गरौँ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"अर्को"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-nl/strings.xml b/leanback/leanback/src/main/res/values-nl/strings.xml
index a8157a6..ffb57aa 100644
--- a/leanback/leanback/src/main/res/values-nl/strings.xml
+++ b/leanback/leanback/src/main/res/values-nl/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigatiemenu"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Actie zoeken"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Zoeken"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Spreek om te zoeken"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> zoeken"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Spreek om <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> te zoeken"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Afspelen"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pauzeren"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Vooruitspoelen"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Vooruitspoelen %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Terugspoelen"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Terugspoelen %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Naar volgende"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Naar vorige"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Meer acties"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Selectie van \'Leuk\' ongedaan maken"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"\'Leuk\' selecteren"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Selectie van \'Niet leuk\' ongedaan maken"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"\'Niet leuk\' selecteren"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Niet herhalen"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Alles herhalen"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Eén herhalen"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Shuffle inschakelen"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Shuffle uitschakelen"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Hoge kwaliteit inschakelen"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Hoge kwaliteit uitschakelen"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Ondertiteling inschakelen"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Ondertiteling uitschakelen"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Scherm-in-scherm-modus openen"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Opties voor mediabediening worden weergegeven"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Opties voor mediabediening verborgen. Druk op de D-pad om ze weer te geven."</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Voltooien"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Doorgaan"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Mediaspeler: foutcode %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"AAN DE SLAG"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Volgende"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigatiemenu"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Actie zoeken"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Zoeken"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Spreek om te zoeken"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> zoeken"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Spreek om <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> te zoeken"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Afspelen"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pauzeren"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Vooruitspoelen"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Vooruitspoelen %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Terugspoelen"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Terugspoelen %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Naar volgende"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Naar vorige"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Meer acties"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Selectie van \'Leuk\' ongedaan maken"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"\'Leuk\' selecteren"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Selectie van \'Niet leuk\' ongedaan maken"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"\'Niet leuk\' selecteren"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Niet herhalen"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Alles herhalen"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Eén herhalen"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Shuffle inschakelen"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Shuffle uitschakelen"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Hoge kwaliteit inschakelen"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Hoge kwaliteit uitschakelen"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Ondertiteling inschakelen"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Ondertiteling uitschakelen"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Scherm-in-scherm-modus openen"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Opties voor mediabediening worden weergegeven"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Opties voor mediabediening verborgen. Druk op de D-pad om ze weer te geven."</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Voltooien"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Doorgaan"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Mediaspeler: foutcode %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"AAN DE SLAG"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Volgende"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-or/strings.xml b/leanback/leanback/src/main/res/values-or/strings.xml
index ce6d1ea..3fb650a 100644
--- a/leanback/leanback/src/main/res/values-or/strings.xml
+++ b/leanback/leanback/src/main/res/values-or/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"ନେଭିଗେଶନ୍ ମେନୁ"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"ଖୋଜିବା କାମ"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"ଖୋଜିବା ପାଇଁ କୁହନ୍ତୁ"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ଖୋଜନ୍ତୁ"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ଖୋଜିବା ପାଇଁ କୁହନ୍ତୁ"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"ଚଲାନ୍ତୁ"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"ପଜ୍‍ କରନ୍ତୁ"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"ଫାଷ୍ଟ ଫର୍‌ୱାର୍ଡ"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX ବେଗରେ ଫାଷ୍ଟ ଫରୱାର୍ଡ"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"ରିୱାଇଣ୍ଡ"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX ବେଗରେ ରିୱାଇଣ୍ଡ କରନ୍ତୁ"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"ପରବର୍ତ୍ତୀକୁ ଯାଆନ୍ତୁ"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"ପୂର୍ବଟିକୁ ଛାଡ଼ିଦିଅନ୍ତୁ"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"ଅଧିକ ଗତିବିଧି"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"ପସନ୍ଦକୁ ଚୟନ କରନ୍ତୁ ନାହିଁ"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"ପସନ୍ଦକୁ ଚୟନ କରନ୍ତୁ"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"ପସନ୍ଦହୀନକୁ ଚୟନ କରନ୍ତୁ ନାହିଁ"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"ପସନ୍ଦହୀନକୁ ଚୟନ କରନ୍ତୁ"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"କୌଣସିଟି ଦୋହରାନ୍ତୁ ନାହିଁ"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"ସବୁଗୁଡ଼ିକୁ ଦୋହରାନ୍ତୁ"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"ଗୋଟିଏ ଦୋହରାନ୍ତୁ"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"ଅଦଳବଦଳକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"ଅଦଳବଦଳକୁ ଅକ୍ଷମ କରନ୍ତୁ"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"ଉଚ୍ଚ କ୍ୱାଲିଟୀକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"ଉଚ୍ଚ କ୍ୱାଲିଟୀକୁ ଅକ୍ଷମ କରନ୍ତୁ"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"କ୍ଲୋଜଡ୍‍ କ୍ୟାପ୍ସନିଙ୍ଗକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"କ୍ଲୋଜଡ୍‍ କ୍ୟାପ୍ସନିଙ୍ଗକୁ ଅକ୍ଷମ କରନ୍ତୁ"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"ଛବି ଭିତରେ ଛବି ମୋଡ୍‌ରେ ପ୍ରବେଶ କରନ୍ତୁ"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"ମିଡିଆ ନିୟନ୍ତ୍ରଣ ଦେଖାଯାଇଛି"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"ମିଡିଆ ନିୟନ୍ତ୍ରଣ ଲୁଚିଯାଇଛି, ଦେଖାଇବାକୁ ଡି-ପ୍ୟାଡ୍‍ ଦବାନ୍ତୁ"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"ସମାପ୍ତ କରନ୍ତୁ"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"ଜାରି ରଖନ୍ତୁ"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer ତ୍ରୁଟି କୋଡ୍‍ %1$d ଅତିରିକ୍ତ %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ଆରମ୍ଭ କରନ୍ତୁ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"ପରବର୍ତ୍ତୀ"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"ନେଭିଗେଶନ୍ ମେନୁ"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"ଖୋଜିବା କାମ"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"ସର୍ଚ୍ଚ କରନ୍ତୁ"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"ଖୋଜିବା ପାଇଁ କୁହନ୍ତୁ"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ଖୋଜନ୍ତୁ"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ଖୋଜିବା ପାଇଁ କୁହନ୍ତୁ"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"ଚଲାନ୍ତୁ"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"ପଜ୍‍ କରନ୍ତୁ"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"ଫାଷ୍ଟ ଫର୍‌ୱାର୍ଡ"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX ବେଗରେ ଫାଷ୍ଟ ଫରୱାର୍ଡ"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"ରିୱାଇଣ୍ଡ"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX ବେଗରେ ରିୱାଇଣ୍ଡ କରନ୍ତୁ"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"ପରବର୍ତ୍ତୀକୁ ଯାଆନ୍ତୁ"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"ପୂର୍ବଟିକୁ ଛାଡ଼ିଦିଅନ୍ତୁ"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"ଅଧିକ ଗତିବିଧି"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"ପସନ୍ଦକୁ ଚୟନ କରନ୍ତୁ ନାହିଁ"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"ପସନ୍ଦକୁ ଚୟନ କରନ୍ତୁ"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"ପସନ୍ଦହୀନକୁ ଚୟନ କରନ୍ତୁ ନାହିଁ"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"ପସନ୍ଦହୀନକୁ ଚୟନ କରନ୍ତୁ"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"କୌଣସିଟି ଦୋହରାନ୍ତୁ ନାହିଁ"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"ସବୁଗୁଡ଼ିକୁ ଦୋହରାନ୍ତୁ"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"ଗୋଟିଏ ଦୋହରାନ୍ତୁ"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"ଅଦଳବଦଳକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"ଅଦଳବଦଳକୁ ଅକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"ଉଚ୍ଚ କ୍ୱାଲିଟୀକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"ଉଚ୍ଚ କ୍ୱାଲିଟୀକୁ ଅକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"କ୍ଲୋଜଡ୍‍ କ୍ୟାପ୍ସନିଙ୍ଗକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"କ୍ଲୋଜଡ୍‍ କ୍ୟାପ୍ସନିଙ୍ଗକୁ ଅକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"ଛବି ଭିତରେ ଛବି ମୋଡ୍‌ରେ ପ୍ରବେଶ କରନ୍ତୁ"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"ମିଡିଆ ନିୟନ୍ତ୍ରଣ ଦେଖାଯାଇଛି"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"ମିଡିଆ ନିୟନ୍ତ୍ରଣ ଲୁଚିଯାଇଛି, ଦେଖାଇବାକୁ ଡି-ପ୍ୟାଡ୍‍ ଦବାନ୍ତୁ"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"ସମାପ୍ତ କରନ୍ତୁ"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"ଜାରି ରଖନ୍ତୁ"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer ତ୍ରୁଟି କୋଡ୍‍ %1$d ଅତିରିକ୍ତ %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ଆରମ୍ଭ କରନ୍ତୁ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"ପରବର୍ତ୍ତୀ"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-pa/strings.xml b/leanback/leanback/src/main/res/values-pa/strings.xml
index fd08a54..8ba9efb 100644
--- a/leanback/leanback/src/main/res/values-pa/strings.xml
+++ b/leanback/leanback/src/main/res/values-pa/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"ਨੈਵੀਗੇਸ਼ਨ ਮੀਨੂ"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"ਖੋਜ ਕਾਰਵਾਈ"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"ਖੋਜੋ"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"ਖੋਜਣ ਲਈ ਬੋਲੋ"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ਖੋਜੋ"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ਖੋਜਣ ਲਈ ਬੋਲੋ"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"ਚਲਾਓ"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"ਰੋਕੋ"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"ਤੇਜ਼ੀ ਨਾਲ ਅੱਗੇ ਕਰੋ"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX ਤੇਜ਼ੀ ਨਾਲ ਅੱਗੇ ਕਰੋ"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"ਪਿੱਛੇ ਕਰੋ"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX ਪਿੱਛੇ ਕਰੋ"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"ਅਗਲੇ ਨੂੰ ਛੱਡੋ"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"ਪਿਛਲੇ ਨੂੰ ਛੱਡੋ"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"ਹੋਰ ਕਾਰਵਾਈਆਂ"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"ਸਲਾਹੋ ਨੂੰ ਅਣ-ਚੁਣਿਆ ਕਰੋ"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"ਸਲਾਹੋ ਨੂੰ ਚੁਣੋ"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"\'ਨਾ ਸਲਾਹੋ\' ਨੂੰ ਅਣ-ਚੁਣਿਆ ਕਰੋ"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"\'ਨਾ ਸਲਾਹੋ\' ਨੂੰ ਚੁਣੋ"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"ਕਿਸੇ ਨੂੰ ਨਾ ਦੁਹਰਾਓ"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"ਸਭ ਦੁਹਰਾਓ"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"ਇੱਕ ਨੂੰ ਦੁਹਰਾਓ"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"ਬੇਤਰਤੀਬ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"ਬੇਤਰਤੀਬ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"ਬਿਹਤਰੀਨ ਕੁਆਲਿਟੀ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"ਬਿਹਤਰੀਨ ਕੁਆਲਿਟੀ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"ਬੰਦ ਸੁਰਖੀਆਂ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"ਬੰਦ ਸੁਰਖੀਆਂ ਬੰਦ ਕਰੋ"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਮੋਡ ਵਿੱਚ ਦਾਖਲ ਹੋਵੋ"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"ਮੀਡੀਆ ਕੰਟਰੋਲ ਦਿਖਾਏ ਗਏ"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"ਮੀਡੀਆ ਕੰਟਰੋਲ ਲੁਕੇ ਹੋਏ ਹਨ, ਦਿਖਾਉਣ ਲਈ ਡੀ-ਪੈਡ ਦਬਾਓ"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"ਪੂਰਾ ਕਰੋ"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer ਗੜਬੜ ਕੋਡ %1$d ਵਾਧੂ %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ਸ਼ੁਰੂਆਤ ਕਰੋ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"ਅੱਗੇ"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"ਨੈਵੀਗੇਸ਼ਨ ਮੀਨੂ"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"ਖੋਜ ਕਾਰਵਾਈ"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"ਖੋਜੋ"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"ਖੋਜਣ ਲਈ ਬੋਲੋ"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ਖੋਜੋ"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ਖੋਜਣ ਲਈ ਬੋਲੋ"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"ਚਲਾਓ"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"ਰੋਕੋ"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"ਤੇਜ਼ੀ ਨਾਲ ਅੱਗੇ ਕਰੋ"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX ਤੇਜ਼ੀ ਨਾਲ ਅੱਗੇ ਕਰੋ"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"ਪਿੱਛੇ ਕਰੋ"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX ਪਿੱਛੇ ਕਰੋ"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"ਅਗਲੇ ਨੂੰ ਛੱਡੋ"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"ਪਿਛਲੇ ਨੂੰ ਛੱਡੋ"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"ਹੋਰ ਕਾਰਵਾਈਆਂ"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"ਸਲਾਹੋ ਨੂੰ ਅਣ-ਚੁਣਿਆ ਕਰੋ"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"ਸਲਾਹੋ ਨੂੰ ਚੁਣੋ"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"\'ਨਾ ਸਲਾਹੋ\' ਨੂੰ ਅਣ-ਚੁਣਿਆ ਕਰੋ"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"\'ਨਾ ਸਲਾਹੋ\' ਨੂੰ ਚੁਣੋ"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"ਕਿਸੇ ਨੂੰ ਨਾ ਦੁਹਰਾਓ"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"ਸਭ ਦੁਹਰਾਓ"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"ਇੱਕ ਨੂੰ ਦੁਹਰਾਓ"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"ਬੇਤਰਤੀਬ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"ਬੇਤਰਤੀਬ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"ਬਿਹਤਰੀਨ ਕੁਆਲਿਟੀ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"ਬਿਹਤਰੀਨ ਕੁਆਲਿਟੀ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"ਬੰਦ ਸੁਰਖੀਆਂ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"ਬੰਦ ਸੁਰਖੀਆਂ ਬੰਦ ਕਰੋ"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਮੋਡ ਵਿੱਚ ਦਾਖਲ ਹੋਵੋ"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"ਮੀਡੀਆ ਕੰਟਰੋਲ ਦਿਖਾਏ ਗਏ"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"ਮੀਡੀਆ ਕੰਟਰੋਲ ਲੁਕੇ ਹੋਏ ਹਨ, ਦਿਖਾਉਣ ਲਈ ਡੀ-ਪੈਡ ਦਬਾਓ"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"ਪੂਰਾ ਕਰੋ"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"ਜਾਰੀ ਰੱਖੋ"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer ਗੜਬੜ ਕੋਡ %1$d ਵਾਧੂ %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ਸ਼ੁਰੂਆਤ ਕਰੋ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"ਅੱਗੇ"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-pl/strings.xml b/leanback/leanback/src/main/res/values-pl/strings.xml
index b679bdb..5a52691 100644
--- a/leanback/leanback/src/main/res/values-pl/strings.xml
+++ b/leanback/leanback/src/main/res/values-pl/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu nawigacyjne"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Wyszukaj czynność"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Szukaj"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Powiedz, by wyszukać"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Szukaj: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Powiedz, by wyszukać: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Odtwórz"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Wstrzymaj"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Przewiń do przodu"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Przewiń do przodu %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Przewiń do tyłu"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Przewiń do tyłu %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Pomiń następny"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Pomiń poprzedni"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Więcej działań"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Odznacz Lubię"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Zaznacz Lubię"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Odznacz Nie lubię"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Zaznacz Nie lubię"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Nie powtarzaj"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Powtórz wszystko"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Powtórz jeden"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Włącz odtwarzanie losowe"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Wyłącz odtwarzanie losowe"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Włącz wysoką jakość"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Wyłącz wysoką jakość"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Włącz napisy"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Wyłącz napisy"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Włącz tryb obrazu w obrazie"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Elementy sterujące multimediami są wyświetlone"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Elementy sterujące multimediami są ukryte – naciśnij pad kierunkowy, by je wyświetlić"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Zakończ"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Dalej"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer – kod błędu %1$d, dodatkowo %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ROZPOCZNIJ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Dalej"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu nawigacyjne"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Wyszukaj czynność"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Szukaj"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Powiedz, by wyszukać"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Szukaj: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Powiedz, by wyszukać: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Odtwórz"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Wstrzymaj"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Przewiń do przodu"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Przewiń do przodu %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Przewiń do tyłu"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Przewiń do tyłu %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Pomiń następny"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Pomiń poprzedni"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Więcej działań"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Odznacz Lubię"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Zaznacz Lubię"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Odznacz Nie lubię"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Zaznacz Nie lubię"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Nie powtarzaj"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Powtórz wszystko"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Powtórz jeden"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Włącz odtwarzanie losowe"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Wyłącz odtwarzanie losowe"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Włącz wysoką jakość"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Wyłącz wysoką jakość"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Włącz napisy"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Wyłącz napisy"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Włącz tryb obrazu w obrazie"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Elementy sterujące multimediami są wyświetlone"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Elementy sterujące multimediami są ukryte – naciśnij pad kierunkowy, by je wyświetlić"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Zakończ"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Dalej"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer – kod błędu %1$d, dodatkowo %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ROZPOCZNIJ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Dalej"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-pt-rBR/strings.xml b/leanback/leanback/src/main/res/values-pt-rBR/strings.xml
index 6acead9..e85af65 100644
--- a/leanback/leanback/src/main/res/values-pt-rBR/strings.xml
+++ b/leanback/leanback/src/main/res/values-pt-rBR/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu de navegação"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Ação de pesquisa"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Pesquisar"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Fale para pesquisar"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Fale para pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Reproduzir"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pausar"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Avançar"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Avançar %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Retroceder"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Retroceder %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Pular próxima"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Pular anterior"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Mais ações"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Desmarcar gostei"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Marcar gostei"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Desmarcar não gostei"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Marcar não gostei"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Não repetir"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repetir tudo"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repetir um item"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Ativar ordem aleatória"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Desativar ordem aleatória"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Ativar alta qualidade"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Desativar alta qualidade"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Ativar closed captioning"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Desativar closed captioning"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Entrar no modo Picture in Picture"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Os controles de mídia estão sendo exibidos"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Os controles de mídia estão ocultos. Pressione o botão direcional para exibi-los"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Concluir"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continuar"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Código de erro do MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"PRIMEIROS PASSOS"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Próxima"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu de navegação"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Ação de pesquisa"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Pesquisar"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Fale para pesquisar"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Fale para pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Reproduzir"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pausar"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Avançar"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Avançar %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Retroceder"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Retroceder %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Pular próxima"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Pular anterior"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Mais ações"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Desmarcar gostei"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Marcar gostei"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Desmarcar não gostei"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Marcar não gostei"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Não repetir"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repetir tudo"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repetir um item"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Ativar ordem aleatória"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Desativar ordem aleatória"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Ativar alta qualidade"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Desativar alta qualidade"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Ativar closed captioning"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Desativar closed captioning"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Entrar no modo Picture in Picture"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Os controles de mídia estão sendo exibidos"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Os controles de mídia estão ocultos. Pressione o botão direcional para exibi-los"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Concluir"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continuar"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Código de erro do MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"PRIMEIROS PASSOS"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Próxima"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-pt-rPT/strings.xml b/leanback/leanback/src/main/res/values-pt-rPT/strings.xml
index 9b7d81c..82cecb07 100644
--- a/leanback/leanback/src/main/res/values-pt-rPT/strings.xml
+++ b/leanback/leanback/src/main/res/values-pt-rPT/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu de navegação"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Ação de pesquisa"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Pesquisar"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Falar para pesquisar"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Falar para pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Reproduzir"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Interromper"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Avançar"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Avançar %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Recuar"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Recuar %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Avançar para o seguinte"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Avançar para o anterior"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Mais ações"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Desselecionar Gosto"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Selecionar Gosto"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Desselecionar Não gosto"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Selecionar Não gosto"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Não repetir"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repetir tudo"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repetir um"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Ativar reprodução aleatória"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Desativar reprodução aleatória"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Ativar alta qualidade"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Desativar alta qualidade"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Ativar legendas"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Desativar legendas"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Entrar no modo de ecrã no ecrã"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Controlos de multimédia apresentados"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Controlos de multimédia ocultados. Prima o teclado direcional para mostrar."</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Terminar"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continuar"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Código de erro do MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"COMEÇAR A UTILIZAR"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Seguinte"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu de navegação"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Ação de pesquisa"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Pesquisar"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Falar para pesquisar"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Falar para pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Reproduzir"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Interromper"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Avançar"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Avançar %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Recuar"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Recuar %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Avançar para o seguinte"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Avançar para o anterior"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Mais ações"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Desselecionar Gosto"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Selecionar Gosto"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Desselecionar Não gosto"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Selecionar Não gosto"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Não repetir"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repetir tudo"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repetir um"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Ativar reprodução aleatória"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Desativar reprodução aleatória"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Ativar alta qualidade"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Desativar alta qualidade"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Ativar legendas"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Desativar legendas"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Entrar no modo de ecrã no ecrã"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Controlos de multimédia apresentados"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Controlos de multimédia ocultados. Prima o teclado direcional para mostrar."</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Terminar"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continuar"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Código de erro do MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"COMEÇAR A UTILIZAR"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Seguinte"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-pt/strings.xml b/leanback/leanback/src/main/res/values-pt/strings.xml
index 6acead9..e85af65 100644
--- a/leanback/leanback/src/main/res/values-pt/strings.xml
+++ b/leanback/leanback/src/main/res/values-pt/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu de navegação"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Ação de pesquisa"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Pesquisar"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Fale para pesquisar"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Fale para pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Reproduzir"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pausar"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Avançar"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Avançar %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Retroceder"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Retroceder %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Pular próxima"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Pular anterior"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Mais ações"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Desmarcar gostei"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Marcar gostei"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Desmarcar não gostei"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Marcar não gostei"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Não repetir"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repetir tudo"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repetir um item"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Ativar ordem aleatória"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Desativar ordem aleatória"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Ativar alta qualidade"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Desativar alta qualidade"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Ativar closed captioning"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Desativar closed captioning"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Entrar no modo Picture in Picture"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Os controles de mídia estão sendo exibidos"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Os controles de mídia estão ocultos. Pressione o botão direcional para exibi-los"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Concluir"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continuar"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Código de erro do MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"PRIMEIROS PASSOS"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Próxima"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu de navegação"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Ação de pesquisa"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Pesquisar"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Fale para pesquisar"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Fale para pesquisar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Reproduzir"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pausar"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Avançar"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Avançar %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Retroceder"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Retroceder %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Pular próxima"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Pular anterior"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Mais ações"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Desmarcar gostei"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Marcar gostei"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Desmarcar não gostei"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Marcar não gostei"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Não repetir"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repetir tudo"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repetir um item"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Ativar ordem aleatória"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Desativar ordem aleatória"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Ativar alta qualidade"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Desativar alta qualidade"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Ativar closed captioning"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Desativar closed captioning"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Entrar no modo Picture in Picture"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Os controles de mídia estão sendo exibidos"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Os controles de mídia estão ocultos. Pressione o botão direcional para exibi-los"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Concluir"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continuar"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Código de erro do MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"PRIMEIROS PASSOS"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Próxima"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ro/strings.xml b/leanback/leanback/src/main/res/values-ro/strings.xml
index 22055b3..c120f8f 100644
--- a/leanback/leanback/src/main/res/values-ro/strings.xml
+++ b/leanback/leanback/src/main/res/values-ro/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Meniu de navigare"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Acțiunea de căutare"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Căutați"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Rostiți pentru a căuta"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Căutați <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Rostiți pentru a căuta <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Redați"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Întrerupeți"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Derulați rapid înainte"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Derulați rapid înainte cu %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Derulați înapoi"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Derulați înapoi cu %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Ignorați articolul următor"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Ignorați articolul anterior"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Mai multe acțiuni"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Deselectați „Îmi place”"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Selectați „Îmi place”"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Deselectați „Nu îmi place”"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Selectați „Nu îmi place”"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Nu repetați"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Repetați toate"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Repetați unul"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Activați redarea în mod aleatoriu"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Dezactivați redarea în mod aleatoriu"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Activați calitatea înaltă"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Dezactivați calitatea înaltă"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Activați subtitrările"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Dezactivați subtitrările"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Activați modul Picture-in-Picture"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Comenzile media sunt afișate"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Comenzile media sunt ascunse. Apăsați pe butonul direcțional pentru a le afișa."</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Finalizați"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Continuați"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Cod de eroare MediaPlayer %1$d suplimentar %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ÎNCEPEȚI"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Înainte"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Meniu de navigare"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Acțiunea de căutare"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Căutați"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Rostiți pentru a căuta"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Căutați <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Rostiți pentru a căuta <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Redați"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Întrerupeți"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Derulați rapid înainte"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Derulați rapid înainte cu %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Derulați înapoi"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Derulați înapoi cu %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Ignorați articolul următor"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Ignorați articolul anterior"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Mai multe acțiuni"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Deselectați „Îmi place”"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Selectați „Îmi place”"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Deselectați „Nu îmi place”"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Selectați „Nu îmi place”"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Nu repetați"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Repetați toate"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Repetați unul"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Activați redarea în mod aleatoriu"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Dezactivați redarea în mod aleatoriu"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Activați calitatea înaltă"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Dezactivați calitatea înaltă"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Activați subtitrările"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Dezactivați subtitrările"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Activați modul Picture-in-Picture"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Comenzile media sunt afișate"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Comenzile media sunt ascunse. Apăsați pe butonul direcțional pentru a le afișa."</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Finalizați"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Continuați"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Cod de eroare MediaPlayer %1$d suplimentar %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ÎNCEPEȚI"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Înainte"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ru/strings.xml b/leanback/leanback/src/main/res/values-ru/strings.xml
index f04e062..50c9889 100644
--- a/leanback/leanback/src/main/res/values-ru/strings.xml
+++ b/leanback/leanback/src/main/res/values-ru/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Меню навигации"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Поиск"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Поиск"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Произнесите запрос"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Найти <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Произнесите запрос, чтобы найти <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Воспроизвести"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Пауза"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Перемотать вперед"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Перемотать вперед %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Перемотать назад"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Перемотать назад %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Перейти к следующему аудиофайлу"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Перейти к предыдущему аудиофайлу"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Дополнительно"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Снять отметку Нравится"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Поставить отметку Нравится"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Снять отметку Не нравится"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Поставить отметку Не нравится"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Не повторять"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Повторять все"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Повторять этот аудиофайл"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Включить перемешивание"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Отключить перемешивание"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Включить высокое качество"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Отключить высокое качество"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Включить субтитры"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Отключить субтитры"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Включить режим Картинка в картинке"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Элементы управления показаны"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Элементы управления скрыты. Чтобы открыть их, нажмите D-pad"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Готово"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Далее"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Код ошибки медиапроигрывателя: %1$d (дополнительный: %2$d)"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"НАЧАТЬ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Далее"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Меню навигации"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Поиск"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Поиск"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Произнесите запрос"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Найти <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Произнесите запрос, чтобы найти <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Воспроизвести"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Пауза"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Перемотать вперед"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Перемотать вперед %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Перемотать назад"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Перемотать назад %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Перейти к следующему аудиофайлу"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Перейти к предыдущему аудиофайлу"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Дополнительно"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Снять отметку Нравится"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Поставить отметку Нравится"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Снять отметку Не нравится"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Поставить отметку Не нравится"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Не повторять"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Повторять все"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Повторять этот аудиофайл"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Включить перемешивание"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Отключить перемешивание"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Включить высокое качество"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Отключить высокое качество"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Включить субтитры"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Отключить субтитры"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Включить режим Картинка в картинке"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Элементы управления показаны"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Элементы управления скрыты. Чтобы открыть их, нажмите D-pad"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Готово"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Далее"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Код ошибки медиапроигрывателя: %1$d (дополнительный: %2$d)"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"НАЧАТЬ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Далее"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-si/strings.xml b/leanback/leanback/src/main/res/values-si/strings.xml
index efb0307..08b87af 100644
--- a/leanback/leanback/src/main/res/values-si/strings.xml
+++ b/leanback/leanback/src/main/res/values-si/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"සංචාලන මෙනුව"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"සෙවීමේ ක්‍රියාව"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"සෙවීම"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"සෙවීමට කථා කරන්න"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> සොයන්න"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> සොයන්න කථා කරන්න"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"වාදනය"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"විරාම කරන්න"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"වේගයෙන් ඉදිරියට යන"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX වේගයෙන් ඉදිරියට යවන්න"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"ආපස්සට යවන්න"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX ආපස්සට යවන්න"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"ඊළඟ එක මග අරින්න"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"කළින් එක මග අරින්න"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"තව ක්‍රියාකාරකම්"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"මහපටැඟිල්ල ඉහළට තිබීම තේරීම නොකරන්න"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"මහපටැඟිල්ල ඉහළට තිබීම තේරීම කරන්න"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"මහපටැඟිල්ල පහළට තිබීම තේරීම නොකරන්න"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"මහපටැඟිල්ල පහළට තිබීම තේරීම කරන්න"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"නැවත කරන්න කිසිවක් නැත"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"සියල්ල නැවත කරන්න"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"එකක් නැවත කරන්න"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"ඇනීම සබල කරන්න"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"ඇනීම අබල කරන්න"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"උපරිම ගුණත්වය සබල කරන්න"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"උපරිම ගුණත්වය අබල කරන්න"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"වැසුණු ශිර්ෂ කිරීම සබල කරන ලදි"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"වැසුණු ශිර්ෂ කිරීම අබල කරන ලදි"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"පින්තූරය-තුළ-පින්තූරය ප්‍රකාරයට ඇතුළු වන්න"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"මාධ්‍ය පාලක පෙන්වා ඇත"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"මාධ්‍ය පාලක සඟවා ඇත, පෙන්වීමට ඩී-පෑඩ් ඔබන්න"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"අවසන් කරන්න"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"ඉදිරියට යන්න"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer දෝෂ කේතය %1$d අමතර %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"පටන් ගන්න"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"ඊළඟ"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"සංචාලන මෙනුව"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"සෙවීමේ ක්‍රියාව"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"සෙවීම"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"සෙවීමට කථා කරන්න"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> සොයන්න"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> සොයන්න කථා කරන්න"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"වාදනය"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"විරාම කරන්න"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"වේගයෙන් ඉදිරියට යන"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX වේගයෙන් ඉදිරියට යවන්න"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"ආපස්සට යවන්න"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX ආපස්සට යවන්න"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"ඊළඟ එක මග අරින්න"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"කළින් එක මග අරින්න"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"තව ක්‍රියාකාරකම්"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"මහපටැඟිල්ල ඉහළට තිබීම තේරීම නොකරන්න"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"මහපටැඟිල්ල ඉහළට තිබීම තේරීම කරන්න"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"මහපටැඟිල්ල පහළට තිබීම තේරීම නොකරන්න"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"මහපටැඟිල්ල පහළට තිබීම තේරීම කරන්න"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"නැවත කරන්න කිසිවක් නැත"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"සියල්ල නැවත කරන්න"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"එකක් නැවත කරන්න"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"ඇනීම සබල කරන්න"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"ඇනීම අබල කරන්න"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"උපරිම ගුණත්වය සබල කරන්න"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"උපරිම ගුණත්වය අබල කරන්න"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"වැසුණු ශිර්ෂ කිරීම සබල කරන ලදි"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"වැසුණු ශිර්ෂ කිරීම අබල කරන ලදි"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"පින්තූරය-තුළ-පින්තූරය ප්‍රකාරයට ඇතුළු වන්න"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"මාධ්‍ය පාලක පෙන්වා ඇත"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"මාධ්‍ය පාලක සඟවා ඇත, පෙන්වීමට ඩී-පෑඩ් ඔබන්න"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"අවසන් කරන්න"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"ඉදිරියට යන්න"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer දෝෂ කේතය %1$d අමතර %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"පටන් ගන්න"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"ඊළඟ"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-sk/strings.xml b/leanback/leanback/src/main/res/values-sk/strings.xml
index 7774f88..39a214e 100644
--- a/leanback/leanback/src/main/res/values-sk/strings.xml
+++ b/leanback/leanback/src/main/res/values-sk/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigačná ponuka"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Akcia vyhľadávania"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Hľadať"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Hovorením spustíte vyhľadávanie"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Vyhľadať výraz <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Vyslovením výrazu <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> spustíte jeho vyhľad."</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Prehrať"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pozastaviť"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Pretočiť dopredu"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Pretočiť dopredu %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Pretočiť späť"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Pretočiť späť %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Prejsť na ďalšiu položku"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Prejsť na predchádzajúcu položku"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Ďalšie akcie"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Zrušiť Páči sa mi"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Vybrať Páči sa mi"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Zrušiť Nepáči sa mi"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Vybrať Nepáči sa mi"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Neopakovať"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Opakovať všetko"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Opakovať jednu položku"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Zapnúť náhodné prehrávanie"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Vypnúť náhodné prehrávanie"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Povoliť médiá vo vysokej kvalite"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Zakázať médiá vo vysokej kvalite"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Zapnúť skryté titulky"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Vypnúť skryté titulky"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Prejsť do režimu obraz v obraze"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Ovládacie prvky médií sa zobrazujú"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Ovládacie prvky médií sú skryté, zobrazíte ich stlačením krížového ovládača"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Dokončiť"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Pokračovať"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Kód chyby MediaPlayer %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ZAČÍNAME"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Ďalej"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigačná ponuka"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Akcia vyhľadávania"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Hľadať"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Hovorením spustíte vyhľadávanie"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Vyhľadať výraz <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Vyslovením výrazu <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> spustíte jeho vyhľad."</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Prehrať"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pozastaviť"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Pretočiť dopredu"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Pretočiť dopredu %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Pretočiť späť"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Pretočiť späť %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Prejsť na ďalšiu položku"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Prejsť na predchádzajúcu položku"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Ďalšie akcie"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Zrušiť Páči sa mi"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Vybrať Páči sa mi"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Zrušiť Nepáči sa mi"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Vybrať Nepáči sa mi"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Neopakovať"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Opakovať všetko"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Opakovať jednu položku"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Zapnúť náhodné prehrávanie"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Vypnúť náhodné prehrávanie"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Povoliť médiá vo vysokej kvalite"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Zakázať médiá vo vysokej kvalite"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Zapnúť skryté titulky"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Vypnúť skryté titulky"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Prejsť do režimu obraz v obraze"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Ovládacie prvky médií sa zobrazujú"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Ovládacie prvky médií sú skryté, zobrazíte ich stlačením krížového ovládača"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Dokončiť"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Pokračovať"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Kód chyby MediaPlayer %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ZAČÍNAME"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Ďalej"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-sl/strings.xml b/leanback/leanback/src/main/res/values-sl/strings.xml
index a0ac300..dce31d3 100644
--- a/leanback/leanback/src/main/res/values-sl/strings.xml
+++ b/leanback/leanback/src/main/res/values-sl/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Meni za krmarjenje"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Dejanje iskanja"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Iskanje"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Izgovorite iskalno poizvedbo"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Iskanje: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Izgovorite poizvedbo za iskanje v <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$d-kratno"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$d-kratno"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Predvajaj"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Začasno ustavi"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Previj naprej"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Hitro previjanje naprej – %1$d-kratno"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Previj nazaj"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Previjanje nazaj – %1$d-kratno"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Preskoči na naslednjega"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Preskoči na prejšnjega"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Več dejanj"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Prekliči izbor palca gor"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Izberi palec gor"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Prekliči izbor palca dol"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Izberi palec dol"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Brez ponavljanja"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Ponovi vse"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Ponovi eno"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Omogoči naključno predvajanje"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Onemogoči naključno predvajanje"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Omogoči visoko kakovost"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Onemogoči visoko kakovost"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Omogoči podnapise"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Onemogoči podnapise"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Vklop načina za sliko v sliki"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Kontrolniki predstavnosti so prikazani"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Kontrolniki predstavnosti so skriti, za prikaz pritisnite smerni gumb"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Dokončaj"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Nadaljuj"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Koda napake MediaPlayerja: %1$d, dodatno %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ZAČNITE"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Naprej"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Meni za krmarjenje"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Dejanje iskanja"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Iskanje"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Izgovorite iskalno poizvedbo"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Iskanje: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Izgovorite poizvedbo za iskanje v <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$d-kratno"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$d-kratno"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Predvajaj"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Začasno ustavi"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Previj naprej"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Hitro previjanje naprej – %1$d-kratno"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Previj nazaj"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Previjanje nazaj – %1$d-kratno"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Preskoči na naslednjega"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Preskoči na prejšnjega"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Več dejanj"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Prekliči izbor palca gor"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Izberi palec gor"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Prekliči izbor palca dol"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Izberi palec dol"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Brez ponavljanja"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Ponovi vse"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Ponovi eno"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Omogoči naključno predvajanje"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Onemogoči naključno predvajanje"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Omogoči visoko kakovost"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Onemogoči visoko kakovost"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Omogoči podnapise"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Onemogoči podnapise"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Vklop načina za sliko v sliki"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Kontrolniki predstavnosti so prikazani"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Kontrolniki predstavnosti so skriti, za prikaz pritisnite smerni gumb"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Dokončaj"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Nadaljuj"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Koda napake MediaPlayerja: %1$d, dodatno %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ZAČNITE"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Naprej"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-sq/strings.xml b/leanback/leanback/src/main/res/values-sq/strings.xml
index 00b42ad..bcfdd81 100644
--- a/leanback/leanback/src/main/res/values-sq/strings.xml
+++ b/leanback/leanback/src/main/res/values-sq/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menyja e navigimit"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Veprimi i kërkimit"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Kërko"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Fol për të kërkuar"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Kërko për <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Fol për të kërkuar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Luaj"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pauzë"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Përparo me shpejtësi"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Përparo me shpejtësi %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Rikthe"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Kthe në fillim %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Kapërce për te tjetra"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Kapërce të mëparshmin"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Veprime të tjera"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Hiq nga përzgjedhja \"Gishti lart\""</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Përzgjidh \"Gishtin sipër\""</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Hiq nga përzgjedhja \"Gishti poshtë\""</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Përzgjidh \"Gishtin poshtë\""</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Mos përsërit asnjë"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Përsërit të gjitha"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Përsërit një"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Aktivizo përzierjen"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Çaktivizo përzierjen"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Aktivizo \"Cilësinë e lartë\""</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Çaktivizo \"Cilësinë e lartë\""</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Aktivizo titrat"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Çaktivizo titrat me sekuencë kohore"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Aktivizo modalitetin e figurës brenda figurës"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Kontrollet e medias të shfaqura"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Kontrollet e medias të fshehura, shtyp bllokun e drejtimit për t\'i shfaqur"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Përfundo"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Vazhdo"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Kodi i gabimit i MediaPlayer %1$d shtesa %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"FILLO"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Para"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menyja e navigimit"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Veprimi i kërkimit"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Kërko"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Fol për të kërkuar"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Kërko për <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Fol për të kërkuar <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Luaj"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pauzë"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Përparo me shpejtësi"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Përparo me shpejtësi %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Rikthe"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Kthe në fillim %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Kapërce për te tjetra"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Kapërce të mëparshmin"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Veprime të tjera"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Hiq nga përzgjedhja \"Gishti lart\""</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Përzgjidh \"Gishtin sipër\""</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Hiq nga përzgjedhja \"Gishti poshtë\""</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Përzgjidh \"Gishtin poshtë\""</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Mos përsërit asnjë"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Përsërit të gjitha"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Përsërit një"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Aktivizo përzierjen"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Çaktivizo përzierjen"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Aktivizo \"Cilësinë e lartë\""</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Çaktivizo \"Cilësinë e lartë\""</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Aktivizo titrat"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Çaktivizo titrat me sekuencë kohore"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Aktivizo modalitetin e figurës brenda figurës"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Kontrollet e medias të shfaqura"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Kontrollet e medias të fshehura, shtyp bllokun e drejtimit për t\'i shfaqur"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Përfundo"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Vazhdo"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Kodi i gabimit i MediaPlayer %1$d shtesa %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"FILLO"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Para"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-sr/strings.xml b/leanback/leanback/src/main/res/values-sr/strings.xml
index 5a64fca..6f01202 100644
--- a/leanback/leanback/src/main/res/values-sr/strings.xml
+++ b/leanback/leanback/src/main/res/values-sr/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Мени за навигацију"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Радња претраге"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Претражите"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Изговорите да бисте претраживали"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Претражите <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Изговорите да бисте претражили <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Пусти"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Паузирај"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Премотај унапред"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Премотај унапред %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Премотај уназад"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Премотај уназад %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Прескочи на следеће"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Прескочи на претходно"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Још радњи"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Опозови избор „Свиђа ми се“"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Изабери „Свиђа ми се“"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Опозови избор „Не свиђа ми се“"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Изабери „Не свиђа ми се“"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Не понављај ниједну"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Понови све"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Понови једну"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Омогући насумично пуштање"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Онемогући насумично пуштање"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Омогући висок квалитет"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Онемогући висок квалитет"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Омогући титлове"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Онемогући титлове"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Уђи у режим Слика у слици"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Контроле за медије су приказане"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Контроле за медије су скривене, притисните d-pad да бисте их приказали"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Заврши"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Настави"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Кôд грешке MediaPlayer-а: %1$d, додатно %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ЗАПОЧНИТЕ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Даље"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Мени за навигацију"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Радња претраге"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Претражите"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Изговорите да бисте претраживали"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Претражите <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Изговорите да бисте претражили <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Пусти"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Паузирај"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Премотај унапред"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Премотај унапред %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Премотај уназад"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Премотај уназад %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Прескочи на следеће"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Прескочи на претходно"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Још радњи"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Опозови избор „Свиђа ми се“"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Изабери „Свиђа ми се“"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Опозови избор „Не свиђа ми се“"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Изабери „Не свиђа ми се“"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Не понављај ниједну"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Понови све"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Понови једну"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Омогући насумично пуштање"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Онемогући насумично пуштање"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Омогући висок квалитет"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Онемогући висок квалитет"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Омогући титлове"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Онемогући титлове"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Уђи у режим Слика у слици"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Контроле за медије су приказане"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Контроле за медије су скривене, притисните d-pad да бисте их приказали"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Заврши"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Настави"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Кôд грешке MediaPlayer-а: %1$d, додатно %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ЗАПОЧНИТЕ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Даље"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-sv/strings.xml b/leanback/leanback/src/main/res/values-sv/strings.xml
index 38c8112..7222f6c 100644
--- a/leanback/leanback/src/main/res/values-sv/strings.xml
+++ b/leanback/leanback/src/main/res/values-sv/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigeringsmeny"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Sökåtgärd"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Sök"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Säg det du söker efter"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Sök i <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Tala för att söka i <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Spela upp"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pausa"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Snabbspola framåt"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Spola framåt %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Spola tillbaka"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Spola tillbaka %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Hoppa till nästa"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Hoppa till föregående"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Fler åtgärder"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Avmarkera tummen upp"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Markera tummen upp"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Avmarkera tummen ned"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Markera tummen ned"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Upprepa inga"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Upprepa alla"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Upprepa en"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Blanda spår"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Blanda inte spår"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Aktivera hög kvalitet"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Inaktivera hög kvalitet"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Aktivera textning"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Inaktivera textning"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Aktivera läget Bild-i-bild"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Mediakontrollerna visas"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Mediakontrollerna är dolda och visas om du trycker på styrkorset"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Slutför"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Fortsätt"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Felkod %1$d för MediaPlayer, extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"KOM IGÅNG"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Nästa"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigeringsmeny"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Sökåtgärd"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Sök"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Säg det du söker efter"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Sök: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Tala för att söka: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Spela upp"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pausa"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Snabbspola framåt"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Spola framåt %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Spola tillbaka"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Spola tillbaka %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Hoppa till nästa"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Hoppa till föregående"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Fler åtgärder"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Avmarkera tummen upp"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Markera tummen upp"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Avmarkera tummen ned"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Markera tummen ned"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Upprepa inga"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Upprepa alla"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Upprepa en"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Blanda spår"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Blanda inte spår"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Aktivera hög kvalitet"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Inaktivera hög kvalitet"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Aktivera textning"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Inaktivera textning"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Aktivera läget Bild-i-bild"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Mediakontrollerna visas"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Mediakontrollerna är dolda och visas om du trycker på styrkorset"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Slutför"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Fortsätt"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Felkod %1$d för MediaPlayer, extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"KOM IGÅNG"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Nästa"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-sw/strings.xml b/leanback/leanback/src/main/res/values-sw/strings.xml
index 167a9b6..83d530e 100644
--- a/leanback/leanback/src/main/res/values-sw/strings.xml
+++ b/leanback/leanback/src/main/res/values-sw/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menyu ya kusogeza"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Kitendo cha Kutafuta"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Tafuta"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Tamka ili utafute"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Tafuta <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Tamka ili utafute <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"X%1$d"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"X%1$d"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Cheza"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Sitisha"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Sogeza Mbele Haraka"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Sogeza Mbele X%1$d"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Rudisha nyuma"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Rudisha nyuma X%1$d"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Nenda kwenye Inayofuata"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Nenda kwenye Iliyotangulia"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Vitendo zaidi"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Acha Kuchagua \'Bomba\'"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Chagua \'Bomba\'"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Acha kuchagua \'Hainipendezi\'"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Chagua \'Hainipendezi\'"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Usirudie Yoyote"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Rudia Zote"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Rudia Moja"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Washa Kipengele cha Kuchanganya"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Zima Kipengele cha Kuchanganya"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Washa Ubora wa Juu"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Zima Ubora wa Juu"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Washa Manukuu"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Zima Manukuu"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Weka Hali ya Picha ndani ya Picha"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Inaonyesha udhibiti wa maudhui"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Imeficha udhibiti wa maudhui, bonyeza d-pad ili uuonyeshe"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Maliza"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Endelea"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Msimbo wa hitilafu wa Kichezaji Maudhui %1$d %2$d za ziada"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ANZA"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Endelea"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menyu ya kusogeza"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Kitendo cha Kutafuta"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Tafuta"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Tamka ili utafute"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Tafuta <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Tamka ili utafute <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"X%1$d"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"X%1$d"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Cheza"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Sitisha"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Sogeza Mbele Haraka"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Sogeza Mbele X%1$d"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Rudisha nyuma"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Rudisha nyuma X%1$d"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Nenda kwenye Inayofuata"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Nenda kwenye Iliyotangulia"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Vitendo zaidi"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Acha Kuchagua \'Bomba\'"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Chagua \'Bomba\'"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Acha kuchagua \'Hainipendezi\'"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Chagua \'Hainipendezi\'"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Usirudie Yoyote"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Rudia Zote"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Rudia Moja"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Washa Kipengele cha Kuchanganya"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Zima Kipengele cha Kuchanganya"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Washa Ubora wa Juu"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Zima Ubora wa Juu"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Washa Manukuu"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Zima Manukuu"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Weka Hali ya Picha ndani ya Picha"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Inaonyesha udhibiti wa maudhui"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Imeficha udhibiti wa maudhui, bonyeza d-pad ili uuonyeshe"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Maliza"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Endelea"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Msimbo wa hitilafu wa Kichezaji Maudhui %1$d %2$d za ziada"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ANZA"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Endelea"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ta/strings.xml b/leanback/leanback/src/main/res/values-ta/strings.xml
index d0b2641..d4b6f5e 100644
--- a/leanback/leanback/src/main/res/values-ta/strings.xml
+++ b/leanback/leanback/src/main/res/values-ta/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"வழிசெலுத்தல் மெனு"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"தேடல் செயல்"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"தேடுக"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"தேட, பேசவும்"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ஐத் தேடுக"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ஐத் தேட, பேசவும்"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"இயக்கு"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"இடைநிறுத்து"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"வேகமாக முன்செல்"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX வேகத்தில் முன்செல்"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"பின்செல்"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX வேகத்தில் பின்செல்"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"அடுத்ததைத் தவிர்"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"முந்தையதைத் தவிர்"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"மேலும் செயல்கள்"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"பிடித்திருக்கிறது என்பதைத் தேர்வுநீக்கு"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"பிடித்திருக்கிறது என்பதைத் தேர்ந்தெடு"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"பிடிக்கவில்லை என்பதைத் தேர்வுநீக்கு"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"பிடிக்கவில்லை என்பதைத் தேர்ந்தெடு"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"எதையும் மீண்டும் இயக்காதே"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"அனைத்தையும் மீண்டும் இயக்கு"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"ஒன்றை மட்டும் மீண்டும் இயக்கு"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"வரிசை மாற்றி இயக்கு"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"வரிசை மாற்றி இயக்குவதை நிறுத்து"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"உயர்தரத்தை இயக்கு"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"உயர்தரத்தை முடக்கு"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"விரிவான வசனங்களை இயக்கு"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"விரிவான வசனங்களை முடக்கு"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"பிக்ச்சர்-இன்-பிக்ச்சர் பயன்முறைக்குச் செல்"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"மீடியா கட்டுப்பாடுகள் காட்டப்படுகின்றன"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"மீடியா கட்டுப்பாடுகள் மறைக்கப்பட்டுள்ளன. கட்டுப்பாடுகளைக் காட்ட, டி பேடை அழுத்தவும்"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"முடி"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"தொடர்க"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer பிழைக் குறியீடு: %1$d கூடுதல் குறியீடு %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"தொடங்குக"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"அடுத்த பக்கத்திற்குச் செல்லும்"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"வழிசெலுத்தல் மெனு"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"தேடல் செயல்"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"தேடுக"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"தேட, பேசவும்"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ஐத் தேடுக"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ஐத் தேட, பேசவும்"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"இயக்கு"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"இடைநிறுத்து"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"வேகமாக முன்செல்"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX வேகத்தில் முன்செல்"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"பின்செல்"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX வேகத்தில் பின்செல்"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"அடுத்ததைத் தவிர்"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"முந்தையதைத் தவிர்"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"மேலும் செயல்கள்"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"பிடித்திருக்கிறது என்பதைத் தேர்வுநீக்கு"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"பிடித்திருக்கிறது என்பதைத் தேர்ந்தெடு"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"பிடிக்கவில்லை என்பதைத் தேர்வுநீக்கு"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"பிடிக்கவில்லை என்பதைத் தேர்ந்தெடு"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"எதையும் மீண்டும் இயக்காதே"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"அனைத்தையும் மீண்டும் இயக்கு"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"ஒன்றை மட்டும் மீண்டும் இயக்கு"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"வரிசை மாற்றி இயக்கு"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"வரிசை மாற்றி இயக்குவதை நிறுத்து"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"உயர்தரத்தை இயக்கு"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"உயர்தரத்தை முடக்கு"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"விரிவான வசனங்களை இயக்கு"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"விரிவான வசனங்களை முடக்கு"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"பிக்ச்சர்-இன்-பிக்ச்சர் பயன்முறைக்குச் செல்"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"மீடியா கட்டுப்பாடுகள் காட்டப்படுகின்றன"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"மீடியா கட்டுப்பாடுகள் மறைக்கப்பட்டுள்ளன. கட்டுப்பாடுகளைக் காட்ட, டி பேடை அழுத்தவும்"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"முடி"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"தொடர்க"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer பிழைக் குறியீடு: %1$d கூடுதல் குறியீடு %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"தொடங்குக"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"அடுத்த பக்கத்திற்குச் செல்லும்"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-te/strings.xml b/leanback/leanback/src/main/res/values-te/strings.xml
index e4ee49e6..ef217d8 100644
--- a/leanback/leanback/src/main/res/values-te/strings.xml
+++ b/leanback/leanback/src/main/res/values-te/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"నావిగేషన్ మెను"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"శోధన చర్య"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"శోధన"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"శోధించడానికి మాటల ద్వారా చెప్పండి"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ని శోధించండి"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>లో శోధించడానికి మాటల ద్వారా చెప్పండి"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"ప్లే చేయి"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"పాజ్ చేయి"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"వేగంగా ఫార్వార్డ్ చేయి"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX ఫాస్ట్ ఫార్వార్డ్ చేయి"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"రివైండ్ చేయి"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX రివైండ్ చేయి"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"తదుపరి దానికి దాటవేయి"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"మునుపటి దానికి దాటవేయి"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"మరిన్ని చర్యలు"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"బాగుంది సంకేతాన్ని తీసివేయి"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"బాగుంది సంకేతాన్ని ఎంపిక చేయి"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"బాగాలేదు సంకేతాన్ని తీసివేయి"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"బాగాలేదు సంకేతాన్ని ఎంపిక చేయి"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"ఏదీ పునరావృతం చేయవద్దు"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"అన్నీ పునరావృతం చేయి"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"ఒకదాన్ని పునరావృతం చేయి"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"షఫుల్ చేయడాన్ని ప్రారంభించు"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"షఫుల్ చేయడాన్ని నిలిపివేయి"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"అధిక నాణ్యతను ప్రారంభించు"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"అధిక నాణ్యతను నిలిపివేయి"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"మూసివేసిన శీర్షికలను ప్రారంభించు"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"మూసివేసిన శీర్షికలను నిలిపివేయి"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"చిత్రంలో చిత్రం మోడ్‌లోకి ప్రవేశించు"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"మీడియా నియంత్రణలు చూపబడ్డాయి"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"మీడియా నియంత్రణలు దాచబడ్డాయి, చూపించడానికి d-ప్యాడ్ నొక్కండి"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"ముగించండి"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"కొనసాగించండి"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer ఎర్రర్ కోడ్ %1$d అదనంగా %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ప్రారంభించు"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"తర్వాత"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"నావిగేషన్ మెను"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"శోధన చర్య"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"శోధన"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"శోధించడానికి మాటల ద్వారా చెప్పండి"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>ని శోధించండి"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>లో శోధించడానికి మాటల ద్వారా చెప్పండి"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"ప్లే చేయి"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"పాజ్ చేయి"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"వేగంగా ఫార్వార్డ్ చేయి"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX ఫాస్ట్ ఫార్వార్డ్ చేయి"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"రివైండ్ చేయి"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX రివైండ్ చేయి"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"తదుపరి దానికి దాటవేయి"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"మునుపటి దానికి దాటవేయి"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"మరిన్ని చర్యలు"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"బాగుంది సంకేతాన్ని తీసివేయి"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"బాగుంది సంకేతాన్ని ఎంపిక చేయి"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"బాగాలేదు సంకేతాన్ని తీసివేయి"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"బాగాలేదు సంకేతాన్ని ఎంపిక చేయి"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"ఏదీ పునరావృతం చేయవద్దు"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"అన్నీ పునరావృతం చేయి"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"ఒకదాన్ని పునరావృతం చేయి"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"షఫుల్ చేయడాన్ని ప్రారంభించు"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"షఫుల్ చేయడాన్ని నిలిపివేయి"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"అధిక నాణ్యతను ప్రారంభించు"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"అధిక నాణ్యతను నిలిపివేయి"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"మూసివేసిన శీర్షికలను ప్రారంభించు"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"మూసివేసిన శీర్షికలను నిలిపివేయి"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"చిత్రంలో చిత్రం మోడ్‌లోకి ప్రవేశించు"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"మీడియా నియంత్రణలు చూపబడ్డాయి"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"మీడియా నియంత్రణలు దాచబడ్డాయి, చూపించడానికి d-ప్యాడ్ నొక్కండి"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"ముగించండి"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"కొనసాగించండి"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer ఎర్రర్ కోడ్ %1$d అదనంగా %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ప్రారంభించు"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"తర్వాత"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-th/strings.xml b/leanback/leanback/src/main/res/values-th/strings.xml
index b90381c..5092abf1 100644
--- a/leanback/leanback/src/main/res/values-th/strings.xml
+++ b/leanback/leanback/src/main/res/values-th/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"เมนูการนำทาง"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"การดำเนินการค้นหา"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"ค้นหา"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"พูดเพื่อค้นหา"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"ค้นหา <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"พูดเพื่อค้นหา <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"เล่น"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"หยุดชั่วคราว"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"กรอไปข้างหน้า"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"กรอไปข้างหน้า %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"กรอกลับ"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"กรอกลับ %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"ข้ามไปรายการถัดไป"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"ข้ามไปรายการก่อนหน้า"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"การดำเนินการเพิ่มเติม"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"ยกเลิกการเลือกว่าชอบ"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"เลือกว่าชอบ"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"ยกเลิกการเลือกว่าไม่ชอบ"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"เลือกว่าไม่ชอบ"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"ไม่เล่นซ้ำ"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"เล่นซ้ำทั้งหมด"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"เล่นซ้ำรายการเดียว"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"เปิดใช้การสุ่มเพลง"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"ปิดใช้การสุ่มเพลง"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"เปิดใช้คุณภาพสูง"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"ปิดใช้คุณภาพสูง"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"เปิดใช้คำอธิบายภาพ"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"ปิดใช้คำอธิบายภาพ"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"เข้าสู่โหมดการแสดงภาพซ้อนภาพ"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"แสดงการควบคุมสื่ออยู่"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"ซ่อนการควบคุมสื่ออยู่ กด D-pad เพื่อแสดง"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"เสร็จสิ้น"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"ต่อไป"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"รหัสข้อผิดพลาด MediaPlayer %1$d เพิ่มเติม %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"เริ่มต้น"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"ถัดไป"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"เมนูการนำทาง"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"การดำเนินการค้นหา"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"ค้นหา"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"พูดเพื่อค้นหา"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"ค้นหา <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"พูดเพื่อค้นหา <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"เล่น"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"หยุดชั่วคราว"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"กรอไปข้างหน้า"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"กรอไปข้างหน้า %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"กรอกลับ"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"กรอกลับ %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"ข้ามไปรายการถัดไป"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"ข้ามไปรายการก่อนหน้า"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"การดำเนินการเพิ่มเติม"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"ยกเลิกการเลือกว่าชอบ"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"เลือกว่าชอบ"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"ยกเลิกการเลือกว่าไม่ชอบ"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"เลือกว่าไม่ชอบ"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"ไม่เล่นซ้ำ"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"เล่นซ้ำทั้งหมด"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"เล่นซ้ำรายการเดียว"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"เปิดใช้การสุ่มเพลง"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"ปิดใช้การสุ่มเพลง"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"เปิดใช้คุณภาพสูง"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"ปิดใช้คุณภาพสูง"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"เปิดใช้คำอธิบายภาพ"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"ปิดใช้คำอธิบายภาพ"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"เข้าสู่โหมดการแสดงภาพซ้อนภาพ"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"แสดงการควบคุมสื่ออยู่"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"ซ่อนการควบคุมสื่ออยู่ กด D-pad เพื่อแสดง"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"เสร็จสิ้น"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"ต่อไป"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"รหัสข้อผิดพลาด MediaPlayer %1$d เพิ่มเติม %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"เริ่มต้น"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"ถัดไป"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-tl/strings.xml b/leanback/leanback/src/main/res/values-tl/strings.xml
index 8396af8..c274216 100644
--- a/leanback/leanback/src/main/res/values-tl/strings.xml
+++ b/leanback/leanback/src/main/res/values-tl/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu sa pag-navigate"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Pagkilos sa Paghahanap"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Maghanap"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Magsalita upang maghanap"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Hanapin ang <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Magsalita upang hanapin ang <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"I-play"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"I-pause"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"I-fast Forward"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"I-fast Forward nang %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"I-rewind"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"I-rewind nang %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Laktawan ang Susunod"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Laktawan ang Nakaraan"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Mas Marami Pang Pagkilos"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Alisin sa Pagkakapili ang Thumb Up"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Piliin ang Thumb Up"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Alisin sa Pagkakapili ang Thumb Down"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Piliin ang Thumb Down"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Walang Uulitin"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Ulitin Lahat"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Ulitin ang Isa"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"I-enable ang Pag-shuffle"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"I-disable ang Pag-shuffle"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"I-enable ang Mataas na Kalidad"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"I-disable ang Mataas na Kalidad"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"I-enable ang Closed Captioning"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"I-disable ang Closed Captioning"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Pumasok sa Picture-In-Picture Mode"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Ipinapakita ang mga kontrol ng media"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Nakatago ang mga kontrol ng media, pindutin ang d-pad upang ipakita"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Tapusin"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Magpatuloy"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Code ng error na %1$d ng MediaPlayer na may extra na %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"MAGSIMULA"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Susunod"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu sa pag-navigate"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Pagkilos sa Paghahanap"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Maghanap"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Magsalita upang maghanap"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Hanapin ang <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Magsalita para hanapin ang <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"I-play"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"I-pause"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"I-fast Forward"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"I-fast Forward nang %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"I-rewind"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"I-rewind nang %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Laktawan ang Susunod"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Laktawan ang Nakaraan"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Mas Marami Pang Pagkilos"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Alisin sa Pagkakapili ang Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Piliin ang Thumb Up"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Alisin sa Pagkakapili ang Thumb Down"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Piliin ang Thumb Down"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Walang Uulitin"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Ulitin Lahat"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Ulitin ang Isa"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"I-enable ang Pag-shuffle"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"I-disable ang Pag-shuffle"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"I-enable ang Mataas na Kalidad"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"I-disable ang Mataas na Kalidad"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"I-enable ang Closed Captioning"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"I-disable ang Closed Captioning"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Pumasok sa Picture-In-Picture Mode"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Ipinapakita ang mga kontrol ng media"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Nakatago ang mga kontrol ng media, pindutin ang d-pad upang ipakita"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Tapusin"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Magpatuloy"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Code ng error na %1$d ng MediaPlayer na may extra na %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"MAGSIMULA"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Susunod"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-tr/strings.xml b/leanback/leanback/src/main/res/values-tr/strings.xml
index ec3dee7..d3c24003 100644
--- a/leanback/leanback/src/main/res/values-tr/strings.xml
+++ b/leanback/leanback/src/main/res/values-tr/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Gezinme menüsü"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Arama İşlemi"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Arama yapın"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Arama yapmak için konuşun"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> araması yapın"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> araması yapmak için konuşun"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Oynat"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Duraklat"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"İleri Sar"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX İleri Sar"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Geri Sar"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX Geri Sar"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Sonrakine Atla"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Öncekine Atla"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Diğer İşlemler"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Beğenme Seçimini Kaldır"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Beğenmeyi Seç"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Beğenmeme Seçimini Kaldır"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Beğenmemeyi Seç"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Hiçbirini Tekrarlama"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Tümünü Tekrarla"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Birini Tekrarla"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Karıştırmayı Etkinleştir"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Karıştırmayı Devre Dışı Bırak"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Yüksek Kalitede Oynatmayı Etkinleştir"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Yüksek Kalitede Oynatmayı Devre Dışı Bırak"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Altyazıları Etkinleştir"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Altyazıları Devre Dışı Bırak"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Pencere İçinde Pencere Moduna Geç"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Medya denetimleri gösteriliyor"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Medya denetimleri gizli durumda. Görüntülemek için d-pad\'e basın."</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Son"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Devam"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer hata kodu %1$d ekstra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"BAŞLA"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Sonraki"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Gezinme menüsü"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Arama İşlemi"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Arama yapın"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Arama yapmak için konuşun"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> araması yapın"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> araması yapmak için konuşun"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Oynat"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Duraklat"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"İleri Sar"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX İleri Sar"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Geri Sar"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX Geri Sar"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Sonrakine Atla"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Öncekine Atla"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Diğer İşlemler"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Beğenme Seçimini Kaldır"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Beğenmeyi Seç"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Beğenmeme Seçimini Kaldır"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Beğenmemeyi Seç"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Hiçbirini Tekrarlama"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Tümünü Tekrarla"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Birini Tekrarla"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Karıştırmayı Etkinleştir"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Karıştırmayı Devre Dışı Bırak"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Yüksek Kalitede Oynatmayı Etkinleştir"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Yüksek Kalitede Oynatmayı Devre Dışı Bırak"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Altyazıları Etkinleştir"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Altyazıları Devre Dışı Bırak"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Pencere İçinde Pencere Moduna Geç"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Medya denetimleri gösteriliyor"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Medya denetimleri gizli durumda. Görüntülemek için d-pad\'e basın."</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Son"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Devam"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer hata kodu %1$d ekstra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"BAŞLA"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Sonraki"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-uk/strings.xml b/leanback/leanback/src/main/res/values-uk/strings.xml
index ce472f4..2551091 100644
--- a/leanback/leanback/src/main/res/values-uk/strings.xml
+++ b/leanback/leanback/src/main/res/values-uk/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Меню навігації"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Команда пошуку"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Пошук"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Продиктуйте пошуковий запит"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Шукати: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Продиктуйте, щоб шукати: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Відтворити"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Призупинити"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Перемотати вперед"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Перемотати вперед – %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Перемотати назад"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Перемотати назад – %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Пропустити наступний елемент"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Пропустити попередній елемент"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Більше команд"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Не вибирати оцінку \"Подобається\""</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Вибрати оцінку \"Подобається\""</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Не вибирати оцінку \"Не подобається\""</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Вибрати оцінку \"Не подобається\""</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Не повторювати"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Повторити все"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Повторити один елемент"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Увімкнути перемішування"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Вимкнути перемішування"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Увімкнути високу якість"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Вимкнути високу якість"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Увімкнути субтитри"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Вимкнути субтитри"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Перейти в режим \"Картинка в картинці\""</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Елементи керування медіа показано"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Елементи керування медіа сховано. Натисніть цифрову панель, щоб показати їх"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Готово"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Продовжити"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Код помилки MediaPlayer: %1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"ПОЧАТИ"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Далі"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Меню навігації"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Команда пошуку"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Пошук"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Продиктуйте пошуковий запит"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Шукати: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Продиктуйте, щоб шукати: <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Відтворити"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Призупинити"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Перемотати вперед"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Перемотати вперед – %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Перемотати назад"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Перемотати назад – %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Пропустити наступний елемент"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Пропустити попередній елемент"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Більше команд"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Не вибирати оцінку \"Подобається\""</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Вибрати оцінку \"Подобається\""</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Не вибирати оцінку \"Не подобається\""</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Вибрати оцінку \"Не подобається\""</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Не повторювати"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Повторити все"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Повторити один елемент"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Увімкнути перемішування"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Вимкнути перемішування"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Увімкнути високу якість"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Вимкнути високу якість"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Увімкнути субтитри"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Вимкнути субтитри"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Перейти в режим \"Картинка в картинці\""</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Елементи керування медіа показано"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Елементи керування медіа сховано. Натисніть цифрову панель, щоб показати їх"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Готово"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Продовжити"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Код помилки MediaPlayer: %1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"ПОЧАТИ"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Далі"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-ur/strings.xml b/leanback/leanback/src/main/res/values-ur/strings.xml
index 74bec7c..edf8f80 100644
--- a/leanback/leanback/src/main/res/values-ur/strings.xml
+++ b/leanback/leanback/src/main/res/values-ur/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"نیویگیشن مینو"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"تلاش کی کارروائی"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"تلاش کریں"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"تلاش کرنے کیلئے بولیں"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> تلاش کریں"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> تلاش کرنے کیلئے بولیں"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"چلائیں"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"موقوف کریں"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"تیزی سے فارورڈ کریں"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"‏تیزی سے فارورڈ کریں ‎%1$dX‎"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"ریوائینڈ کریں"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"‏ریوائینڈ کریں ‎%1$dX‎"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"اگلے پر جائیں"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"پچھلے پر جائیں"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"مزید کارروائیاں"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"اوپر کی طرف والے انگوٹھے کے نشان کو غیر منتخب کریں"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"اوپر کی طرف والے انگوٹھے کے نشان کو منتخب کریں"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"نیچے کی طرف والے انگوٹھے کے نشان کو غیر منتخب کریں"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"نیچے کی طرف والے انگوٹھے کے نشان کو منتخب کریں"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"کسی کو نہ دہرائیں"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"سبھی کو دہرائیں"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"ایک کو دہرائیں"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"شفل فعال کریں"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"شفل غیر فعال کریں"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"اعلی معیار فعال کریں"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"اعلی معیار غیر فعال کریں"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"سب ٹائٹلز فعال کریں"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"سب ٹائٹلز غیر فعال کریں"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"\'تصویر میں تصویر موڈ\' میں داخل ہوں"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"میڈیا کنٹرولز عیاں ہیں"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"‏میڈیا کنٹرولز مخفی ہیں، دکھانے کیلئے d-pad دبائیں"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"مکمل کریں"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"جاری رکھیں"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"‏MediaPlayer کی خرابی کا کوڈ %1$d اضافی %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"شروع کریں"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"آگے"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"نیویگیشن مینو"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"تلاش کی کارروائی"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"تلاش کریں"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"تلاش کرنے کیلئے بولیں"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> تلاش کریں"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> تلاش کرنے کیلئے بولیں"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"چلائیں"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"موقوف کریں"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"تیزی سے فارورڈ کریں"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"‏تیزی سے فارورڈ کریں ‎%1$dX‎"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"ریوائینڈ کریں"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"‏ریوائینڈ کریں ‎%1$dX‎"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"اگلے پر جائیں"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"پچھلے پر جائیں"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"مزید کارروائیاں"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"اوپر کی طرف والے انگوٹھے کے نشان کو غیر منتخب کریں"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"اوپر کی طرف والے انگوٹھے کے نشان کو منتخب کریں"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"نیچے کی طرف والے انگوٹھے کے نشان کو غیر منتخب کریں"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"نیچے کی طرف والے انگوٹھے کے نشان کو منتخب کریں"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"کسی کو نہ دہرائیں"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"سبھی کو دہرائیں"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"ایک کو دہرائیں"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"شفل فعال کریں"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"شفل غیر فعال کریں"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"اعلی معیار فعال کریں"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"اعلی معیار غیر فعال کریں"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"سب ٹائٹلز فعال کریں"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"سب ٹائٹلز غیر فعال کریں"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"\'تصویر میں تصویر موڈ\' میں داخل ہوں"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"میڈیا کنٹرولز عیاں ہیں"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"‏میڈیا کنٹرولز مخفی ہیں، دکھانے کیلئے d-pad دبائیں"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"مکمل کریں"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"جاری رکھیں"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"‏MediaPlayer کی خرابی کا کوڈ %1$d اضافی %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"شروع کریں"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"آگے"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-uz/strings.xml b/leanback/leanback/src/main/res/values-uz/strings.xml
index 95e0b67..53480a2 100644
--- a/leanback/leanback/src/main/res/values-uz/strings.xml
+++ b/leanback/leanback/src/main/res/values-uz/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Navigatsiya menyusi"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Qidiruv amali"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Qidiruv"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Qidirish uchun gapiring"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ichidan qidirish"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ichidan qidirish uchun gapiring"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Ijro"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Pauza"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Oldinga o‘tkazish"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$dX tezlikda oldinga o‘tkazish"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Orqaga qaytarish"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$dX tezlikda orqaga qaytarish"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Keyingisiga o‘tish"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Avvalgisiga qaytish"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Boshqa amallar"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Ijobiy baho tanlovini bekor qilish"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Ijobiy bahoni tanlash"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Salbiy baho tanlovini bekor qilish"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Salbiy bahoni tanlash"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Takrorlamaslik"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Hammasini takrorlash"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Bir marta takrorlash"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Aralashtirish funksiyasini yoqish"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Aralashtirmaslik"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Yuqori sifatni yoqish"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Yuqori sifatda ijro qilmaslik"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Taglavhalarni yoqish"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Taglavhalarni chiqarmaslik"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Tasvir ustida tasvir rejimiga kirish"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Boshqaruv elementlari ochiq"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Boshqaruv elementlari berkitilgan, ochish uchun D-pad tugmasini bosing"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Tayyor"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Keyingisi"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Media pleyer xatoligi kodi: %1$d (yana: %2$d)"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"BOSHLASH"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Keyingisi"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Navigatsiya menyusi"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Qidiruv amali"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Qidiruv"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Qidirish uchun gapiring"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ichidan qidirish"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g> ichidan qidirish uchun gapiring"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Ijro"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Pauza"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Oldinga o‘tkazish"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$dX tezlikda oldinga o‘tkazish"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Orqaga qaytarish"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$dX tezlikda orqaga qaytarish"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Keyingisiga o‘tish"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Avvalgisiga qaytish"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Boshqa amallar"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Ijobiy baho tanlovini bekor qilish"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Ijobiy bahoni tanlash"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Salbiy baho tanlovini bekor qilish"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Salbiy bahoni tanlash"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Takrorlamaslik"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Hammasini takrorlash"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Bir marta takrorlash"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Aralashtirish funksiyasini yoqish"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Aralashtirmaslik"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Yuqori sifatni yoqish"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Yuqori sifatda ijro qilmaslik"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Taglavhalarni yoqish"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Taglavhalarni chiqarmaslik"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Tasvir ustida tasvir rejimiga kirish"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Boshqaruv elementlari ochiq"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Boshqaruv elementlari berkitilgan, ochish uchun D-pad tugmasini bosing"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Tayyor"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Keyingisi"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Media pleyer xatoligi kodi: %1$d (yana: %2$d)"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"BOSHLASH"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Keyingisi"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-vi/strings.xml b/leanback/leanback/src/main/res/values-vi/strings.xml
index 3d23a41..884e5e4 100644
--- a/leanback/leanback/src/main/res/values-vi/strings.xml
+++ b/leanback/leanback/src/main/res/values-vi/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Menu điều hướng"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Tác vụ tìm kiếm"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Tìm kiếm"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Nói để tìm kiếm"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Tìm kiếm <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Nói để tìm kiếm <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Phát"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Tạm dừng"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Tua đi"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Tua đi %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Tua lại"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Tua lại %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Chuyển đến mục tiếp theo"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Chuyển về mục trước"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Tác vụ khác"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Bỏ chọn thích"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Chọn thích"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Bỏ chọn không thích"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Chọn không thích"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Không lặp lại"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Lặp lại tất cả"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Lặp lại một mục"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Bật phát ngẫu nhiên"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Tắt phát ngẫu nhiên"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Bật chế độ chất lượng cao"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Tắt chế độ chất lượng cao"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Bật phụ đề"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Tắt phụ đề"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Vào chế độ hình trong hình"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Điều khiển phương tiện được hiển thị"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Điều khiển phương tiện bị ẩn, nhấn d-pad để hiển thị"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Hoàn tất"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Tiếp tục"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Mã lỗi MediaPlayer %1$d %2$d bổ sung"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"BẮT ĐẦU"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Tiếp"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Menu điều hướng"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Tác vụ tìm kiếm"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Tìm kiếm"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Nói để tìm kiếm"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Tìm kiếm <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Nói để tìm kiếm <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Phát"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Tạm dừng"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Tua đi"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Tua đi %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Tua lại"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Tua lại %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Chuyển đến mục tiếp theo"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Chuyển về mục trước"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Thao tác khác"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Bỏ chọn thích"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Chọn thích"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Bỏ chọn không thích"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Chọn không thích"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Không lặp lại"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Lặp lại tất cả"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Lặp lại một mục"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Bật phát ngẫu nhiên"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Tắt phát ngẫu nhiên"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Bật chế độ chất lượng cao"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Tắt chế độ chất lượng cao"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Bật phụ đề"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Tắt phụ đề"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Vào chế độ hình trong hình"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Điều khiển phương tiện được hiển thị"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Điều khiển phương tiện bị ẩn, nhấn d-pad để hiển thị"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Hoàn tất"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Tiếp tục"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Mã lỗi MediaPlayer %1$d %2$d bổ sung"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"BẮT ĐẦU"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Tiếp"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-zh-rCN/strings.xml b/leanback/leanback/src/main/res/values-zh-rCN/strings.xml
index 4e6cbd4..8c773e4 100644
--- a/leanback/leanback/src/main/res/values-zh-rCN/strings.xml
+++ b/leanback/leanback/src/main/res/values-zh-rCN/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"导航菜单"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"搜索操作"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"搜索"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"说话即可开始搜索"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"搜索<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"说话即可在<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>中搜索"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$d 倍速"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$d 倍速"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"播放"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"暂停"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"快进"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"%1$d 倍速快进"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"快退"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"%1$d 倍速快退"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"跳至下一个"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"跳至上一个"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"更多操作"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"取消选择顶操作"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"选择顶操作"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"取消选择踩操作"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"选择踩操作"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"不重复播放"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"重复播放全部"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"重复播放一项"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"开启随机播放"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"关闭随机播放"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"开启高画质模式"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"关闭高画质模式"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"开启字幕"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"关闭字幕"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"进入画中画模式"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"媒体控件已显示"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"媒体控件已隐藏,按方向键即可显示"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"完成"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"继续"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer 错误代码:%1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"开始使用"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"继续"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"导航菜单"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"搜索操作"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"搜索"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"说话即可开始搜索"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"搜索<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"说话即可在<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>中搜索"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$d 倍速"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$d 倍速"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"播放"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"暂停"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"快进"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"%1$d 倍速快进"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"快退"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"%1$d 倍速快退"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"跳至下一个"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"跳至上一个"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"更多操作"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"取消选择顶操作"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"选择顶操作"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"取消选择踩操作"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"选择踩操作"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"不重复播放"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"重复播放全部"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"重复播放一项"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"开启随机播放"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"关闭随机播放"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"开启高画质模式"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"关闭高画质模式"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"开启字幕"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"关闭字幕"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"进入画中画模式"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"媒体控件已显示"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"媒体控件已隐藏,按方向键即可显示"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"完成"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"继续"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer 错误代码:%1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"开始使用"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"继续"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-zh-rHK/strings.xml b/leanback/leanback/src/main/res/values-zh-rHK/strings.xml
index 22894c0..f65d084 100644
--- a/leanback/leanback/src/main/res/values-zh-rHK/strings.xml
+++ b/leanback/leanback/src/main/res/values-zh-rHK/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"導覽選單"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"搜尋操作"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"搜尋"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"使用語音搜尋"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"搜尋「<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>」"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"使用語音搜尋「<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>」"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"播放"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"暫停"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"向前快轉"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"快轉 %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"倒轉"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"倒轉 %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"跳去下一個項目"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"跳去上一個項目"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"更多操作"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"取消揀鍾意"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"揀鍾意"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"取消揀唔鍾意"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"揀唔鍾意"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"唔重複播放"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"重複播放所有項目"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"重複播放單一項目"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"啟用隨機播放"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"停用隨機播放"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"啟用高畫質播放"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"停用高畫質播放"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"啟用隱藏式字幕"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"停用隱藏式字幕"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"進入「畫中畫模式」"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"媒體控制項已顯示"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"媒體控制項已隱藏,按十字鍵即可顯示"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"完成"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"繼續"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer 錯誤代碼:%1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"開始使用"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"繼續"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"導覽選單"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"搜尋操作"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"搜尋"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"使用語音搜尋"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"搜尋「<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>」"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"使用語音搜尋「<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>」"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"播放"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"暫停"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"向前快轉"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"快轉 %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"倒轉"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"倒轉 %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"跳去下一個項目"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"跳去上一個項目"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"更多操作"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"取消揀鍾意"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"揀鍾意"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"取消揀唔鍾意"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"揀唔鍾意"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"唔重複播放"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"重複播放所有項目"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"重複播放單一項目"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"啟用隨機播放"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"停用隨機播放"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"啟用高畫質播放"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"停用高畫質播放"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"啟用隱藏式字幕"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"停用隱藏式字幕"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"進入「畫中畫模式」"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"媒體控制項已顯示"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"媒體控制項已隱藏,按十字鍵即可顯示"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"完成"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"繼續"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer 錯誤代碼:%1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"開始使用"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"繼續"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-zh-rTW/strings.xml b/leanback/leanback/src/main/res/values-zh-rTW/strings.xml
index 9aea4d2..397e5d1 100644
--- a/leanback/leanback/src/main/res/values-zh-rTW/strings.xml
+++ b/leanback/leanback/src/main/res/values-zh-rTW/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"導覽選單"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"搜尋動作"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"搜尋"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"使用語音搜尋"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"搜尋「<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>」"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"使用語音搜尋「<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>」"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"播放"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"暫停"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"快轉"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"快轉 %1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"倒轉"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"倒轉 %1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"跳至下一個項目"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"跳至上一個項目"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"更多動作"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"取消選取「喜歡」"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"選取「喜歡」"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"取消選取「不喜歡」"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"選取「不喜歡」"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"不重複播放"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"重複播放所有項目"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"重複播放單一項目"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"啟用隨機播放"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"停用隨機播放"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"啟用高品質播放"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"停用高品質播放"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"啟用隱藏式輔助字幕"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"停用隱藏式輔助字幕"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"進入子母畫面模式"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"媒體控制項已顯示"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"媒體控制項已隱藏,按下 D-Pad 即可顯示"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"完成"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"繼續"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"MediaPlayer 錯誤代碼:%1$d extra %2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"開始使用"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"繼續"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"導覽選單"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"搜尋動作"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"搜尋"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"使用語音搜尋"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"搜尋「<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>」"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"使用語音搜尋「<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>」"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"播放"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"暫停"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"快轉"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"快轉 %1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"倒轉"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"倒轉 %1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"跳至下一個項目"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"跳至上一個項目"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"更多動作"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"取消選取「喜歡」"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"選取「喜歡」"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"取消選取「不喜歡」"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"選取「不喜歡」"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"不重複播放"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"重複播放所有項目"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"重複播放單一項目"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"啟用隨機播放"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"停用隨機播放"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"啟用高品質播放"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"停用高品質播放"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"啟用隱藏式輔助字幕"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"停用隱藏式輔助字幕"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"進入子母畫面模式"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"媒體控制項已顯示"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"媒體控制項已隱藏,按下 D-Pad 即可顯示"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"完成"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"繼續"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"MediaPlayer 錯誤代碼:%1$d extra %2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"開始使用"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"繼續"</string>
 </resources>
diff --git a/leanback/leanback/src/main/res/values-zu/strings.xml b/leanback/leanback/src/main/res/values-zu/strings.xml
index 6f65904..c127579 100644
--- a/leanback/leanback/src/main/res/values-zu/strings.xml
+++ b/leanback/leanback/src/main/res/values-zu/strings.xml
@@ -17,43 +17,43 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="lb_navigation_menu_contentDescription" msgid="8126335323963415494">"Imenyu yokuzulazula"</string>
-    <string name="orb_search_action" msgid="7534843523462177008">"Isenzo sokusesha"</string>
-    <string name="lb_search_bar_hint" msgid="4819380969103509861">"Sesha"</string>
-    <string name="lb_search_bar_hint_speech" msgid="2795474673510974502">"Khuluma ukuze useshe"</string>
-    <string name="lb_search_bar_hint_with_title" msgid="7453744869467668159">"Sesha i-<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_search_bar_hint_with_title_speech" msgid="5851694095153624617">"Khuluma ukuze useshe i-<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
-    <string name="lb_control_display_fast_forward_multiplier" msgid="2721825378927619928">"%1$dX"</string>
-    <string name="lb_control_display_rewind_multiplier" msgid="6173753802428649303">"%1$dX"</string>
-    <string name="lb_playback_controls_play" msgid="1590369760862605402">"Dlala"</string>
-    <string name="lb_playback_controls_pause" msgid="1769131316742618433">"Misa isikhashana"</string>
-    <string name="lb_playback_controls_fast_forward" msgid="8966769845721269304">"Iya phambili ngokushesha"</string>
-    <string name="lb_playback_controls_fast_forward_multiplier" msgid="801276177839339511">"Hambisa phambili ngokushesha i-%1$dX"</string>
-    <string name="lb_playback_controls_rewind" msgid="1412664391757869774">"Buyisela emuva"</string>
-    <string name="lb_playback_controls_rewind_multiplier" msgid="8651612807713092781">"Mikisa emuva i-%1$dX"</string>
-    <string name="lb_playback_controls_skip_next" msgid="4877009494447817003">"Yeqa okulandelayo"</string>
-    <string name="lb_playback_controls_skip_previous" msgid="3147124289285911980">"Yeqa kwangaphambilini"</string>
-    <string name="lb_playback_controls_more_actions" msgid="2827883329510404797">"Izenzo eziningi"</string>
-    <string name="lb_playback_controls_thumb_up" msgid="8332816524260995892">"Susa ukukhetha isithupha saphezulu"</string>
-    <string name="lb_playback_controls_thumb_up_outline" msgid="1038344559734334272">"Khetha okushaphu"</string>
-    <string name="lb_playback_controls_thumb_down" msgid="5075744418630733006">"Susa ukukhetha isithupha saphansi"</string>
-    <string name="lb_playback_controls_thumb_down_outline" msgid="2847309435442474470">"Khetha isithupha saphansi"</string>
-    <string name="lb_playback_controls_repeat_none" msgid="5812341701962930499">"Ungaphindi lutho"</string>
-    <string name="lb_playback_controls_repeat_all" msgid="5164826436271322261">"Phinda konke"</string>
-    <string name="lb_playback_controls_repeat_one" msgid="7675097479246139440">"Phida okukodwa"</string>
-    <string name="lb_playback_controls_shuffle_enable" msgid="7809089255981448519">"Nika amandla ukushova"</string>
-    <string name="lb_playback_controls_shuffle_disable" msgid="8182435535948303910">"Khubaza ukushova"</string>
-    <string name="lb_playback_controls_high_quality_enable" msgid="1862669142355962638">"Nika amandla ikhwalithi ephezulu"</string>
-    <string name="lb_playback_controls_high_quality_disable" msgid="3000046054608531995">"Khubaza ikhwalithi ephezulu"</string>
-    <string name="lb_playback_controls_closed_captioning_enable" msgid="3934392140182327163">"Nika amandla ukwenza amazwibela okuvaliwe"</string>
-    <string name="lb_playback_controls_closed_captioning_disable" msgid="5508271941331836786">"Khubaza ukwenza amazwibela okuvaliwe"</string>
-    <string name="lb_playback_controls_picture_in_picture" msgid="8800305194045609275">"Ngena kumodi yesithombe esikusithombe"</string>
-    <string name="lb_playback_time_separator" msgid="6549544638083578695">"/"</string>
-    <string name="lb_playback_controls_shown" msgid="7794717158616536936">"Izilawuli zemidiya zibonisiwe"</string>
-    <string name="lb_playback_controls_hidden" msgid="619396299825306757">"Izilawuli zemidiya zifihliwe, cindezela ku-d-pad ukuze uzibonise"</string>
-    <string name="lb_guidedaction_finish_title" msgid="7747913934287176843">"Qeda"</string>
-    <string name="lb_guidedaction_continue_title" msgid="1122271825827282965">"Qhubeka"</string>
-    <string name="lb_media_player_error" msgid="8748646000835486516">"Ikhodi yephutha ye-MediaPlayer engu-%1$d okungeziwe okungu-%2$d"</string>
-    <string name="lb_onboarding_get_started" msgid="7674487829030291492">"QALISA"</string>
-    <string name="lb_onboarding_accessibility_next" msgid="4213611627196077555">"Okulandelayo"</string>
+    <string name="lb_navigation_menu_contentDescription" msgid="8084428500709675515">"Imenyu yokuzulazula"</string>
+    <string name="orb_search_action" msgid="1301877238242752863">"Isenzo sokusesha"</string>
+    <string name="lb_search_bar_hint" msgid="5700349211583074131">"Sesha"</string>
+    <string name="lb_search_bar_hint_speech" msgid="5926531297066387462">"Khuluma ukuze useshe"</string>
+    <string name="lb_search_bar_hint_with_title" msgid="4826526877249029043">"Sesha i-<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_search_bar_hint_with_title_speech" msgid="6032250334706920550">"Khuluma ukuze useshe i-<xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string>
+    <string name="lb_control_display_fast_forward_multiplier" msgid="4657191930956702614">"%1$dX"</string>
+    <string name="lb_control_display_rewind_multiplier" msgid="4597148235912710942">"%1$dX"</string>
+    <string name="lb_playback_controls_play" msgid="7088090604803481121">"Dlala"</string>
+    <string name="lb_playback_controls_pause" msgid="917331776961802657">"Misa isikhashana"</string>
+    <string name="lb_playback_controls_fast_forward" msgid="740570111678243493">"Iya phambili ngokushesha"</string>
+    <string name="lb_playback_controls_fast_forward_multiplier" msgid="5734614175721471329">"Hambisa phambili ngokushesha i-%1$dX"</string>
+    <string name="lb_playback_controls_rewind" msgid="2866333981131020771">"Buyisela emuva"</string>
+    <string name="lb_playback_controls_rewind_multiplier" msgid="6038956370475252734">"Mikisa emuva i-%1$dX"</string>
+    <string name="lb_playback_controls_skip_next" msgid="8117512422682146745">"Yeqa okulandelayo"</string>
+    <string name="lb_playback_controls_skip_previous" msgid="3481218248309447059">"Yeqa kwangaphambilini"</string>
+    <string name="lb_playback_controls_more_actions" msgid="8730341244454469032">"Izenzo eziningi"</string>
+    <string name="lb_playback_controls_thumb_up" msgid="3458671378107738666">"Susa ukukhetha isithupha saphezulu"</string>
+    <string name="lb_playback_controls_thumb_up_outline" msgid="1385865732502550659">"Khetha okushaphu"</string>
+    <string name="lb_playback_controls_thumb_down" msgid="3544533410444618518">"Susa ukukhetha isithupha saphansi"</string>
+    <string name="lb_playback_controls_thumb_down_outline" msgid="8475278766138652105">"Khetha isithupha saphansi"</string>
+    <string name="lb_playback_controls_repeat_none" msgid="1614290959784265209">"Ungaphindi lutho"</string>
+    <string name="lb_playback_controls_repeat_all" msgid="8429099206716245199">"Phinda konke"</string>
+    <string name="lb_playback_controls_repeat_one" msgid="676658705837320560">"Phida okukodwa"</string>
+    <string name="lb_playback_controls_shuffle_enable" msgid="5151681938752704485">"Nika amandla ukushova"</string>
+    <string name="lb_playback_controls_shuffle_disable" msgid="6793109999253893369">"Khubaza ukushova"</string>
+    <string name="lb_playback_controls_high_quality_enable" msgid="3057698527166674705">"Nika amandla ikhwalithi ephezulu"</string>
+    <string name="lb_playback_controls_high_quality_disable" msgid="1209119371486219736">"Khubaza ikhwalithi ephezulu"</string>
+    <string name="lb_playback_controls_closed_captioning_enable" msgid="2346334170216706076">"Nika amandla ukwenza amazwibela okuvaliwe"</string>
+    <string name="lb_playback_controls_closed_captioning_disable" msgid="8691966842977635128">"Khubaza ukwenza amazwibela okuvaliwe"</string>
+    <string name="lb_playback_controls_picture_in_picture" msgid="5770668162543767702">"Ngena kumodi yesithombe esikusithombe"</string>
+    <string name="lb_playback_time_separator" msgid="1471121602610716654">"/"</string>
+    <string name="lb_playback_controls_shown" msgid="8690223891515602822">"Izilawuli zemidiya zibonisiwe"</string>
+    <string name="lb_playback_controls_hidden" msgid="5859666950961624736">"Izilawuli zemidiya zifihliwe, cindezela ku-d-pad ukuze uzibonise"</string>
+    <string name="lb_guidedaction_finish_title" msgid="3330958750346333890">"Qeda"</string>
+    <string name="lb_guidedaction_continue_title" msgid="893619591225519922">"Qhubeka"</string>
+    <string name="lb_media_player_error" msgid="3228326776757666747">"Ikhodi yephutha ye-MediaPlayer engu-%1$d okungeziwe okungu-%2$d"</string>
+    <string name="lb_onboarding_get_started" msgid="5549711907371161292">"QALISA"</string>
+    <string name="lb_onboarding_accessibility_next" msgid="2394451791544864917">"Okulandelayo"</string>
 </resources>
diff --git a/media/media/api/1.2.0-alpha02.txt b/media/media/api/1.2.0-alpha02.txt
index 9bf6f01..0d6d694 100644
--- a/media/media/api/1.2.0-alpha02.txt
+++ b/media/media/api/1.2.0-alpha02.txt
@@ -704,3 +704,13 @@
 
 }
 
+package androidx.media.utils {
+
+  public final class MediaConstants {
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_NAME = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_NAME";
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_TYPE = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_TYPE";
+    field public static final String SESSION_EXTRAS_KEY_AUTHTOKEN = "androidx.media.MediaSessionCompat.Extras.KEY_AUTHTOKEN";
+  }
+
+}
+
diff --git a/media/media/api/current.txt b/media/media/api/current.txt
index 9bf6f01..0d6d694 100644
--- a/media/media/api/current.txt
+++ b/media/media/api/current.txt
@@ -704,3 +704,13 @@
 
 }
 
+package androidx.media.utils {
+
+  public final class MediaConstants {
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_NAME = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_NAME";
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_TYPE = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_TYPE";
+    field public static final String SESSION_EXTRAS_KEY_AUTHTOKEN = "androidx.media.MediaSessionCompat.Extras.KEY_AUTHTOKEN";
+  }
+
+}
+
diff --git a/media/media/api/public_plus_experimental_1.2.0-alpha02.txt b/media/media/api/public_plus_experimental_1.2.0-alpha02.txt
index 9bf6f01..0d6d694 100644
--- a/media/media/api/public_plus_experimental_1.2.0-alpha02.txt
+++ b/media/media/api/public_plus_experimental_1.2.0-alpha02.txt
@@ -704,3 +704,13 @@
 
 }
 
+package androidx.media.utils {
+
+  public final class MediaConstants {
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_NAME = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_NAME";
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_TYPE = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_TYPE";
+    field public static final String SESSION_EXTRAS_KEY_AUTHTOKEN = "androidx.media.MediaSessionCompat.Extras.KEY_AUTHTOKEN";
+  }
+
+}
+
diff --git a/media/media/api/public_plus_experimental_current.txt b/media/media/api/public_plus_experimental_current.txt
index 9bf6f01..0d6d694 100644
--- a/media/media/api/public_plus_experimental_current.txt
+++ b/media/media/api/public_plus_experimental_current.txt
@@ -704,3 +704,13 @@
 
 }
 
+package androidx.media.utils {
+
+  public final class MediaConstants {
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_NAME = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_NAME";
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_TYPE = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_TYPE";
+    field public static final String SESSION_EXTRAS_KEY_AUTHTOKEN = "androidx.media.MediaSessionCompat.Extras.KEY_AUTHTOKEN";
+  }
+
+}
+
diff --git a/media/media/api/restricted_1.2.0-alpha02.txt b/media/media/api/restricted_1.2.0-alpha02.txt
index a799d29..0be6f56 100644
--- a/media/media/api/restricted_1.2.0-alpha02.txt
+++ b/media/media/api/restricted_1.2.0-alpha02.txt
@@ -732,3 +732,13 @@
 
 }
 
+package androidx.media.utils {
+
+  public final class MediaConstants {
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_NAME = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_NAME";
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_TYPE = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_TYPE";
+    field public static final String SESSION_EXTRAS_KEY_AUTHTOKEN = "androidx.media.MediaSessionCompat.Extras.KEY_AUTHTOKEN";
+  }
+
+}
+
diff --git a/media/media/api/restricted_current.txt b/media/media/api/restricted_current.txt
index a799d29..0be6f56 100644
--- a/media/media/api/restricted_current.txt
+++ b/media/media/api/restricted_current.txt
@@ -732,3 +732,13 @@
 
 }
 
+package androidx.media.utils {
+
+  public final class MediaConstants {
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_NAME = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_NAME";
+    field public static final String SESSION_EXTRAS_KEY_ACCOUNT_TYPE = "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_TYPE";
+    field public static final String SESSION_EXTRAS_KEY_AUTHTOKEN = "androidx.media.MediaSessionCompat.Extras.KEY_AUTHTOKEN";
+  }
+
+}
+
diff --git a/media/media/src/main/java/androidx/media/utils/MediaConstants.java b/media/media/src/main/java/androidx/media/utils/MediaConstants.java
new file mode 100644
index 0000000..f85e5e1
--- /dev/null
+++ b/media/media/src/main/java/androidx/media/utils/MediaConstants.java
@@ -0,0 +1,65 @@
+/*
+ * 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.media.utils;
+
+import android.annotation.SuppressLint;
+import android.support.v4.media.session.MediaControllerCompat;
+import android.support.v4.media.session.MediaSessionCompat;
+
+/**
+ * Media constants for sharing constants between media provider and consumer apps
+ */
+public final class MediaConstants {
+    /**
+     * Bundle key used for the account name in {@link MediaSessionCompat session} extras.
+     *
+     * <p>TYPE: String</p>
+     *
+     * @see MediaControllerCompat#getExtras
+     * @see MediaSessionCompat#setExtras
+     */
+    @SuppressLint("IntentName")
+    public static final String SESSION_EXTRAS_KEY_ACCOUNT_NAME =
+            "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_NAME";
+    /**
+     * Bundle key used for the account type in {@link MediaSessionCompat session} extras.
+     * The value would vary across media applications.
+     *
+     * <p>TYPE: String</p>
+     *
+     * @see MediaControllerCompat#getExtras
+     * @see MediaSessionCompat#setExtras
+     */
+    @SuppressLint("IntentName")
+    public static final String SESSION_EXTRAS_KEY_ACCOUNT_TYPE =
+            "androidx.media.MediaSessionCompat.Extras.KEY_ACCOUNT_TYPE";
+    /**
+     * Bundle key used for the account auth token value in {@link MediaSessionCompat session}
+     * extras.
+     * The value would vary across media applications.
+     *
+     * <p>TYPE: byte[]</p>
+     *
+     * @see MediaControllerCompat#getExtras
+     * @see MediaSessionCompat#setExtras
+     */
+    @SuppressLint("IntentName")
+    public static final String SESSION_EXTRAS_KEY_AUTHTOKEN =
+            "androidx.media.MediaSessionCompat.Extras.KEY_AUTHTOKEN";
+
+    private MediaConstants() {}
+}
diff --git a/media2/session/src/main/res/values-ky/strings.xml b/media2/session/src/main/res/values-ky/strings.xml
index db2b697..c66db91 100644
--- a/media2/session/src/main/res/values-ky/strings.xml
+++ b/media2/session/src/main/res/values-ky/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_channel_name" msgid="6743534657295236036">"Азыр ойнотулуп жатат"</string>
+    <string name="default_notification_channel_name" msgid="6743534657295236036">"Эмне ойноп жатат"</string>
     <string name="play_button_content_description" msgid="6034272287948142298">"Ойнотуу"</string>
     <string name="pause_button_content_description" msgid="4221330012095125431">"Тындыруу"</string>
     <string name="skip_to_previous_item_button_content_description" msgid="7233771088610629683">"Мурунку нерсеге өтүү"</string>
diff --git a/media2/widget/src/main/res/values-am/strings.xml b/media2/widget/src/main/res/values-am/strings.xml
index 9e5b5d3..9f78440 100644
--- a/media2/widget/src/main/res/values-am/strings.xml
+++ b/media2/widget/src/main/res/values-am/strings.xml
@@ -26,7 +26,7 @@
     <string name="MediaControlView_subtitle_track_number_text" msgid="7764843500931103738">"ትራክ <xliff:g id="TRACK_NUMBER">%1$d</xliff:g>"</string>
     <string name="MediaControlView_subtitle_track_number_and_lang_text" msgid="4652664932814816449">"ትራክ <xliff:g id="TRACK_NUMBER">%1$d</xliff:g> - <xliff:g id="LANG">%2$s</xliff:g>"</string>
     <string name="MediaControlView_audio_track_number_text" msgid="4764598467753473351">"ትራክ <xliff:g id="AUDIO_NUMBER">%1$d</xliff:g>"</string>
-    <string name="mcv2_non_music_title_unknown_text" msgid="5414417081368449210">"ያልታወቀ የቪዲዮ አርእስት"</string>
+    <string name="mcv2_non_music_title_unknown_text" msgid="5414417081368449210">"ያልታወቀ የቪዲዮ አርዕስት"</string>
     <string name="mcv2_music_title_unknown_text" msgid="6768779662371844918">"ያልታወቀ የዘፈን ርዕስ"</string>
     <string name="mcv2_music_artist_unknown_text" msgid="1475333855817994058">"ያልታወቀ አርቲስት"</string>
     <string name="mcv2_playback_error_text" msgid="1201919666572302119">"የጠየቁትን ንጥል ማጫወት አልተቻለም"</string>
diff --git a/media2/widget/src/main/res/values-da/strings.xml b/media2/widget/src/main/res/values-da/strings.xml
index bdab718..74fedbd 100644
--- a/media2/widget/src/main/res/values-da/strings.xml
+++ b/media2/widget/src/main/res/values-da/strings.xml
@@ -28,7 +28,7 @@
     <string name="MediaControlView_audio_track_number_text" msgid="4764598467753473351">"Spor <xliff:g id="AUDIO_NUMBER">%1$d</xliff:g>"</string>
     <string name="mcv2_non_music_title_unknown_text" msgid="5414417081368449210">"Ukendt videotitel"</string>
     <string name="mcv2_music_title_unknown_text" msgid="6768779662371844918">"Ukendt sangtitel"</string>
-    <string name="mcv2_music_artist_unknown_text" msgid="1475333855817994058">"Ukendt musiker"</string>
+    <string name="mcv2_music_artist_unknown_text" msgid="1475333855817994058">"Ukendt kunstner"</string>
     <string name="mcv2_playback_error_text" msgid="1201919666572302119">"Den ønskede video kunne ikke afspilles"</string>
     <string name="mcv2_error_dialog_button" msgid="1892680062375516133">"OK"</string>
     <string name="mcv2_back_button_desc" msgid="5728972524527278943">"Tilbage"</string>
diff --git a/media2/widget/src/main/res/values-it/strings.xml b/media2/widget/src/main/res/values-it/strings.xml
index 973a35f..6fe366d 100644
--- a/media2/widget/src/main/res/values-it/strings.xml
+++ b/media2/widget/src/main/res/values-it/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="MediaControlView_subtitle_off_text" msgid="1845015629089301203">"OFF"</string>
+    <string name="MediaControlView_subtitle_off_text" msgid="1845015629089301203">"Off"</string>
     <string name="MediaControlView_audio_track_text" msgid="3532548952520840186">"Traccia audio"</string>
     <string name="MediaControlView_audio_track_none_text" msgid="549548876131348304">"Nessuna"</string>
     <string name="MediaControlView_playback_speed_text" msgid="8150324864582460559">"Velocità di riproduzione"</string>
diff --git a/media2/widget/src/main/res/values-ne/strings.xml b/media2/widget/src/main/res/values-ne/strings.xml
index b1c45ea..641c4de 100644
--- a/media2/widget/src/main/res/values-ne/strings.xml
+++ b/media2/widget/src/main/res/values-ne/strings.xml
@@ -45,5 +45,5 @@
     <string name="mcv2_next_button_desc" msgid="4799850472802157220">"अर्को मिडिया"</string>
     <string name="mcv2_rewind_button_desc" msgid="5725552141091554735">"१० सेकेन्ड रिवाइन्ड गर्नुहोस्"</string>
     <string name="mcv2_ffwd_button_desc" msgid="7189466356853482980">"३० सेकेन्ड अघि जानुहोस्"</string>
-    <string name="mcv2_full_screen_button_desc" msgid="6900438429115580036">"पूर्ण स्क्रिन"</string>
+    <string name="mcv2_full_screen_button_desc" msgid="6900438429115580036">"फुल स्क्रिन"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-af/strings.xml b/mediarouter/mediarouter/src/main/res/values-af/strings.xml
index de58de9..5e3e27a 100644
--- a/mediarouter/mediarouter/src/main/res/values-af/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-af/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Stelsel"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Toestelle"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Uitsaai-knoppie"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Uitsaai-knoppie. Ontkoppel"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Uitsaai-knoppie. Koppel tans"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Uitsaai-knoppie. Gekoppel"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Saai uit na"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Soek tans toestelle"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Ontkoppel"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Hou op uitsaai"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Maak toe"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Speel"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Onderbreek"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stop"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Vou uit"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Vou in"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albumkunswerk"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Volumeglyer"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Geen media is gekies nie"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Geen inligting is beskikbaar nie"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Saai tans skerm uit"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Voeg \'n toestel by"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Speel op \'n groep"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Geen inligting beskikbaar nie"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Stelsel"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Toestelle"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Uitsaai-knoppie"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Uitsaai-knoppie. Ontkoppel"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Uitsaai-knoppie. Koppel tans"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Uitsaai-knoppie. Gekoppel"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Saai uit na"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Soek tans toestelle"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Ontkoppel"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Hou op uitsaai"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Maak toe"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Speel"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Onderbreek"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stop"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Vou uit"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Vou in"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albumkunswerk"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Volumeglyer"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Geen media is gekies nie"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Geen inligting is beskikbaar nie"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Saai tans skerm uit"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Voeg \'n toestel by"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Speel op \'n groep"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Geen inligting beskikbaar nie"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-am/strings.xml b/mediarouter/mediarouter/src/main/res/values-am/strings.xml
index 3dae8a8..148d14a 100644
--- a/mediarouter/mediarouter/src/main/res/values-am/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-am/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"ሥርዓት"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"መሣሪያዎች"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"የCast አዝራር"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast አዝራር። ግንኙነት ተቋርጧል"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"የCast አዝራር። በመገናኘት ላይ"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"የCast አዝራር። ተገናኝቷል"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Cast አድርግ ወደ"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"መሣሪያዎችን በማግኘት ላይ"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"ግንኙነት አቋርጥ"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Cast ማድረግ አቁም"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"ዝጋ"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"አጫውት"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"ባለበት አቁም"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"አቁም"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"ዘርጋ"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"ሰብስብ"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"የአልበም ስነ-ጥበብ"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"ተንሸራታች የድምፅ መቆጣጠሪያ"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"ምንም ማህደረ መረጃ አልተመረጠም"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"ምንም መረጃ አይገኝም"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"ማያ ገጽን Cast በማድረግ ላይ"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"መሣሪያ ያክሉ"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"በቡድን ላይ ያጫውቱ"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"ምንም መረጃ አይገኝም"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"ሥርዓት"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"መሣሪያዎች"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"የCast አዝራር"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast አዝራር። ግንኙነት ተቋርጧል"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"የCast አዝራር። በመገናኘት ላይ"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"የCast አዝራር። ተገናኝቷል"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Cast አድርግ ወደ"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"መሣሪያዎችን በማግኘት ላይ"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"ግንኙነት አቋርጥ"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Cast ማድረግ አቁም"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"ዝጋ"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"አጫውት"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"ባለበት አቁም"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"አቁም"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"ዘርጋ"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"ሰብስብ"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"የአልበም ስነ-ጥበብ"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"ተንሸራታች የድምፅ መቆጣጠሪያ"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"ምንም ማህደረ መረጃ አልተመረጠም"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"ምንም መረጃ አይገኝም"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"ማያ ገጽን Cast በማድረግ ላይ"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"መሣሪያ ያክሉ"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"በቡድን ላይ ያጫውቱ"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ምንም መረጃ አይገኝም"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ar/strings.xml b/mediarouter/mediarouter/src/main/res/values-ar/strings.xml
index 74dd9f9..7ac0bde 100644
--- a/mediarouter/mediarouter/src/main/res/values-ar/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ar/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"النظام"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"الأجهزة"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"زر الإرسال"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"زر الإرسال. تم قطع الاتصال"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"زر الإرسال. جارٍ الاتصال"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"زر الإرسال. تم الاتصال"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"إرسال إلى"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"جارٍ البحث عن أجهزة"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"قطع اتصال"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"إيقاف الإرسال"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"إغلاق"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"تشغيل"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"إيقاف مؤقت"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"إيقاف"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"توسيع"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"تصغير"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"صورة الألبوم"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"شريط تمرير مستوى الصوت"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"لم يتم اختيار أي وسائط"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"لا تتوفر أي معلومات"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"جارٍ إرسال الشاشة"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"إضافة جهاز"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"تشغيل على مجموعة من الأجهزة"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"لا تتوفر أي معلومات"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"النظام"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"الأجهزة"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"زر الإرسال"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"زر الإرسال. تم قطع الاتصال"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"زر الإرسال. جارٍ الاتصال"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"زر الإرسال. تم الاتصال"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"إرسال إلى"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"جارٍ البحث عن أجهزة"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"قطع اتصال"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"إيقاف الإرسال"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"إغلاق"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"تشغيل"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"إيقاف مؤقت"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"إيقاف"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"توسيع"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"تصغير"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"صورة الألبوم"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"شريط تمرير مستوى الصوت"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"لم يتم اختيار أي وسائط"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"لا تتوفر أي معلومات"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"جارٍ إرسال الشاشة"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"إضافة جهاز"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"تشغيل على مجموعة من الأجهزة"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"لا تتوفر أي معلومات"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-as/strings.xml b/mediarouter/mediarouter/src/main/res/values-as/strings.xml
index d52670f..c42f68d 100644
--- a/mediarouter/mediarouter/src/main/res/values-as/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-as/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"ছিষ্টেম"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"ডিভাইচসমূহ"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"কাষ্ট বুটাম"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"কাষ্ট বুটাম। সংযোগ বিচ্ছিন্ন কৰা হ’ল"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"কাষ্ট বুটাম। সংযোগ কৰি থকা হৈছে"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"কাষ্ট বুটাম। সংযোগ কৰা হ’ল"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"ইয়াত কাষ্ট কৰক"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"ডিভাইচ বিচাৰি থকা হৈছে"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"বিচ্ছিন্ন কৰক"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"কাষ্ট কৰা বন্ধ কৰক"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"বন্ধ কৰক"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"প্লে কৰক"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"পজ কৰক"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"ৰখাওক"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"বিস্তাৰ কৰক"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"সংকুচিত কৰক"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"এলবাম আৰ্ট"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"ধ্বনি শ্লাইডাৰ"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"কোনো মিডিয়া বাছনি কৰা হোৱা নাই"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"কোনো তথ্য নাই"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"স্ক্ৰীণ কাষ্ট কৰি থকা হৈছে"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"কোনো এটা ডিভাইচ যোগ কৰক"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"কোনো এটা গোটত প্লে’ কৰক"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"কোনো তথ্য নাই"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"ছিষ্টেম"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"ডিভাইচসমূহ"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"কাষ্ট বুটাম"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"কাষ্ট বুটাম। সংযোগ বিচ্ছিন্ন কৰা হ’ল"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"কাষ্ট বুটাম। সংযোগ কৰি থকা হৈছে"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"কাষ্ট বুটাম। সংযোগ কৰা হ’ল"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"ইয়াত কাষ্ট কৰক"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"ডিভাইচ বিচাৰি থকা হৈছে"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"বিচ্ছিন্ন কৰক"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"কাষ্ট কৰা বন্ধ কৰক"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"বন্ধ কৰক"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"প্লে কৰক"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"পজ কৰক"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"ৰখাওক"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"বিস্তাৰ কৰক"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"সংকুচিত কৰক"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"এলবাম আৰ্ট"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"ধ্বনি শ্লাইডাৰ"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"কোনো মিডিয়া বাছনি কৰা হোৱা নাই"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"কোনো তথ্য নাই"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"স্ক্ৰীণ কাষ্ট কৰি থকা হৈছে"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"কোনো এটা ডিভাইচ যোগ কৰক"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"কোনো এটা গোটত প্লে’ কৰক"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"কোনো তথ্য নাই"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-az/strings.xml b/mediarouter/mediarouter/src/main/res/values-az/strings.xml
index 8c480c5..ece9f11 100644
--- a/mediarouter/mediarouter/src/main/res/values-az/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-az/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistem"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Cihazlar"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Yayım düyməsi"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Yayım düyməsi. Bağlantı kəsildi"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Yayım düyməsi. Qoşulur"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Yayım düyməsi. Qoşuldu"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Bura yayımlayın"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Cihazlar axtarılır"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Əlaqəni silin"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Yayımı dayandırın"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Bağlayın"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Oyun"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pauza"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Dayandırın"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Genişləndirin"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Yığcamlaşdırın"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albom incəsənəti"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Səs ayarlayıcısı"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Media seçilməyib"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Əlçatan məlumat yoxdur"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Ekran yayımlanır"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Cihaz əlavə edin"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Qrupda oxudun"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Əlçatan məlumat yoxdur"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistem"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Cihazlar"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Yayım düyməsi"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Yayım düyməsi. Bağlantı kəsildi"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Yayım düyməsi. Qoşulur"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Yayım düyməsi. Qoşuldu"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Bura yayımlayın"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Cihazlar axtarılır"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Əlaqəni silin"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Yayımı dayandırın"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Bağlayın"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Oyun"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pauza"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Dayandırın"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Genişləndirin"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Yığcamlaşdırın"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albom incəsənəti"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Səs ayarlayıcısı"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Media seçilməyib"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Əlçatan məlumat yoxdur"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Ekran yayımlanır"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Cihaz əlavə edin"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Qrupda oxudun"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Əlçatan məlumat yoxdur"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-b+sr+Latn/strings.xml b/mediarouter/mediarouter/src/main/res/values-b+sr+Latn/strings.xml
index 1b7087a..793a494 100644
--- a/mediarouter/mediarouter/src/main/res/values-b+sr+Latn/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-b+sr+Latn/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistem"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Uređaji"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Dugme Prebaci"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Dugme Prebaci. Veza je prekinuta"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Dugme Prebaci. Povezuje se"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Dugme Prebaci. Povezan je"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Prebacite na"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Traže se uređaji"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Prekini vezu"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Zaustavi prebacivanje"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Zatvori"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Pusti"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pauziraj"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Zaustavi"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Proširi"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Skupi"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Omot albuma"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Klizač za jačinu zvuka"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nema izabranih medija"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nema dostupnih informacija"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Prebacuje se ekran"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Dodajte uređaj"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Puštajte u grupi"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nema dostupnih informacija"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistem"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Uređaji"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Dugme Prebaci"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Dugme Prebaci. Veza je prekinuta"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Dugme Prebaci. Povezuje se"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Dugme Prebaci. Povezan je"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Prebacite na"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Traže se uređaji"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Prekini vezu"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Zaustavi prebacivanje"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Zatvori"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Pusti"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pauziraj"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Zaustavi"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Proširi"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Skupi"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Omot albuma"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Klizač za jačinu zvuka"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nema izabranih medija"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nema dostupnih informacija"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Prebacuje se ekran"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Dodajte uređaj"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Puštajte u grupi"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nema dostupnih informacija"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-be/strings.xml b/mediarouter/mediarouter/src/main/res/values-be/strings.xml
index 88ebb3e..da8b5d0 100644
--- a/mediarouter/mediarouter/src/main/res/values-be/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-be/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Сістэма"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Прылады"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Кнопка трансляцыі"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Кнопка трансляцыі. Прылада адлучана"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Кнопка трансляцыі. Прылада злучаецца"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Кнопка трансляцыі. Прылада злучана"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Трансліраваць на прыладу"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Пошук прылад"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Адлучыць"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Спыніць трансляцыю"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Закрыць"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Прайграць"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Прыпыніць"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Спыніць"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Разгарнуць"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Згарнуць"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Вокладка альбома"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Рэгулятар гучнасці"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Мультымедыя не выбрана"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Інфармацыя адсутнічае"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Трансліруецца змесціва экрана"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Дадаць прыладу"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Прайграць на групе прылад"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Інфармацыя адсутнічае"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Сістэма"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Прылады"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Кнопка трансляцыі"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Кнопка трансляцыі. Прылада адлучана"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Кнопка трансляцыі. Прылада злучаецца"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Кнопка трансляцыі. Прылада злучана"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Трансліраваць на прыладу"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Пошук прылад"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Адлучыць"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Спыніць трансляцыю"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Закрыць"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Прайграць"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Прыпыніць"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Спыніць"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Разгарнуць"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Згарнуць"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Вокладка альбома"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Рэгулятар гучнасці"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Мультымедыя не выбрана"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Інфармацыя адсутнічае"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Трансліруецца змесціва экрана"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Дадаць прыладу"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Прайграць на групе прылад"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Інфармацыя адсутнічае"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-bg/strings.xml b/mediarouter/mediarouter/src/main/res/values-bg/strings.xml
index 0d2bbc2..853a9c4 100644
--- a/mediarouter/mediarouter/src/main/res/values-bg/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-bg/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Система"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Устройства"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Бутон за предаване"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Бутон за предаване. Връзката е прекратена"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Бутон за предаване. Установява се връзка"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Бутон за предаване. Установена е връзка"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Предаване към"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Търсят се устройства"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Прекратяване на връзката"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Спиране на предаването"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Затваряне"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Възпроизвеждане"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Поставяне на пауза"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Спиране"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Разгъване"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Свиване"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Обложка на албума"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Плъзгач за силата на звука"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Няма избрана мултимедия"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Няма налична информация"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Екранът се предава"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Добавяне на устройство"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Възпроизвеждане в група"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Няма налична информация"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Система"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Устройства"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Бутон за предаване"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Бутон за предаване. Връзката е прекратена"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Бутон за предаване. Установява се връзка"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Бутон за предаване. Установена е връзка"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Предаване към"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Търсят се устройства"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Прекратяване на връзката"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Спиране на предаването"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Затваряне"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Възпроизвеждане"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Поставяне на пауза"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Спиране"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Разгъване"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Свиване"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Обложка на албума"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Плъзгач за силата на звука"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Няма избрана мултимедия"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Няма налична информация"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Екранът се предава"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Добавяне на устройство"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Възпроизвеждане в група"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Няма налична информация"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-bn/strings.xml b/mediarouter/mediarouter/src/main/res/values-bn/strings.xml
index 4d81a2e..ff653cb 100644
--- a/mediarouter/mediarouter/src/main/res/values-bn/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-bn/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"সিস্টেম"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"ডিভাইস"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"কাস্ট করার বোতাম"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"কাস্ট করার বোতাম। কানেক্ট করা নেই"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"কাস্ট করার বোতাম। কানেক্ট করা হচ্ছে"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"কাস্ট করার বোতাম। কানেক্ট হয়েছে"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"এখানে কাস্ট করুন:"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"ডিভাইস খোঁজা হচ্ছে"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"কানেকশন বিচ্ছিন্ন করুন"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"কাস্ট করা বন্ধ করুন"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"বন্ধ করুন"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"চালান"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"পজ করুন"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"থামান"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"বড় করে দেখুন"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"আড়াল করুন"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"অ্যালবাম আর্ট"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"ভলিউম স্লাইডার"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"কোনও মিডিয়া বেছে নেননি"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"কোনও তথ্য নেই"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"স্ক্রিন কাস্ট করা হচ্ছে"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"একটি ডিভাইস যোগ করুন"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"গ্রুপে প্লে করুন"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"কোনও তথ্য নেই"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"সিস্টেম"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"ডিভাইস"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"কাস্ট করার বোতাম"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"কাস্ট করার বোতাম। কানেক্ট করা নেই"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"কাস্ট করার বোতাম। কানেক্ট করা হচ্ছে"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"কাস্ট করার বোতাম। কানেক্ট হয়েছে"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"এখানে কাস্ট করুন:"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"ডিভাইস খোঁজা হচ্ছে"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"কানেকশন বিচ্ছিন্ন করুন"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"কাস্ট করা বন্ধ করুন"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"বন্ধ করুন"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"চালান"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"পজ করুন"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"থামান"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"বড় করে দেখুন"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"আড়াল করুন"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"অ্যালবাম আর্ট"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"ভলিউম স্লাইডার"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"কোনও মিডিয়া বেছে নেননি"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"কোনও তথ্য নেই"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"স্ক্রিন কাস্ট করা হচ্ছে"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"একটি ডিভাইস যোগ করুন"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"গ্রুপে প্লে করুন"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"কোনও তথ্য নেই"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-bs/strings.xml b/mediarouter/mediarouter/src/main/res/values-bs/strings.xml
index 808b18a..accf0a7 100644
--- a/mediarouter/mediarouter/src/main/res/values-bs/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-bs/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistem"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Uređaji"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Dugme za emitiranje"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Dugme za emitiranje. Veza je prekinuta"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Dugme za emitiranje. Povezivanje"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Dugme za emitiranje. Povezano"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Emitiranje na"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Traženje uređaja"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Prekini vezu"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Zaustavi emitiranje"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Zatvori"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Pokreni"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pauziraj"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Zaustavi"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Proširi"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Suzi"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Omot albuma"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Klizač za jačinu zvuka"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nije odabran nijedan medij"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nema dostupnih informacija"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Emitiranje ekrana"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Dodajte uređaj"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Reproduciranje u grupi"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nema dostupnih informacija"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistem"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Uređaji"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Dugme za emitiranje"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Dugme za emitiranje. Veza je prekinuta"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Dugme za emitiranje. Povezivanje"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Dugme za emitiranje. Povezano"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Emitiranje na"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Traženje uređaja"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Prekini vezu"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Zaustavi emitiranje"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Zatvori"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Pokreni"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pauziraj"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Zaustavi"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Proširi"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Suzi"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Omot albuma"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Klizač za jačinu zvuka"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nije odabran nijedan medij"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nema dostupnih informacija"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Emitiranje ekrana"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Dodajte uređaj"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproduciranje u grupi"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nema dostupnih informacija"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ca/strings.xml b/mediarouter/mediarouter/src/main/res/values-ca/strings.xml
index 7f9b3f3..9adef40 100644
--- a/mediarouter/mediarouter/src/main/res/values-ca/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ca/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistema"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Dispositius"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Botó d\'emetre"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Botó d\'emetre. Desconnectat."</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Botó d\'emetre. S\'està connectant."</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Botó d\'emetre. Connectat."</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Emet contingut a"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"S\'estan cercant dispositius"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Desconnecta"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Atura l\'emissió"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Tanca"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Reprodueix"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Posa en pausa"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Atura"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Desplega"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Replega"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Imatge de l\'àlbum"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Control lliscant de volum"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"No hi ha contingut multimèdia seleccionat"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"No hi ha informació disponible"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"S\'està emetent la pantalla"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Afegeix un dispositiu"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Reprodueix en un grup"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"No hi ha informació disponible"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistema"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Dispositius"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Botó d\'emetre"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Botó d\'emetre. Desconnectat."</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Botó d\'emetre. S\'està connectant."</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Botó d\'emetre. Connectat."</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Emet contingut a"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"S\'estan cercant dispositius"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Desconnecta"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Atura l\'emissió"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Tanca"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Reprodueix"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Posa en pausa"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Atura"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Desplega"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Replega"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Imatge de l\'àlbum"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Control lliscant de volum"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"No hi ha contingut multimèdia seleccionat"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"No hi ha informació disponible"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"S\'està emetent la pantalla"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Afegeix un dispositiu"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reprodueix en un grup"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No hi ha informació disponible"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-cs/strings.xml b/mediarouter/mediarouter/src/main/res/values-cs/strings.xml
index 9593065..9533869 100644
--- a/mediarouter/mediarouter/src/main/res/values-cs/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-cs/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Systém"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Zařízení"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Tlačítko odesílání"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Tlačítko odesílání. Odpojeno"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Tlačítko odesílání. Připojování"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Tlačítko odesílání. Připojeno"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Odeslat do zařízení"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Hledání zařízení"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Odpojit"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Zastavit odesílání"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Zavřít"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Přehrát"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pozastavit"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Zastavit"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Rozbalit"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Sbalit"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Obal alba"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Posuvník hlasitosti"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Není vybrán žádný mediální obsah"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nejsou k dispozici žádné informace"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Odesílání obsahu obrazovky"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Přidání zařízení"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Přehrávání ve skupině"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nejsou k dispozici žádné informace"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Systém"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Zařízení"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Tlačítko odesílání"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Tlačítko odesílání. Odpojeno"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Tlačítko odesílání. Připojování"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Tlačítko odesílání. Připojeno"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Odeslat do zařízení"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Hledání zařízení"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Odpojit"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Zastavit odesílání"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Zavřít"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Přehrát"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pozastavit"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Zastavit"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Rozbalit"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Sbalit"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Obal alba"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Posuvník hlasitosti"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Není vybrán žádný mediální obsah"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nejsou k dispozici žádné informace"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Odesílání obsahu obrazovky"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Přidání zařízení"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Přehrávání ve skupině"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nejsou k dispozici žádné informace"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-da/strings.xml b/mediarouter/mediarouter/src/main/res/values-da/strings.xml
index f4e24f4..6624f000 100644
--- a/mediarouter/mediarouter/src/main/res/values-da/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-da/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"System"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Enheder"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast-knap"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast-knap. Forbindelsen er afbrudt"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast-knap. Opretter forbindelse"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast-knap. Der er oprettet forbindelse"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Cast til"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Finder enheder"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Afbryd forbindelse"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Stop cast"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Luk"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Afspil"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Sæt på pause"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stop"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Udvid"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Skjul"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albumgrafik"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Lydstyrkeskyder"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Ingen medier er markeret"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Der er ingen tilgængelige oplysninger"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Skærmen castes"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Tilføj en enhed"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Afspil på en gruppe"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Der er ingen tilgængelige oplysninger"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"System"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Enheder"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast-knap"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast-knap. Forbindelsen er afbrudt"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast-knap. Opretter forbindelse"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast-knap. Der er oprettet forbindelse"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Cast til"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Finder enheder"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Afbryd forbindelse"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Stop cast"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Luk"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Afspil"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Sæt på pause"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stop"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Udvid"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Skjul"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albumgrafik"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Lydstyrkeskyder"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Ingen medier er markeret"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Der er ingen tilgængelige oplysninger"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Skærmen castes"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Tilføj en enhed"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Afspil på en gruppe"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Der er ingen tilgængelige oplysninger"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-de/strings.xml b/mediarouter/mediarouter/src/main/res/values-de/strings.xml
index 56a9047..5ea8de9 100644
--- a/mediarouter/mediarouter/src/main/res/values-de/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-de/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"System"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Geräte"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast-Symbol"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast-Symbol. Nicht verbunden."</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast-Symbol. Verbindung wird hergestellt."</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast-Symbol. Verbunden."</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Streamen auf"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Geräte werden gesucht"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Trennen"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Streaming beenden"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Schließen"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Wiedergabe"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pause"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stopp"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Maximieren"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Minimieren"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albumcover"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Schieberegler für die Lautstärke"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Keine Medien ausgewählt"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Keine Informationen verfügbar"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Bildschirm wird übertragen"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Gerät hinzufügen"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Auf einem Gruppengerät abspielen"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Keine Informationen verfügbar"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"System"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Geräte"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast-Symbol"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast-Symbol. Nicht verbunden."</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast-Symbol. Verbindung wird hergestellt."</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast-Symbol. Verbunden."</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Streamen auf"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Geräte werden gesucht"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Trennen"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Streaming beenden"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Schließen"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Wiedergabe"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pause"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stopp"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Maximieren"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Minimieren"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albumcover"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Schieberegler für die Lautstärke"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Keine Medien ausgewählt"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Keine Informationen verfügbar"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Bildschirm wird übertragen"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Gerät hinzufügen"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Auf einem Gruppengerät abspielen"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Keine Informationen verfügbar"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-el/strings.xml b/mediarouter/mediarouter/src/main/res/values-el/strings.xml
index 66a100f..ea1cbdc 100644
--- a/mediarouter/mediarouter/src/main/res/values-el/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-el/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Σύστημα"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Συσκευές"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Κουμπί μετάδοσης"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Κουμπί μετάδοσης. Αποσυνδέθηκε"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Κουμπί μετάδοσης. Σύνδεση"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Κουμπί μετάδοσης. Συνδέθηκε"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Μετάδοση σε"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Εύρεση συσκευών"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Αποσύνδεση"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Διακοπή μετάδοσης"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Κλείσιμο"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Αναπαραγωγή"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Παύση"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Διακοπή"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Ανάπτυξη"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Σύμπτυξη"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Εξώφυλλο άλμπουμ"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Ρυθμιστικό έντασης ήχου"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Δεν επιλέχθηκαν μέσα"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Δεν υπάρχουν διαθέσιμες πληροφορίες"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Μετάδοση οθόνης"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Προσθήκη συσκευής"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Αναπαραγωγή σε κάποια ομάδα"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Δεν υπάρχουν διαθέσιμες πληροφορίες"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Σύστημα"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Συσκευές"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Κουμπί μετάδοσης"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Κουμπί μετάδοσης. Αποσυνδέθηκε"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Κουμπί μετάδοσης. Σύνδεση"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Κουμπί μετάδοσης. Συνδέθηκε"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Μετάδοση σε"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Εύρεση συσκευών"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Αποσύνδεση"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Διακοπή μετάδοσης"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Κλείσιμο"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Αναπαραγωγή"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Παύση"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Διακοπή"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Ανάπτυξη"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Σύμπτυξη"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Εξώφυλλο άλμπουμ"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Ρυθμιστικό έντασης ήχου"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Δεν επιλέχθηκαν μέσα"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Δεν υπάρχουν διαθέσιμες πληροφορίες"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Μετάδοση οθόνης"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Προσθήκη συσκευής"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Αναπαραγωγή σε κάποια ομάδα"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Δεν υπάρχουν διαθέσιμες πληροφορίες"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rAU/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rAU/strings.xml
index df2025d..99b8443 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rAU/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rAU/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"System"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Devices"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast button"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast button. Disconnected"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast button. Connecting"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast button. Connected"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Cast to"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Finding devices"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Disconnect"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Stop casting"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Close"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Play"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pause"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stop"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Expand"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Collapse"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Album art"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Volume slider"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"No media selected"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"No info available"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Casting screen"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Add a device"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Play on a group"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"No info available"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"System"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Devices"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast button"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast button. Disconnected"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast button. Connecting"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast button. Connected"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Cast to"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Finding devices"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Disconnect"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Stop casting"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Close"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Play"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pause"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stop"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Expand"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Collapse"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Album art"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Volume slider"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"No media selected"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"No info available"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Casting screen"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Add a device"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Play on a group"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No info available"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml
index df2025d..99b8443 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"System"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Devices"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast button"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast button. Disconnected"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast button. Connecting"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast button. Connected"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Cast to"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Finding devices"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Disconnect"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Stop casting"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Close"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Play"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pause"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stop"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Expand"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Collapse"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Album art"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Volume slider"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"No media selected"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"No info available"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Casting screen"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Add a device"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Play on a group"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"No info available"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"System"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Devices"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast button"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast button. Disconnected"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast button. Connecting"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast button. Connected"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Cast to"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Finding devices"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Disconnect"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Stop casting"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Close"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Play"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pause"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stop"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Expand"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Collapse"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Album art"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Volume slider"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"No media selected"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"No info available"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Casting screen"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Add a device"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Play on a group"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No info available"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rGB/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rGB/strings.xml
index df2025d..99b8443 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rGB/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rGB/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"System"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Devices"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast button"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast button. Disconnected"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast button. Connecting"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast button. Connected"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Cast to"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Finding devices"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Disconnect"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Stop casting"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Close"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Play"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pause"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stop"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Expand"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Collapse"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Album art"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Volume slider"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"No media selected"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"No info available"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Casting screen"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Add a device"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Play on a group"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"No info available"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"System"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Devices"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast button"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast button. Disconnected"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast button. Connecting"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast button. Connected"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Cast to"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Finding devices"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Disconnect"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Stop casting"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Close"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Play"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pause"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stop"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Expand"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Collapse"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Album art"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Volume slider"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"No media selected"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"No info available"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Casting screen"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Add a device"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Play on a group"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No info available"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rIN/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rIN/strings.xml
index df2025d..99b8443 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rIN/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rIN/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"System"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Devices"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast button"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast button. Disconnected"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast button. Connecting"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast button. Connected"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Cast to"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Finding devices"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Disconnect"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Stop casting"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Close"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Play"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pause"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stop"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Expand"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Collapse"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Album art"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Volume slider"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"No media selected"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"No info available"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Casting screen"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Add a device"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Play on a group"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"No info available"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"System"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Devices"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast button"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast button. Disconnected"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast button. Connecting"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast button. Connected"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Cast to"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Finding devices"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Disconnect"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Stop casting"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Close"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Play"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pause"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stop"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Expand"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Collapse"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Album art"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Volume slider"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"No media selected"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"No info available"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Casting screen"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Add a device"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Play on a group"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No info available"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml
index f3eed0e..f9b1a8d 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎System‎‏‎‎‏‎"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎Devices‎‏‎‎‏‎"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎Cast button‎‏‎‎‏‎"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎Cast button. Disconnected‎‏‎‎‏‎"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎Cast button. Connecting‎‏‎‎‏‎"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‎Cast button. Connected‎‏‎‎‏‎"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎Cast to‎‏‎‎‏‎"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎Finding devices‎‏‎‎‏‎"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎Disconnect‎‏‎‎‏‎"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎Stop casting‎‏‎‎‏‎"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎Close‎‏‎‎‏‎"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎Play‎‏‎‎‏‎"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‎Pause‎‏‎‎‏‎"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎Stop‎‏‎‎‏‎"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎Expand‎‏‎‎‏‎"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎Collapse‎‏‎‎‏‎"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎Album art‎‏‎‎‏‎"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‎‎Volume slider‎‏‎‎‏‎"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‏‏‏‎‎No media selected‎‏‎‎‏‎"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎No info available‎‏‎‎‏‎"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎Casting screen‎‏‎‎‏‎"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎Add a device‎‏‎‎‏‎"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎Play on a group‎‏‎‎‏‎"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎No info available‎‏‎‎‏‎"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎System‎‏‎‎‏‎"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‎Devices‎‏‎‎‏‎"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎Cast button‎‏‎‎‏‎"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‎‏‎Cast button. Disconnected‎‏‎‎‏‎"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎Cast button. Connecting‎‏‎‎‏‎"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎Cast button. Connected‎‏‎‎‏‎"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎Cast to‎‏‎‎‏‎"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎Finding devices‎‏‎‎‏‎"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‎Disconnect‎‏‎‎‏‎"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎Stop casting‎‏‎‎‏‎"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎Close‎‏‎‎‏‎"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎Play‎‏‎‎‏‎"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎Pause‎‏‎‎‏‎"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎Stop‎‏‎‎‏‎"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎Expand‎‏‎‎‏‎"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎Collapse‎‏‎‎‏‎"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎Album art‎‏‎‎‏‎"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎Volume slider‎‏‎‎‏‎"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‎No media selected‎‏‎‎‏‎"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎No info available‎‏‎‎‏‎"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎Casting screen‎‏‎‎‏‎"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎Add a device‎‏‎‎‏‎"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎Play on a group‎‏‎‎‏‎"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎No info available‎‏‎‎‏‎"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-es-rUS/strings.xml b/mediarouter/mediarouter/src/main/res/values-es-rUS/strings.xml
index 652d55d..5ad64c4 100644
--- a/mediarouter/mediarouter/src/main/res/values-es-rUS/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-es-rUS/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistema"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Dispositivos"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Botón para transmitir"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Botón para transmitir (desconectado)"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Botón para transmitir (conectando)"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Botón para transmitir (conectado)"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Transmitir a"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Buscando dispositivos"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Desconectar"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Detener transmisión"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Cerrar"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Reproducir"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pausa"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Detener"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Expandir"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Contraer"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Imagen del álbum"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Control deslizante del volumen"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"No se seleccionó contenido multimedia"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Sin información disponible"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Transmitiendo pantalla"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Agregar un dispositivo"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Reproducir en un grupo"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Sin información disponible"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistema"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Dispositivos"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Botón para transmitir"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Botón para transmitir (desconectado)"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Botón para transmitir (conectando)"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Botón para transmitir (conectado)"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Transmitir a"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Buscando dispositivos"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Desconectar"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Detener transmisión"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Cerrar"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Reproducir"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pausa"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Detener"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Expandir"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Contraer"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Imagen del álbum"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Control deslizante del volumen"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"No se seleccionó contenido multimedia"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Sin información disponible"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Transmitiendo pantalla"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Agregar un dispositivo"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproducir en un grupo"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Sin información disponible"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-es/strings.xml b/mediarouter/mediarouter/src/main/res/values-es/strings.xml
index 0f154f8..6aa752a 100644
--- a/mediarouter/mediarouter/src/main/res/values-es/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-es/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistema"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Dispositivos"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Botón de enviar"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Botón de enviar. Desconectado"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Botón de enviar. Conectando"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Botón de enviar. Conectado"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Enviar a"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Buscando dispositivos"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Desconectar"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Detener envío"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Cerrar"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Reproducir"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pausar"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Detener"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Mostrar"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Ocultar"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Carátula del álbum"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Control deslizante de volumen"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"No se ha seleccionado contenido"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"No hay información disponible"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Enviando pantalla"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Añadir un dispositivo"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Reproducir en un grupo"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"No hay información disponible"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistema"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Dispositivos"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Botón de enviar"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Botón de enviar. Desconectado"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Botón de enviar. Conectando"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Botón de enviar. Conectado"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Enviar a"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Buscando dispositivos"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Desconectar"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Detener envío"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Cerrar"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Reproducir"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pausar"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Detener"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Mostrar"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Ocultar"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Carátula del álbum"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Control deslizante de volumen"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"No se ha seleccionado contenido"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"No hay información disponible"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Enviando pantalla"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Añadir un dispositivo"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproducir en un grupo"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No hay información disponible"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-et/strings.xml b/mediarouter/mediarouter/src/main/res/values-et/strings.xml
index 59c69c7..0a1bc33 100644
--- a/mediarouter/mediarouter/src/main/res/values-et/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-et/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Süsteem"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Seadmed"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Ülekandenupp"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Ülekandenupp. Ühendus on katkestatud"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Ülekandenupp. Ühendamine"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Ülekandenupp. Ühendatud"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Ülekandmine seadmesse"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Seadmete otsimine"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Katkesta ühendus"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Katkesta ülekandmine"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Sule"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Esita"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Peata"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Katkesta"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Laienda"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Ahenda"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albumi kujundus"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Helitugevuse liugur"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Meediat pole valitud"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Teave pole saadaval"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Ekraanikuva ülekandmine"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Seadme lisamine"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Grupis esitamine"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Teave puudub"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Süsteem"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Seadmed"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Ülekandenupp"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Ülekandenupp. Ühendus on katkestatud"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Ülekandenupp. Ühendamine"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Ülekandenupp. Ühendatud"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Ülekandmine seadmesse"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Seadmete otsimine"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Katkesta ühendus"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Katkesta ülekandmine"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Sule"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Esita"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Peata"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Katkesta"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Laienda"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Ahenda"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albumi kujundus"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Helitugevuse liugur"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Meediat pole valitud"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Teave pole saadaval"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Ekraanikuva ülekandmine"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Seadme lisamine"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Grupis esitamine"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Teave puudub"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-eu/strings.xml b/mediarouter/mediarouter/src/main/res/values-eu/strings.xml
index b330468..2681644 100644
--- a/mediarouter/mediarouter/src/main/res/values-eu/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-eu/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistema"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Gailuak"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"\"Igorri\" botoia"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"\"Igorri\" botoia. Deskonektatuta."</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"\"Igorri\" botoia. Konektatzen."</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"\"Igorri\" botoia. Konektatuta."</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Igorri hona"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Gailuak bilatzen"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Deskonektatu"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Utzi igortzeari"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Itxi"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Erreproduzitu"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pausatu"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Gelditu"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Zabaldu"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Tolestu"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albumaren azala"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Bolumenaren graduatzailea"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Ez da hautatu multimedia-edukirik"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Ez dago informaziorik"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Pantaila igortzen"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Gehitu gailu bat"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Erreproduzitu talde batean"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Ez dago informaziorik"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistema"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Gailuak"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"\"Igorri\" botoia"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"\"Igorri\" botoia. Deskonektatuta."</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"\"Igorri\" botoia. Konektatzen."</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"\"Igorri\" botoia. Konektatuta."</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Igorri hona"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Gailuak bilatzen"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Deskonektatu"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Utzi igortzeari"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Itxi"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Erreproduzitu"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pausatu"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Gelditu"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Zabaldu"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Tolestu"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albumaren azala"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Bolumenaren graduatzailea"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Ez da hautatu multimedia-edukirik"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Ez dago informaziorik"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Pantaila igortzen"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Gehitu gailu bat"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Erreproduzitu talde batean"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Ez dago informaziorik"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-fa/strings.xml b/mediarouter/mediarouter/src/main/res/values-fa/strings.xml
index ab602de..3e05277 100644
--- a/mediarouter/mediarouter/src/main/res/values-fa/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-fa/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"سیستم"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"دستگاه‌ها"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"دکمه فرستادن"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"دکمه فرستادن. اتصال قطع شد"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"دکمه فرستادن. درحال اتصال"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"دکمه فرستادن. متصل"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"ارسال محتوا به"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"درحال پیدا کردن دستگاه‌ها"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"قطع اتصال"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"توقف ارسال محتوا"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"بستن"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"پخش"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"مکث"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"توقف"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"بزرگ کردن"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"کوچک کردن"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"عکس روی جلد آلبوم"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"لغزنده میزان صدا"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"رسانه‌ای انتخاب نشده است"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"اطلاعاتی دردسترس نیست"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"صفحه ارسال محتوا"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"افزودن دستگاه"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"بازی در گروه"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"اطلاعاتی دردسترس نیست"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"سیستم"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"دستگاه‌ها"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"دکمه فرستادن"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"دکمه فرستادن. اتصال قطع شد"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"دکمه فرستادن. درحال اتصال"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"دکمه فرستادن. متصل"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"ارسال محتوا به"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"درحال پیدا کردن دستگاه‌ها"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"قطع اتصال"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"توقف ارسال محتوا"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"بستن"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"پخش"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"مکث"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"توقف"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"بزرگ کردن"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"کوچک کردن"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"عکس روی جلد آلبوم"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"لغزنده میزان صدا"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"رسانه‌ای انتخاب نشده است"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"اطلاعاتی در دسترس نیست"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"صفحه ارسال محتوا"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"افزودن دستگاه"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"بازی در گروه"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"اطلاعاتی در دسترس نیست"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-fi/strings.xml b/mediarouter/mediarouter/src/main/res/values-fi/strings.xml
index ebffb88..c3a81af 100644
--- a/mediarouter/mediarouter/src/main/res/values-fi/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-fi/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Järjestelmä"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Laitteet"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast-painike"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast-painike. Yhteys katkaistu"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast-painike. Yhdistetään"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast-painike. Yhdistetty"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Katso TV:stä"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Etsitään laitteita"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Katkaise yhteys"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Lopeta suoratoisto"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Sulje"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Toista"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Keskeytä"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Pysäytä"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Laajenna"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Tiivistä"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albumin kansikuva"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Äänenvoimakkuuden liukusäädin"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Ei valittua mediaa"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Ei tietoja saatavilla"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Suoratoistetaan näyttöä"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Lisää laite"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Toista ryhmässä"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Ei tietoja saatavilla"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Järjestelmä"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Laitteet"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast-painike"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast-painike. Yhteys katkaistu"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast-painike. Yhdistetään"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast-painike. Yhdistetty"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Katso TV:stä"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Etsitään laitteita"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Katkaise yhteys"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Lopeta suoratoisto"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Sulje"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Toista"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Keskeytä"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Pysäytä"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Laajenna"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Tiivistä"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albumin kansikuva"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Äänenvoimakkuuden liukusäädin"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Ei valittua mediaa"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Ei tietoja saatavilla"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Suoratoistetaan näyttöä"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Lisää laite"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Toista ryhmässä"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Ei tietoja saatavilla"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-fr-rCA/strings.xml b/mediarouter/mediarouter/src/main/res/values-fr-rCA/strings.xml
index 6a8edba..0df2693 100644
--- a/mediarouter/mediarouter/src/main/res/values-fr-rCA/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-fr-rCA/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Système"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Appareils"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Bouton Diffuser"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Bouton Diffuser. Déconnecté"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Bouton Diffuser. Connexion en cours…"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Bouton Diffuser. Connecté"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Diffuser vers"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Recherche d\'appareils en cours…"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Déconnecter"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Arrêter la diffusion"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Fermer"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Lire"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pause"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Arrêter"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Développer"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Réduire"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Image de l\'album"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Curseur de réglage du volume"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Aucun média sélectionné"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Aucune donnée trouvée"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Diffusion de l\'écran en cours…"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Ajouter un appareil"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Faire jouer sur un groupe d\'appareils"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Aucune donnée trouvée"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Système"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Appareils"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Bouton Diffuser"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Bouton Diffuser. Déconnecté"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Bouton Diffuser. Connexion en cours…"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Bouton Diffuser. Connecté"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Diffuser vers"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Recherche d\'appareils en cours…"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Déconnecter"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Arrêter la diffusion"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Fermer"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Lire"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pause"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Arrêter"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Développer"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Réduire"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Image de l\'album"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Curseur de réglage du volume"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Aucun média sélectionné"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Aucune donnée trouvée"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Diffusion de l\'écran en cours…"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Ajouter un appareil"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Faire jouer sur un groupe d\'appareils"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Aucune donnée trouvée"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-fr/strings.xml b/mediarouter/mediarouter/src/main/res/values-fr/strings.xml
index 5da7108..a769835 100644
--- a/mediarouter/mediarouter/src/main/res/values-fr/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-fr/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Système"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Appareils"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Icône Cast"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Icône Cast. Déconnecté"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Icône Cast. Connexion…"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Icône Cast. Connecté"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Caster sur"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Recherche d\'appareils…"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Déconnecter"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Arrêter la diffusion"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Fermer"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Lecture"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pause"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Arrêt"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Développer"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Réduire"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Image de l\'album"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Curseur de volume"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Aucun contenu multimédia sélectionné"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Aucune information disponible"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Diffusion de l\'écran…"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Ajouter un appareil"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Lire sur un groupe d\'appareils"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Aucune information disponible"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Système"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Appareils"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Icône Cast"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Icône Cast. Déconnecté"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Icône Cast. Connexion…"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Icône Cast. Connecté"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Caster sur"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Recherche d\'appareils…"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Déconnecter"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Arrêter la diffusion"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Fermer"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Lecture"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pause"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Arrêt"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Développer"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Réduire"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Image de l\'album"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Curseur de volume"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Aucun contenu multimédia sélectionné"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Aucune information disponible"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Diffusion de l\'écran…"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Ajouter un appareil"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Lire sur un groupe d\'appareils"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Aucune information disponible"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-gl/strings.xml b/mediarouter/mediarouter/src/main/res/values-gl/strings.xml
index 13620f3..0aefa05 100644
--- a/mediarouter/mediarouter/src/main/res/values-gl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-gl/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistema"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Dispositivos"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Botón de emitir"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Botón de emitir. Desconectado"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Botón de emitir. Conectando"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Botón de emitir. Conectado"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Emitir en"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Buscando dispositivos"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Desconectar"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Deter emisión"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Pechar"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Reproducir"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pór en pausa"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Deter"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Despregar"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Contraer"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Portada do álbum"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Control desprazable do volume"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Non se seleccionou ningún recurso multimedia"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Non hai información dispoñible"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Emitindo pantalla"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Engadir un dispositivo"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Reproducir nun grupo"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Non hai información dispoñible"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistema"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Dispositivos"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Botón de emitir"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Botón de emitir. Desconectado"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Botón de emitir. Conectando"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Botón de emitir. Conectado"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Emitir en"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Buscando dispositivos"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Desconectar"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Deter emisión"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Pechar"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Reproducir"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pór en pausa"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Deter"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Despregar"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Contraer"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Portada do álbum"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Control desprazable do volume"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Non se seleccionou ningún recurso multimedia"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Non hai información dispoñible"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Emitindo pantalla"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Engadir un dispositivo"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproducir nun grupo"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Non hai información dispoñible"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-gu/strings.xml b/mediarouter/mediarouter/src/main/res/values-gu/strings.xml
index 450364c..e3dc2f8 100644
--- a/mediarouter/mediarouter/src/main/res/values-gu/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-gu/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"સિસ્ટમ"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"ઉપકરણો"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"કાસ્ટ બટન"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"કાસ્ટ બટન. ડિસ્કનેક્ટેડ"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"કાસ્ટ બટન. કનેક્ટ કરી રહ્યાં છીએ"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"કાસ્ટ બટન. કનેક્ટેડ"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"આના પર કાસ્ટ કરો"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"ઉપકરણો શોધી રહ્યાં છીએ"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"ડિસ્કનેક્ટ કરો"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"કાસ્ટ કરવાનું રોકો"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"બંધ કરો"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"ચલાવો"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"થોભાવો"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"રોકો"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"વિસ્તાર કરો"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"સંકુચિત કરો"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"આલ્બમ આર્ટ"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"વૉલ્યુમ સ્લાઇડર"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"કોઈ મીડિયા પસંદ કરેલ નથી"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"કોઈ માહિતી ઉપલબ્ધ નથી"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"સ્ક્રીનને કાસ્ટ કરી રહ્યાં છીએ"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"ડિવાઇસ ઉમેરો"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"જૂથમાં રમો"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"કોઈ માહિતી ઉપલબ્ધ નથી"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"સિસ્ટમ"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"ઉપકરણો"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"કાસ્ટ બટન"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"કાસ્ટ બટન. ડિસ્કનેક્ટેડ"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"કાસ્ટ બટન. કનેક્ટ કરી રહ્યાં છીએ"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"કાસ્ટ બટન. કનેક્ટેડ"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"આના પર કાસ્ટ કરો"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"ઉપકરણો શોધી રહ્યાં છીએ"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"ડિસ્કનેક્ટ કરો"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"કાસ્ટ કરવાનું રોકો"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"બંધ કરો"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"ચલાવો"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"થોભાવો"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"રોકો"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"વિસ્તાર કરો"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"સંકુચિત કરો"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"આલ્બમ આર્ટ"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"વૉલ્યુમ સ્લાઇડર"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"કોઈ મીડિયા પસંદ કરેલ નથી"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"કોઈ માહિતી ઉપલબ્ધ નથી"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"સ્ક્રીનને કાસ્ટ કરી રહ્યાં છીએ"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"ડિવાઇસ ઉમેરો"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"જૂથમાં રમો"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"કોઈ માહિતી ઉપલબ્ધ નથી"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-hi/strings.xml b/mediarouter/mediarouter/src/main/res/values-hi/strings.xml
index 6435ef1..10934a1 100644
--- a/mediarouter/mediarouter/src/main/res/values-hi/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-hi/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"सिस्टम"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"डिवाइस"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"कास्ट बटन"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"कास्ट बटन. डिसकनेक्ट हो गया"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"कास्ट बटन. कनेक्ट हो रहा है"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"कास्ट बटन. कनेक्ट हो गया"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"इस पर कास्‍ट करें"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"डिवाइस ढूंढे जा रहे हैं"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"डिसकनेक्ट करें"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"कास्ट करना रोकें"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"बंद करें"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"चलाएं"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"रोकें"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"बंद करें"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"बड़ा करके देखें"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"छोटा करें"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"एल्बम आर्ट"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"आवाज़ बढ़ाने या घटाने वाला स्लाइडर"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"कोई मीडिया नहीं चुना गया"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"कोई जानकारी मौजूद नहीं है"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"स्क्रीन कास्ट की जा रही है"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"कोई डिवाइस जोड़ें"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"समूह में खेलें"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"कोई जानकारी मौजूद नहीं है"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"सिस्टम"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"डिवाइस"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"कास्ट बटन"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"कास्ट बटन. डिसकनेक्ट हो गया"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"कास्ट बटन. कनेक्ट हो रहा है"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"कास्ट बटन. कनेक्ट हो गया"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"इस पर कास्‍ट करें"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"डिवाइस ढूंढे जा रहे हैं"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"डिसकनेक्ट करें"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"कास्ट करना रोकें"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"बंद करें"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"चलाएं"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"रोकें"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"बंद करें"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"बड़ा करके देखें"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"छोटा करें"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"एल्बम आर्ट"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"आवाज़ बढ़ाने या घटाने वाला स्लाइडर"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"कोई मीडिया नहीं चुना गया"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"कोई जानकारी मौजूद नहीं है"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"स्क्रीन कास्ट की जा रही है"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"कोई डिवाइस जोड़ें"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"समूह में खेलें"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"कोई जानकारी मौजूद नहीं है"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-hr/strings.xml b/mediarouter/mediarouter/src/main/res/values-hr/strings.xml
index b806ad8..fcef77f 100644
--- a/mediarouter/mediarouter/src/main/res/values-hr/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-hr/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sustav"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Uređaji"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Gumb za emitiranje"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Gumb za emitiranje. Veza prekinuta"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Gumb za emitiranje. Povezivanje"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Gumb za emitiranje. Povezan"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Emitiranje na"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Traženje uređaja"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Prekini vezu"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Zaustavi emitiranje"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Zatvori"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Reproduciraj"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pauziraj"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Zaustavi"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Proširi"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Sažmi"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Naslovnica albuma"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Klizač za glasnoću"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nije odabran nijedan medij"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Informacije nisu dostupne"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Emitiranje zaslona"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Dodavanje uređaja"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Reprodukcija u grupi"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Informacije nisu dostupne"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sustav"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Uređaji"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Gumb za emitiranje"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Gumb za emitiranje. Veza prekinuta"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Gumb za emitiranje. Povezivanje"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Gumb za emitiranje. Povezan"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Emitiranje na"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Traženje uređaja"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Prekini vezu"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Zaustavi emitiranje"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Zatvori"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Reproduciraj"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pauziraj"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Zaustavi"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Proširi"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Sažmi"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Naslovnica albuma"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Klizač za glasnoću"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nije odabran nijedan medij"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Informacije nisu dostupne"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Emitiranje zaslona"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Dodavanje uređaja"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reprodukcija u grupi"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Informacije nisu dostupne"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-hu/strings.xml b/mediarouter/mediarouter/src/main/res/values-hu/strings.xml
index dff238e..31397a0 100644
--- a/mediarouter/mediarouter/src/main/res/values-hu/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-hu/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Rendszer"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Eszközök"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Átküldés gomb"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Átküldés gomb. Kapcsolat bontva"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Átküldés gomb. Csatlakozás"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Átküldés gomb. Csatlakoztatva"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Átküldés ide:"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Eszközök keresése"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Leválasztás"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Átküldés leállítása"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Bezárás"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Lejátszás"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Szünet"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Leállítás"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Kibontás"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Összecsukás"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Lemezborító"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Hangerőszabályzó"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nincs kiválasztott médiatartalom"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nincs információ"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Képernyőtartalom átküldése…"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Eszköz hozzáadása"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Lejátszás eszközcsoportban"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nincs információ"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Rendszer"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Eszközök"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Átküldés gomb"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Átküldés gomb. Kapcsolat bontva"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Átküldés gomb. Csatlakozás"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Átküldés gomb. Csatlakoztatva"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Átküldés ide:"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Eszközök keresése"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Leválasztás"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Átküldés leállítása"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Bezárás"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Lejátszás"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Szünet"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Leállítás"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Kibontás"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Összecsukás"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Lemezborító"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Hangerőszabályzó"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nincs kiválasztott médiatartalom"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nincs információ"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Képernyőtartalom átküldése…"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Eszköz hozzáadása"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Lejátszás eszközcsoportban"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nincs információ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-hy/strings.xml b/mediarouter/mediarouter/src/main/res/values-hy/strings.xml
index 1aade23..b9eeab5 100644
--- a/mediarouter/mediarouter/src/main/res/values-hy/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-hy/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Համակարգ"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Սարքեր"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Հեռարձակման կոճակ"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Հեռարձակման կոճակ: Սարքն անջատած է:"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Հեռարձակման կոճակ: Սարքը միանում է:"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Հեռարձակման կոճակ: Սարքը միացված է:"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Ընտրեք սարք"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Սարքերի որոնում"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Անջատել"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Դադարեցնել հեռարձակումը"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Փակել"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Նվագարկել"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Դադարեցնել"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Կանգնեցնել"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Ծավալել"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Ծալել"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Ալբոմի շապիկ"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Ձայնի ուժգնության կարգավորիչ"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Մեդիա ֆայլ չի ընտրվել"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Տեղեկություններ չկան"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Էկրանի հեռարձակում"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Ավելացրեք սարք"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Նվագարկեք սարքերի խմբում"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Հասանելի տեղեկություններ չկան"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Համակարգ"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Սարքեր"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Հեռարձակման կոճակ"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Հեռարձակման կոճակ: Սարքն անջատած է:"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Հեռարձակման կոճակ: Սարքը միանում է:"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Հեռարձակման կոճակ: Սարքը միացված է:"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Ընտրեք սարք"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Սարքերի որոնում"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Անջատել"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Դադարեցնել հեռարձակումը"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Փակել"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Նվագարկել"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Դադարեցնել"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Կանգնեցնել"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Ծավալել"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Ծալել"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Ալբոմի շապիկ"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Ձայնի ուժգնության կարգավորիչ"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Մեդիա ֆայլ չի ընտրվել"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Տեղեկություններ չկան"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Էկրանի հեռարձակում"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Ավելացրեք սարք"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Նվագարկեք սարքերի խմբում"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Հասանելի տեղեկություններ չկան"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-in/strings.xml b/mediarouter/mediarouter/src/main/res/values-in/strings.xml
index 1916221..70ba8f1 100644
--- a/mediarouter/mediarouter/src/main/res/values-in/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-in/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistem"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Perangkat"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Tombol Cast"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Tombol Cast. Terputus"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Tombol Cast. Menghubungkan"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Tombol Cast. Terhubung"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Transmisikan ke"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Mencari perangkat"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Putuskan hubungan"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Hentikan transmisi"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Tutup"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Putar"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Jeda"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Berhenti"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Luaskan"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Ciutkan"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Sampul album"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Pengatur volume"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Tidak ada media yang dipilih"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Tidak ada info yang tersedia"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Melakukan cast layar"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Tambahkan perangkat"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Putar di grup"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Info tidak tersedia"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistem"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Perangkat"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Tombol Cast"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Tombol Cast. Terputus"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Tombol Cast. Menghubungkan"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Tombol Cast. Terhubung"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Transmisikan ke"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Mencari perangkat"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Putuskan hubungan"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Hentikan transmisi"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Tutup"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Putar"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Jeda"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Berhenti"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Luaskan"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Ciutkan"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Sampul album"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Pengatur volume"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Tidak ada media yang dipilih"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Tidak ada info yang tersedia"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Melakukan cast layar"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Tambahkan perangkat"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Putar di grup"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Info tidak tersedia"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-is/strings.xml b/mediarouter/mediarouter/src/main/res/values-is/strings.xml
index 1a5fc00..25516d7 100644
--- a/mediarouter/mediarouter/src/main/res/values-is/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-is/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Kerfi"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Tæki"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Útsendingarhnappur"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Útsendingarhnappur. Aftengt"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Útsendingarhnappur. Tengist"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Útsendingarhnappur. Tengt"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Senda út í"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Leitað að tækjum"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Aftengja"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Stöðva útsendingu"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Loka"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Spila"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Gera hlé"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stöðva"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Stækka"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Draga saman"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Plötuumslag"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Hljóðstyrkssleði"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Ekkert efni valið"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Engar upplýsingar í boði"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Skjár sendur út"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Bæta tæki við"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Spila í hóp"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Engar upplýsingar í boði"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Kerfi"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Tæki"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Útsendingarhnappur"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Útsendingarhnappur. Aftengt"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Útsendingarhnappur. Tengist"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Útsendingarhnappur. Tengt"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Senda út í"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Leitað að tækjum"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Aftengja"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Stöðva útsendingu"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Loka"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Spila"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Gera hlé"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stöðva"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Stækka"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Draga saman"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Plötuumslag"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Hljóðstyrkssleði"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Ekkert efni valið"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Engar upplýsingar í boði"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Skjár sendur út"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Bæta tæki við"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Spila í hóp"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Engar upplýsingar í boði"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-it/strings.xml b/mediarouter/mediarouter/src/main/res/values-it/strings.xml
index a0b85ea..46341fe 100644
--- a/mediarouter/mediarouter/src/main/res/values-it/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-it/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistema"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Dispositivi"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Pulsante Trasmetti"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Pulsante Trasmetti. Disconnesso"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Pulsante Trasmetti. Connessione in corso"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Pulsante Trasmetti. Connesso"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Trasmetti a"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Ricerca di dispositivi"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Disconnetti"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Interrompi trasmissione"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Chiudi"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Riproduci"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Metti in pausa"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Interrompi"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Espandi"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Comprimi"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Copertina dell\'album"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Dispositivo di scorrimento del volume"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nessun contenuto multimediale selezionato"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nessuna informazione disponibile"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Trasmissione dello schermo attiva"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Aggiungi un dispositivo"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Riproduci su un gruppo"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nessuna informazione disponibile"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistema"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Dispositivi"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Pulsante Trasmetti"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Pulsante Trasmetti. Disconnesso"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Pulsante Trasmetti. Connessione in corso"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Pulsante Trasmetti. Connesso"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Trasmetti a"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Ricerca di dispositivi"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Disconnetti"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Interrompi trasmissione"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Chiudi"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Riproduci"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Metti in pausa"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Interrompi"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Espandi"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Comprimi"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Copertina dell\'album"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Dispositivo di scorrimento del volume"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nessun contenuto multimediale selezionato"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nessuna informazione disponibile"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Trasmissione dello schermo attiva"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Aggiungi un dispositivo"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Riproduci su un gruppo"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nessuna informazione disponibile"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-iw/strings.xml b/mediarouter/mediarouter/src/main/res/values-iw/strings.xml
index 5a6154a..2c23981 100644
--- a/mediarouter/mediarouter/src/main/res/values-iw/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-iw/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"מערכת"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"מכשירים"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"‏לחצן הפעלת Cast"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"‏לחצן הפעלת Cast. מנותק"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"‏לחצן הפעלת Cast. מתחבר"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"‏לחצן הפעלת Cast. מחובר"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"העברה אל"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"מתבצע חיפוש מכשירים"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"ניתוק"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"עצירת העברה"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"סגירה"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"הפעלה"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"השהיה"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"הפסקה"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"הרחבה"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"כיווץ"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"עטיפת אלבום"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"מחוון עוצמה"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"לא נבחרה מדיה"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"אין מידע זמין"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"העברת מסך מתבצעת"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"הוספת מכשיר"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"הפעלה בקבוצה"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"אין מידע זמין"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"מערכת"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"מכשירים"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"‏לחצן הפעלת Cast"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"‏לחצן הפעלת Cast. מנותק"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"‏לחצן הפעלת Cast. מתחבר"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"‏לחצן הפעלת Cast. מחובר"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"העברה אל"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"מתבצע חיפוש מכשירים"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"ניתוק"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"עצירת העברה"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"סגירה"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"הפעלה"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"השהיה"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"הפסקה"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"הרחבה"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"כיווץ"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"עטיפת אלבום"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"מחוון עוצמה"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"לא נבחרה מדיה"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"אין מידע זמין"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"העברת מסך מתבצעת"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"הוספת מכשיר"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"הפעלה בקבוצה"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"אין מידע זמין"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ja/strings.xml b/mediarouter/mediarouter/src/main/res/values-ja/strings.xml
index 21f712a..4594812 100644
--- a/mediarouter/mediarouter/src/main/res/values-ja/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ja/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"システム"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"デバイス"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"キャスト アイコン"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"キャスト アイコン。接続解除済み"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"キャスト アイコン。接続中"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"キャスト アイコン。接続済み"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"キャスト先"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"デバイスを検出しています"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"接続を解除"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"キャストを停止"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"閉じる"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"再生"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"一時停止"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"停止"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"展開"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"折りたたむ"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"アルバムアート"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"音量スライダー"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"メディアが選択されていません"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"情報がありません"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"画面をキャストしています"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"デバイスの追加"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"グループで再生"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"情報がありません"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"システム"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"デバイス"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"キャスト アイコン"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"キャスト アイコン。接続解除済み"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"キャスト アイコン。接続中"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"キャスト アイコン。接続済み"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"キャスト先"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"デバイスを検出しています"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"接続を解除"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"キャストを停止"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"閉じる"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"再生"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"一時停止"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"停止"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"展開"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"折りたたむ"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"アルバムアート"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"音量スライダー"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"メディアが選択されていません"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"情報がありません"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"画面をキャストしています"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"デバイスの追加"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"グループで再生"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"情報がありません"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ka/strings.xml b/mediarouter/mediarouter/src/main/res/values-ka/strings.xml
index 01aa780..cac6410 100644
--- a/mediarouter/mediarouter/src/main/res/values-ka/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ka/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"სისტემა"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"მოწყობილობები"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"ტრანსლირების ღილაკი"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"ტრანსლირების ღილაკი. გათიშული"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"ტრანსლირების ღილაკი. მიმდინარეობს დაკავშირება"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"ტრანსლირების ღილაკი. დაკავშირებული"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"ტრანსლირება"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"მიმდინარეობს მოწყობილობების მოძიება"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"გათიშვა"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"ტრანსლირების შეწყვეტა"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"დახურვა"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"დაკვრა"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"პაუზა"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"შეწყვეტა"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"გაშლა"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"ჩაკეცვა"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"ალბომის გარეკანი"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"ხმის სლაიდერი"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"მედია არჩეული არ არის"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"ინფორმაცია არ არის ხელმისაწვდომი"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"მიმდინარეობს ეკრანის ტრანსლირება"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"მოწყობილობის დამატება"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"ჯგუფში დაკვრა"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"ინფორმაცია მიუწვდომელია"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"სისტემა"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"მოწყობილობები"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"ტრანსლირების ღილაკი"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"ტრანსლირების ღილაკი. გათიშული"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"ტრანსლირების ღილაკი. მიმდინარეობს დაკავშირება"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"ტრანსლირების ღილაკი. დაკავშირებული"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"ტრანსლირება"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"მიმდინარეობს მოწყობილობების მოძიება"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"გათიშვა"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"ტრანსლირების შეწყვეტა"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"დახურვა"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"დაკვრა"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"პაუზა"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"შეწყვეტა"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"გაშლა"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"ჩაკეცვა"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"ალბომის გარეკანი"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"ხმის სლაიდერი"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"მედია არჩეული არ არის"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"ინფორმაცია არ არის ხელმისაწვდომი"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"მიმდინარეობს ეკრანის ტრანსლირება"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"მოწყობილობის დამატება"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ჯგუფში დაკვრა"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ინფორმაცია მიუწვდომელია"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-kk/strings.xml b/mediarouter/mediarouter/src/main/res/values-kk/strings.xml
index 312669d9..bb5c18a 100644
--- a/mediarouter/mediarouter/src/main/res/values-kk/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-kk/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Жүйе"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Құрылғылар"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Трансляциялау түймесі"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Трансляциялау түймесі. Ажыратылды"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Трансляциялау түймесі. Қосылуда"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Трансляциялау түймесі. Қосылды"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Келесіге трансляциялау:"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Құрылғылар ізделуде"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Ажырату"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Трансляцияны тоқтату"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Жабу"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Ойнату"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Кідірту"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Тоқтату"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Жаю"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Жию"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Альбомның мұқабасы"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Дыбыс деңгейінің жүгірткісі"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Ешқандай медиафайл таңдалмаған"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Ешқандай ақпарат жоқ"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Экран трансляциялануда"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Құрылғы енгізу"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Топта ойнату"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Ешқандай ақпарат жоқ"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Жүйе"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Құрылғылар"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Трансляциялау түймесі"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Трансляциялау түймесі. Ажыратылды"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Трансляциялау түймесі. Қосылуда"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Трансляциялау түймесі. Қосылды"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Келесіге трансляциялау:"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Құрылғылар ізделуде"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Ажырату"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Трансляцияны тоқтату"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Жабу"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Ойнату"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Кідірту"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Тоқтату"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Жаю"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Жию"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Альбомның мұқабасы"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Дыбыс деңгейінің жүгірткісі"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Ешқандай медиафайл таңдалмаған"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Ешқандай ақпарат жоқ"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Экран трансляциялануда"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Құрылғы енгізу"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Топта ойнату"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Ешқандай ақпарат жоқ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-km/strings.xml b/mediarouter/mediarouter/src/main/res/values-km/strings.xml
index 51d06dc..2fcbc2b 100644
--- a/mediarouter/mediarouter/src/main/res/values-km/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-km/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"ប្រព័ន្ធ"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"ឧបករណ៍"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"ប៊ូតុង​បញ្ជូន"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"ប៊ូតុង​បញ្ជូន។ បាន​ផ្តាច់"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"ប៊ូតុង​បញ្ជូន។ កំពុង​ភ្ជាប់"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"ប៊ូតុង​បញ្ជូន។ បាន​ភ្ជាប់​ហើយ"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"បញ្ជូន​ទៅ"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"កំពុង​ស្វែងរក​ឧបករណ៍"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"ផ្ដាច់"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"ឈប់ភ្ជាប់"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"បិទ"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"លេង"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"ផ្អាក"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"ឈប់"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"ពង្រីក"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"បង្រួម"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"រូបភាព​សិល្បៈ​ក្រប​អាល់ប៊ុម"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"របារកម្រិតសំឡេង"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"មិនបាន​ជ្រើសរើស​មេឌៀ​ទេ"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"មិនមានព័ត៌មានទេ"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"កំពុង​បញ្ជូន​អេក្រង់"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"បញ្ចូលឧបករណ៍"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"លេងនៅ​លើក្រុម"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"មិនមានព័ត៌មានទេ"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"ប្រព័ន្ធ"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"ឧបករណ៍"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"ប៊ូតុង​បញ្ជូន"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"ប៊ូតុង​បញ្ជូន។ បាន​ផ្តាច់"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"ប៊ូតុង​បញ្ជូន។ កំពុង​ភ្ជាប់"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"ប៊ូតុង​បញ្ជូន។ បាន​ភ្ជាប់​ហើយ"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"បញ្ជូន​ទៅ"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"កំពុង​ស្វែងរក​ឧបករណ៍"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"ផ្ដាច់"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"ឈប់ភ្ជាប់"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"បិទ"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"លេង"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"ផ្អាក"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"ឈប់"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"ពង្រីក"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"បង្រួម"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"រូបភាព​សិល្បៈ​ក្រប​អាល់ប៊ុម"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"របារកម្រិតសំឡេង"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"មិនបាន​ជ្រើសរើស​មេឌៀ​ទេ"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"មិនមានព័ត៌មានទេ"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"កំពុង​បញ្ជូន​អេក្រង់"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"បញ្ចូលឧបករណ៍"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"លេងនៅ​លើក្រុម"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"មិនមានព័ត៌មានទេ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-kn/strings.xml b/mediarouter/mediarouter/src/main/res/values-kn/strings.xml
index 8d0b756..e8745fc 100644
--- a/mediarouter/mediarouter/src/main/res/values-kn/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-kn/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"ಸಿಸ್ಟಂ"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"ಸಾಧನಗಳು"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"ಬಿತ್ತರಿಸು ಬಟನ್‌"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"ಬಿತ್ತರಿಸು ಬಟನ್‌. ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"ಬಿತ್ತರಿಸು ಬಟನ್‌. ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"ಬಿತ್ತರಿಸು ಬಟನ್‌. ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"ಇದಕ್ಕೆ ಬಿತ್ತರಿಸಿ"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"ಸಾಧನಗಳನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"ಬಿತ್ತರಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಿ"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"ಮುಚ್ಚಿ"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"ಪ್ಲೇ"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"ವಿರಾಮ"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"ನಿಲ್ಲಿಸಿ"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"ಹಿಗ್ಗಿಸಿ"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"ಕುಗ್ಗಿಸಿ"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"ಆಲ್ಬಮ್ ಕಲೆ"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"ವಾಲ್ಯೂಮ್ ಸ್ಲೈಡರ್"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"ಯಾವುದೇ ಮಾಧ್ಯಮವನ್ನು ಆಯ್ಕೆ ಮಾಡಿಲ್ಲ"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"ಯಾವುದೇ ಮಾಹಿತಿ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"ಪರದೆಯನ್ನು ಬಿತ್ತರಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"ಸಾಧನವನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"ಗುಂಪಿನಲ್ಲಿ ಪ್ಲೇ ಮಾಡಿ"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"ಯಾವುದೇ ಮಾಹಿತಿ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"ಸಿಸ್ಟಂ"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"ಸಾಧನಗಳು"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"ಬಿತ್ತರಿಸು ಬಟನ್‌"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"ಬಿತ್ತರಿಸು ಬಟನ್‌. ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"ಬಿತ್ತರಿಸು ಬಟನ್‌. ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"ಬಿತ್ತರಿಸು ಬಟನ್‌. ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"ಇದಕ್ಕೆ ಬಿತ್ತರಿಸಿ"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"ಸಾಧನಗಳನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"ಬಿತ್ತರಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಿ"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"ಮುಚ್ಚಿ"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"ಪ್ಲೇ"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"ವಿರಾಮ"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"ನಿಲ್ಲಿಸಿ"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"ಹಿಗ್ಗಿಸಿ"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"ಕುಗ್ಗಿಸಿ"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"ಆಲ್ಬಮ್ ಕಲೆ"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"ವಾಲ್ಯೂಮ್ ಸ್ಲೈಡರ್"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"ಯಾವುದೇ ಮಾಧ್ಯಮವನ್ನು ಆಯ್ಕೆ ಮಾಡಿಲ್ಲ"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"ಯಾವುದೇ ಮಾಹಿತಿ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"ಪರದೆಯನ್ನು ಬಿತ್ತರಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"ಸಾಧನವನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ಗುಂಪಿನಲ್ಲಿ ಪ್ಲೇ ಮಾಡಿ"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ಯಾವುದೇ ಮಾಹಿತಿ ಲಭ್ಯವಿಲ್ಲ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ko/strings.xml b/mediarouter/mediarouter/src/main/res/values-ko/strings.xml
index 12cc3ab..a19d5fe 100644
--- a/mediarouter/mediarouter/src/main/res/values-ko/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ko/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"시스템"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"기기"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"전송 버튼"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"전송 버튼. 연결 해제됨"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"전송 버튼. 연결 중"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"전송 버튼. 연결됨"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"전송 대상"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"기기를 찾는 중"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"연결 해제"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"전송 중지"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"닫기"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"재생"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"일시중지"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"중지"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"펼치기"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"접기"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"앨범아트"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"볼륨 슬라이더"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"선택된 미디어 없음"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"사용할 수 있는 정보 없음"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"화면 전송 중"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"기기 추가"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"그룹에서 재생"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"사용할 수 있는 정보 없음"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"시스템"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"기기"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"전송 버튼"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"전송 버튼. 연결 해제됨"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"전송 버튼. 연결 중"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"전송 버튼. 연결됨"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"전송 대상"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"기기를 찾는 중"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"연결 해제"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"전송 중지"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"닫기"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"재생"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"일시중지"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"중지"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"펼치기"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"접기"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"앨범아트"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"볼륨 슬라이더"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"선택된 미디어 없음"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"사용할 수 있는 정보 없음"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"화면 전송 중"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"기기 추가"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"그룹에서 재생"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"사용할 수 있는 정보 없음"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ky/strings.xml b/mediarouter/mediarouter/src/main/res/values-ky/strings.xml
index 38629d1..6d97e9dc 100644
--- a/mediarouter/mediarouter/src/main/res/values-ky/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ky/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Тутум"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Түзмөктөр"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Тышкы экранга чыгаруу баскычы"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Тышкы экранга чыгаруу баскычы. Түзмөк ажырап турат."</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Тышкы экранга чыгаруу баскычы. Түзмөк туташууда"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Тышкы экранга чыгаруу баскычы. Түзмөк туташып турат"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Түзмөккө чыгаруу"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Түзмөктөр изделүүдө"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Ажыратуу"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Сыналгыга чыгарууну токтотуу"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Жабуу"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Ойнотуу"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Тындыруу"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Токтотуу"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Жайып көрсөтүү"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Жыйыштыруу"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Альбом мукабасы"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Үн башкаруучу сыдырма"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Эч нерсе тандалган жок"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Эч маалымат жок"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Тышкы экранга чыгарылууда"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Түзмөк кошуу"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Топто ойнотуу"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Эч маалымат жок"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Тутум"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Түзмөктөр"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Тышкы экранга чыгаруу баскычы"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Тышкы экранга чыгаруу баскычы. Түзмөк ажырап турат."</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Тышкы экранга чыгаруу баскычы. Түзмөк туташууда"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Тышкы экранга чыгаруу баскычы. Түзмөк туташып турат"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Түзмөккө чыгаруу"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Түзмөктөр изделүүдө"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Ажыратуу"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Сыналгыга чыгарууну токтотуу"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Жабуу"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Ойнотуу"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Тындыруу"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Токтотуу"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Жайып көрсөтүү"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Жыйыштыруу"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Альбом мукабасы"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Үн башкаруучу сыдырма"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Эч нерсе тандалган жок"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Эч маалымат жок"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Тышкы экранга чыгарылууда"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Түзмөк кошуу"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Топто ойнотуу"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Эч маалымат жок"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-lo/strings.xml b/mediarouter/mediarouter/src/main/res/values-lo/strings.xml
index 6233743..0dbe7d6 100644
--- a/mediarouter/mediarouter/src/main/res/values-lo/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-lo/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"ລະບົບ"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"ອຸປະກອນ"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"ປຸ່ມສົ່ງສັນຍານ"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"ປຸ່ມສົ່ງສັນຍານ. ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"ປຸ່ມສົ່ງສັນຍານ. ກຳລັງເຊື່ອມຕໍ່"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"ປຸ່ມສົ່ງສັນຍານ. ເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"ສົ່ງສັນຍານໄປທີ່"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"ກຳລັງຊອກຫາອຸປະກອນ"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"ຕັດການເຊື່ອມຕໍ່"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"ຢຸດການສົ່ງສັນຍານ"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"ປິດ"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"ຫຼິ້ນ"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"ຢຸດຊົ່ວຄາວ"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"ຢຸດ"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"ຂະຫຍາຍ"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"ຫຍໍ້ລົງ"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"ໜ້າປົກອະລະບໍ້າ"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"ຕົວປັບລະດັບສຽງ"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"ບໍ່ໄດ້ເລືອກສື່ໃດ"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"ບໍ່ມີຂໍ້ມູນ"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"ກຳລັງສົ່ງສັນຍານພາບ"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"ເພີ່ມ​ອຸ​ປະ​ກອນ"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"ຫຼິ້ນຢູ່ກຸ່ມ"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"ບໍ່ມີຂໍ້ມູນ"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"ລະບົບ"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"ອຸປະກອນ"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"ປຸ່ມສົ່ງສັນຍານ"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"ປຸ່ມສົ່ງສັນຍານ. ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"ປຸ່ມສົ່ງສັນຍານ. ກຳລັງເຊື່ອມຕໍ່"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"ປຸ່ມສົ່ງສັນຍານ. ເຊື່ອມຕໍ່ແລ້ວ"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"ສົ່ງສັນຍານໄປທີ່"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"ກຳລັງຊອກຫາອຸປະກອນ"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"ຕັດການເຊື່ອມຕໍ່"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"ຢຸດການສົ່ງສັນຍານ"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"ປິດ"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"ຫຼິ້ນ"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"ຢຸດຊົ່ວຄາວ"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"ຢຸດ"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"ຂະຫຍາຍ"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"ຫຍໍ້ລົງ"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"ໜ້າປົກອະລະບໍ້າ"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"ຕົວປັບລະດັບສຽງ"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"ບໍ່ໄດ້ເລືອກສື່ໃດ"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"ບໍ່ມີຂໍ້ມູນ"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"ກຳລັງສົ່ງສັນຍານພາບ"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"ເພີ່ມ​ອຸ​ປະ​ກອນ"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ຫຼິ້ນຢູ່ກຸ່ມ"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ບໍ່ມີຂໍ້ມູນ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-lt/strings.xml b/mediarouter/mediarouter/src/main/res/values-lt/strings.xml
index b56a5c0..89d0d5d 100644
--- a/mediarouter/mediarouter/src/main/res/values-lt/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-lt/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistema"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Įrenginiai"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Perdavimo mygtukas"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Perdavimo mygtukas. Atsijungta"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Perdavimo mygtukas. Prisijungiama"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Perdavimo mygtukas. Prisijungta"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Perduoti į"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Randami įrenginiai"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Atjungti"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Sustabdyti perdavimą"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Uždaryti"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Leisti"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pristabdyti"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Sustabdyti"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Išskleisti"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Sutraukti"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albumo viršelis"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Garsumo šliaužiklis"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nepasirinkta jokios medijos"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Informacija nepasiekiama"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Perduodamas ekranas"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Įrenginio pridėjimas"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Leidimas grupėje"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nėra jokios informacijos"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistema"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Įrenginiai"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Perdavimo mygtukas"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Perdavimo mygtukas. Atsijungta"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Perdavimo mygtukas. Prisijungiama"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Perdavimo mygtukas. Prisijungta"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Perduoti į"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Randami įrenginiai"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Atjungti"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Sustabdyti perdavimą"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Uždaryti"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Leisti"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pristabdyti"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Sustabdyti"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Išskleisti"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Sutraukti"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albumo viršelis"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Garsumo šliaužiklis"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nepasirinkta jokios medijos"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Informacija nepasiekiama"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Perduodamas ekranas"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Įrenginio pridėjimas"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Leidimas grupėje"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nėra jokios informacijos"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-lv/strings.xml b/mediarouter/mediarouter/src/main/res/values-lv/strings.xml
index 120e942..0b30a78 100644
--- a/mediarouter/mediarouter/src/main/res/values-lv/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-lv/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistēma"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Ierīces"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Apraides poga"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Apraides poga. Savienojums pārtraukts."</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Apraides poga. Notiek savienojuma izveide."</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Apraides poga. Savienojums izveidots."</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Apraides veikšana uz ierīci"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Notiek ierīču meklēšana"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Atvienot"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Pārtraukt apraidi"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Aizvērt"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Atskaņot"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pauzēt"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Apturēt"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Izvērst"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Sakļaut"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albuma noformējums"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Skaļuma slīdnis"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nav atlasīts multivides saturs"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nav informācijas"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Notiek ekrāna apraide"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Pievienot ierīci"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Atskaņošana grupā"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nav informācijas"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistēma"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Ierīces"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Apraides poga"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Apraides poga. Savienojums pārtraukts."</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Apraides poga. Notiek savienojuma izveide."</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Apraides poga. Savienojums izveidots."</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Apraidīt uz"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Notiek ierīču meklēšana"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Atvienot"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Pārtraukt apraidi"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Aizvērt"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Atskaņot"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pauzēt"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Apturēt"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Izvērst"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Sakļaut"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albuma noformējums"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Skaļuma slīdnis"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nav atlasīts multivides saturs"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nav informācijas"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Notiek ekrāna apraide"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Pievienot ierīci"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Atskaņošana grupā"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nav informācijas"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-mk/strings.xml b/mediarouter/mediarouter/src/main/res/values-mk/strings.xml
index ec4b903..354eac6 100644
--- a/mediarouter/mediarouter/src/main/res/values-mk/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-mk/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Систем"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Уреди"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Копче за Cast"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Копче за Cast. Исклучено"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Копче за Cast. Се поврзува"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Копче за Cast. Поврзано"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Емитување на"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Се бараат уреди"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Исклучи"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Сопри со емитување"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Затвори"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Пушти"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Пауза"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Запри"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Прошири"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Собери"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Омот на албум"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Лизгач за јачина на звук"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Не се избрани аудиовизуелни датотеки"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Нема достапни информации"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Се емитува екран"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Додајте уред"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Пуштете на група"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Нема достапни информации"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Систем"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Уреди"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Копче за Cast"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Копче за Cast. Исклучено"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Копче за Cast. Се поврзува"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Копче за Cast. Поврзано"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Емитување на"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Се бараат уреди"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Исклучи"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Сопри со емитување"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Затвори"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Пушти"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Пауза"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Запри"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Прошири"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Собери"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Омот на албум"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Лизгач за јачина на звук"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Не се избрани аудиовизуелни датотеки"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Нема достапни информации"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Се емитува екран"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Додајте уред"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Пуштете на група"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Нема достапни информации"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ml/strings.xml b/mediarouter/mediarouter/src/main/res/values-ml/strings.xml
index d4be892..906696d 100644
--- a/mediarouter/mediarouter/src/main/res/values-ml/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ml/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"സിസ്റ്റം"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"ഉപകരണങ്ങൾ"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"കാസ്റ്റ് ബട്ടൺ"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"കാസ്റ്റ് ബട്ടൺ. വിച്ഛേദിച്ചു"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"കാസ്‌റ്റ് ബട്ടൺ. കണക്‌റ്റ് ചെയ്യുന്നു"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"കാസ്റ്റ് ബട്ടൺ. കണക്‌റ്റ് ചെയ്തു"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"ഇതിലേക്ക് കാസ്‌റ്റ് ചെയ്യുക"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"ഉപകരണങ്ങൾ കണ്ടെത്തുന്നു"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"വിച്ഛേദിക്കുക"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"കാസ്റ്റ് ചെയ്യുന്നത് നിർത്തുക"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"അടയ്ക്കുക"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"പ്ലേ ചെയ്യുക"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"തൽക്കാലം നിർത്തുക"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"നിര്‍ത്തുക"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"വികസിപ്പിക്കുക"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"ചുരുക്കുക"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"ആൽബം ആർട്ട്"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"വോളിയം സ്ലൈഡർ"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"മീഡിയയൊന്നും തിരഞ്ഞെടുത്തിട്ടില്ല"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"വിവരങ്ങളൊന്നും ലഭ്യമല്ല"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"സ്‌ക്രീൻ കാസ്‌റ്റ് ചെയ്യുന്നു"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"ഒരു ഉപകരണം ചേർക്കുക"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"ഒരു ഗ്രൂപ്പിൽ പ്ലേ ചെയ്യുക"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"വിവരങ്ങളൊന്നും ലഭ്യമല്ല"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"സിസ്റ്റം"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"ഉപകരണങ്ങൾ"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"കാസ്റ്റ് ബട്ടൺ"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"കാസ്റ്റ് ബട്ടൺ. വിച്ഛേദിച്ചു"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"കാസ്‌റ്റ് ബട്ടൺ. കണക്‌റ്റ് ചെയ്യുന്നു"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"കാസ്റ്റ് ബട്ടൺ. കണക്‌റ്റ് ചെയ്തു"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"ഇതിലേക്ക് കാസ്‌റ്റ് ചെയ്യുക"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"ഉപകരണങ്ങൾ കണ്ടെത്തുന്നു"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"വിച്ഛേദിക്കുക"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"കാസ്റ്റ് ചെയ്യുന്നത് നിർത്തുക"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"അടയ്ക്കുക"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"പ്ലേ ചെയ്യുക"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"തൽക്കാലം നിർത്തുക"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"നിര്‍ത്തുക"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"വികസിപ്പിക്കുക"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"ചുരുക്കുക"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"ആൽബം ആർട്ട്"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"വോളിയം സ്ലൈഡർ"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"മീഡിയയൊന്നും തിരഞ്ഞെടുത്തിട്ടില്ല"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"വിവരങ്ങളൊന്നും ലഭ്യമല്ല"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"സ്‌ക്രീൻ കാസ്‌റ്റ് ചെയ്യുന്നു"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"ഒരു ഉപകരണം ചേർക്കുക"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ഒരു ഗ്രൂപ്പിൽ പ്ലേ ചെയ്യുക"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"വിവരങ്ങളൊന്നും ലഭ്യമല്ല"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-mn/strings.xml b/mediarouter/mediarouter/src/main/res/values-mn/strings.xml
index 4229523..154ee99 100644
--- a/mediarouter/mediarouter/src/main/res/values-mn/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-mn/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Систем"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Төхөөрөмжүүд"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Дамжуулах товчлуур"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Дамжуулах товчлуур. Салсан"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Дамжуулах товчлуур. Холбогдож байна"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Дамжуулах товчлуур. Холбогдсон"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Дараахад дамжуулах"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Төхөөрөмжүүдийг хайж байна"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Салгах"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Дамжуулахыг зогсоох"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Хаах"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Тоглуулах"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Түр зогсоох"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Зогсоох"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Дэлгэх"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Буулгах"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Цомгийн зураг"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Дууны түвшин тохируулагч"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Ямар ч медиа сонгоогүй байна"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Мэдээлэл алга"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Дэлгэцийг дамжуулж байна"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Төхөөрөмж нэмэх"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Бүлэгт тоглуулах"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Мэдээлэл алга"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Систем"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Төхөөрөмжүүд"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Дамжуулах товчлуур"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Дамжуулах товчлуур. Салсан"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Дамжуулах товчлуур. Холбогдож байна"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Дамжуулах товчлуур. Холбогдсон"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Дараахад дамжуулах"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Төхөөрөмжүүдийг хайж байна"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Салгах"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Дамжуулахыг зогсоох"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Хаах"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Тоглуулах"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Түр зогсоох"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Зогсоох"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Дэлгэх"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Буулгах"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Цомгийн зураг"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Дууны түвшин тохируулагч"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Ямар ч медиа сонгоогүй байна"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Мэдээлэл алга"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Дэлгэцийг дамжуулж байна"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Төхөөрөмж нэмэх"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Бүлэгт тоглуулах"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Мэдээлэл алга"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-mr/strings.xml b/mediarouter/mediarouter/src/main/res/values-mr/strings.xml
index a5fcd2e..2be2d59 100644
--- a/mediarouter/mediarouter/src/main/res/values-mr/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-mr/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"सिस्टम"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"डिव्हाइस"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"कास्ट बटण"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"कास्ट बटण. डिस्कनेक्ट केले आहे"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"कास्ट बटण. कनेक्ट करत आहे"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"कास्ट बटण. कनेक्ट केले आहे"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"यावर कास्ट करा"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"डिव्हाइस शोधत आहे"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"‍डिस्कनेक्ट करा"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"कास्ट करणे थांबवा"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"बंद"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"खेळा"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"थांबवा"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"थांबा"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"विस्तार करा"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"कोलॅप्स"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"अल्बम कला"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"व्हॉल्यूम स्लायडर"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"मीडिया निवडला नाही"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"कोणतीही माहिती उपलब्ध नाही"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"स्क्रीन कास्‍ट करत आहे"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"डिव्हाइस जोडा"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"गटावर प्ले करा"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"कोणतीही माहिती उपलब्ध नाही"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"सिस्टम"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"डिव्हाइस"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"कास्ट बटण"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"कास्ट बटण. डिस्कनेक्ट केले आहे"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"कास्ट बटण. कनेक्ट करत आहे"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"कास्ट बटण. कनेक्ट केले आहे"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"यावर कास्ट करा"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"डिव्हाइस शोधत आहे"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"‍डिस्कनेक्ट करा"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"कास्ट करणे थांबवा"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"बंद"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"खेळा"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"थांबवा"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"थांबा"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"विस्तार करा"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"कोलॅप्स"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"अल्बम कला"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"व्हॉल्यूम स्लायडर"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"मीडिया निवडला नाही"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"कोणतीही माहिती उपलब्ध नाही"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"स्क्रीन कास्‍ट करत आहे"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"डिव्हाइस जोडा"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"गटावर प्ले करा"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"कोणतीही माहिती उपलब्ध नाही"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ms/strings.xml b/mediarouter/mediarouter/src/main/res/values-ms/strings.xml
index b4c8bea..21da6f0 100644
--- a/mediarouter/mediarouter/src/main/res/values-ms/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ms/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistem"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Peranti"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Butang hantar"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Butang hantar. Sambungan diputuskan"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Butang hantar. Menyambung"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Butang hantar. Disambungkan"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Hantar ke"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Mencari peranti"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Putuskan sambungan"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Berhenti menghantar"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Tutup"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Main"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Jeda"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Berhenti"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Kembangkan"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Runtuhkan"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Seni album"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Peluncur kelantangan"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Tiada media yang dipilih"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Maklumat tidak tersedia"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Menghantar skrin"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Tambah peranti"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Mainkan pada kumpulan"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Maklumat tidak tersedia"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistem"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Peranti"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Butang hantar"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Butang hantar. Sambungan diputuskan"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Butang hantar. Menyambung"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Butang hantar. Disambungkan"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Hantar ke"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Mencari peranti"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Putuskan sambungan"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Berhenti menghantar"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Tutup"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Main"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Jeda"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Berhenti"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Kembangkan"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Runtuhkan"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Seni album"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Peluncur kelantangan"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Tiada media yang dipilih"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Maklumat tidak tersedia"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Menghantar skrin"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Tambah peranti"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Mainkan pada kumpulan"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Maklumat tidak tersedia"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-my/strings.xml b/mediarouter/mediarouter/src/main/res/values-my/strings.xml
index cde5321..aa4f8c3 100644
--- a/mediarouter/mediarouter/src/main/res/values-my/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-my/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"စနစ်"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"စက်များ"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"ကာစ်ခလုတ်"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"ကာစ်ခလုတ်။ ချိတ်ဆက်မထားပါ"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"ကာစ်ခလုတ်။ ချိတ်ဆက်နေသည်"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"ကာစ်ခလုတ်။ ချိတ်ဆက်ထားသည်"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"ဤစက်သို့ ကာစ်လုပ်ရန်"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"စက်များကို ရှာနေသည်"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"ချိတ်ဆက်မှု ဖြုတ်ရန်"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"ကာစ် ရပ်ရန်"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"ပိတ်ရန်"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"ကစားရန်"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"ခဏရပ်ရန်"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"ရပ်ရန်"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"ချဲ့ရန်"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"လျှော့ပြရန်"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"အယ်လ်ဘမ်ပုံ"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"အသံအတိုးအကျယ်ချိန်သည့် ရွှေ့တုံး"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"မီဒီယာ ရွေးမထားပါ"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"အချက်အလက် မရရှိနိုင်ပါ"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"ကာစ်တ်လုပ်သည့် မျက်နှာပြင်"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"စက်ပစ္စည်း ထည့်ခြင်း"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"အုပ်စုလိုက် ဖွင့်ခြင်း"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"အချက်အလက် မရရှိနိုင်ပါ"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"စနစ်"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"စက်များ"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"ကာစ်ခလုတ်"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"ကာစ်ခလုတ်။ ချိတ်ဆက်မထားပါ"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"ကာစ်ခလုတ်။ ချိတ်ဆက်နေသည်"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"ကာစ်ခလုတ်။ ချိတ်ဆက်ထားသည်"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"ဤစက်သို့ ကာစ်လုပ်ရန်"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"စက်များကို ရှာနေသည်"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"ချိတ်ဆက်မှု ဖြုတ်ရန်"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"ကာစ် ရပ်ရန်"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"ပိတ်ရန်"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"ကစားရန်"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"ခဏရပ်ရန်"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"ရပ်ရန်"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"ချဲ့ရန်"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"လျှော့ပြရန်"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"အယ်လ်ဘမ်ပုံ"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"အသံအတိုးအကျယ်ချိန်သည့် ရွှေ့တုံး"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"မီဒီယာ ရွေးမထားပါ"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"အချက်အလက် မရရှိနိုင်ပါ"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"ကာစ်တ်လုပ်သည့် မျက်နှာပြင်"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"စက်ပစ္စည်း ထည့်ခြင်း"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"အုပ်စုလိုက် ဖွင့်ခြင်း"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"အချက်အလက် မရရှိနိုင်ပါ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-nb/strings.xml b/mediarouter/mediarouter/src/main/res/values-nb/strings.xml
index d417645..fcbce321 100644
--- a/mediarouter/mediarouter/src/main/res/values-nb/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-nb/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"System"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Enheter"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast-ikonet"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast-ikonet. Frakoblet"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast-ikonet. Kobler til"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast-ikonet. Tilkoblet"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Cast til"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Finner enheter"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Koble fra"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Stopp castingen"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Lukk"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Spill av"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Sett på pause"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stopp"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Vis"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Skjul"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albumgrafikk"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Glidebryter for volum"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Ingen medier er valgt"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Ingen informasjon er tilgjengelig"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Caster skjermen"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Legg til en enhet"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Spill i en gruppe"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Ingen informasjon er tilgjengelig"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"System"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Enheter"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast-ikonet"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast-ikonet. Frakoblet"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast-ikonet. Kobler til"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast-ikonet. Tilkoblet"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Cast til"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Finner enheter"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Koble fra"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Stopp castingen"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Lukk"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Spill av"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Sett på pause"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stopp"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Vis"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Skjul"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albumgrafikk"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Glidebryter for volum"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Ingen medier er valgt"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Ingen informasjon er tilgjengelig"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Caster skjermen"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Legg til en enhet"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Spill i en gruppe"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Ingen informasjon er tilgjengelig"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ne/strings.xml b/mediarouter/mediarouter/src/main/res/values-ne/strings.xml
index 4631678..dba58918 100644
--- a/mediarouter/mediarouter/src/main/res/values-ne/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ne/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"प्रणाली"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"यन्त्रहरू"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast बटन"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast बटन। जडान विच्छेद गरियो"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast बटन। जडान गरिँदै छ"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast बटन। जडान गरियो"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"यसमा Cast गर्नुहोस्"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"यन्त्रहरू पत्ता लगाइँदै छ"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"विच्छेद गर्नुहोस्"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"casting रोक्नुहोस्"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"बन्द गर्नुहोस्"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"खेल्नुहोस्"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"पज गर्नुहोस्‌"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"रोक्नुहोस्"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"विस्तृत गर्नुहोस्"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"संक्षिप्त गर्नुहोस्"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"एल्बम आर्ट"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"भोल्युमको स्लाइडर"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"कुनै पनि मिडिया चयन गरिएन"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"कुनै पनि जानकारी उपलब्ध छैन"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"स्क्रिन Cast गरिँदै छ"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"यन्त्र थप्नुहोस्"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"कुनै समूहमा प्ले गर्नुहोस्"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"कुनै पनि जानकारी उपलब्ध छैन"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"प्रणाली"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"यन्त्रहरू"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast बटन"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast बटन। जडान विच्छेद गरियो"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast बटन। जडान गरिँदै छ"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast बटन। जडान गरियो"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"यसमा Cast गर्नुहोस्"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"यन्त्रहरू पत्ता लगाइँदै छ"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"विच्छेद गर्नुहोस्"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"casting रोक्नुहोस्"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"बन्द गर्नुहोस्"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"खेल्नुहोस्"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"पज गर्नुहोस्‌"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"रोक्नुहोस्"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"विस्तृत गर्नुहोस्"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"संक्षिप्त गर्नुहोस्"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"एल्बम आर्ट"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"भोल्युमको स्लाइडर"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"कुनै पनि मिडिया चयन गरिएन"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"कुनै पनि जानकारी उपलब्ध छैन"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"स्क्रिन Cast गरिँदै छ"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"यन्त्र थप्नुहोस्"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"कुनै समूहमा प्ले गर्नुहोस्"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"कुनै पनि जानकारी उपलब्ध छैन"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-nl/strings.xml b/mediarouter/mediarouter/src/main/res/values-nl/strings.xml
index 26142fc..86277be 100644
--- a/mediarouter/mediarouter/src/main/res/values-nl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-nl/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Systeem"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Apparaten"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast-icoon"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast-icoon. Verbinding verbroken"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast-icoon. Verbinding maken"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast-icoon. Verbonden"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Casten naar"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Apparaten zoeken"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Verbinding verbreken"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Casten stoppen"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Sluiten"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Afspelen"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pauzeren"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stoppen"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Uitvouwen"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Samenvouwen"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albumhoes"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Volumeschuifregelaar"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Geen media geselecteerd"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Geen informatie beschikbaar"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Scherm casten"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Een apparaat toevoegen"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Afspelen in een groep"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Geen informatie beschikbaar"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Systeem"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Apparaten"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast-icoon"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast-icoon. Verbinding verbroken"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast-icoon. Verbinding maken"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast-icoon. Verbonden"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Casten naar"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Apparaten zoeken"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Verbinding verbreken"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Casten stoppen"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Sluiten"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Afspelen"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pauzeren"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stoppen"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Uitvouwen"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Samenvouwen"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albumhoes"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Volumeschuifregelaar"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Geen media geselecteerd"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Geen informatie beschikbaar"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Scherm casten"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Een apparaat toevoegen"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Afspelen in een groep"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Geen informatie beschikbaar"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-or/strings.xml b/mediarouter/mediarouter/src/main/res/values-or/strings.xml
index 9e61e1d..e270c63 100644
--- a/mediarouter/mediarouter/src/main/res/values-or/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-or/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"ସିଷ୍ଟମ୍‌"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"ଡିଭାଇସ୍‌"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"କାଷ୍ଟ ବଟନ୍‍"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"କାଷ୍ଟ ବଟନ୍‍। ଡିସ୍‌କନେକ୍ଟ ହୋଇଗଲା"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"କାଷ୍ଟ ବଟନ୍‍। କନେକ୍ଟ କରାଯାଉଛି"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"କାଷ୍ଟ ବଟନ୍‍। କନେକ୍ଟ ହୋ‌ଇଛି"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"ଏଥିରେ କାଷ୍ଟ କରନ୍ତୁ"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"ଡିଭାଇସ୍‍ ଖୋଜାଯାଉଛି"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"ଡିସ୍‌କନେକ୍ଟ କରନ୍ତୁ"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"କାଷ୍ଟ କରିବା ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"ଚଲାନ୍ତୁ"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"ପଜ୍‍ କରନ୍ତୁ"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"ରୋକନ୍ତୁ"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"ବିସ୍ତାର କରନ୍ତୁ"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"ସଂକୁଚିତ କରନ୍ତୁ"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"ଆଲବମ୍ ଆର୍ଟ"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"ଭଲ୍ୟୁମ୍‍ ସ୍ଲାଇଡର୍‍"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"କୌଣସି ମିଡିଆ ଚୟନ କରାଯାଇନାହିଁ"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"କୌଣସି ସୂଚନା ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"ସ୍କ୍ରୀନ୍‍ କାଷ୍ଟ କରାଯାଉଛି"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"ଏକ ଡିଭାଇସ୍‍ ଯୋଗ କରନ୍ତୁ"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"ଏକ ଗ୍ରୁପ୍‌ରେ ପ୍ଲେ କରନ୍ତୁ"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"କୌଣସି ସୂଚନା ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"ସିଷ୍ଟମ୍‌"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"ଡିଭାଇସ୍‌"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"କାଷ୍ଟ ବଟନ୍‍"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"କାଷ୍ଟ ବଟନ୍‍। ଡିସ୍‌କନେକ୍ଟ ହୋଇଗଲା"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"କାଷ୍ଟ ବଟନ୍‍। କନେକ୍ଟ କରାଯାଉଛି"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"କାଷ୍ଟ ବଟନ୍‍। କନେକ୍ଟ ହୋ‌ଇଛି"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"ଏଥିରେ କାଷ୍ଟ କରନ୍ତୁ"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"ଡିଭାଇସ୍‍ ଖୋଜାଯାଉଛି"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"ଡିସ୍‌କନେକ୍ଟ କରନ୍ତୁ"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"କାଷ୍ଟ କରିବା ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"ଚଲାନ୍ତୁ"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"ପଜ୍‍ କରନ୍ତୁ"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"ରୋକନ୍ତୁ"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"ବିସ୍ତାର କରନ୍ତୁ"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"ସଂକୁଚିତ କରନ୍ତୁ"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"ଆଲବମ୍ ଆର୍ଟ"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"ଭଲ୍ୟୁମ୍‍ ସ୍ଲାଇଡର୍‍"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"କୌଣସି ମିଡିଆ ଚୟନ କରାଯାଇନାହିଁ"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"କୌଣସି ସୂଚନା ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"ସ୍କ୍ରୀନ୍‍ କାଷ୍ଟ କରାଯାଉଛି"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"ଏକ ଡିଭାଇସ୍‍ ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ଏକ ଗ୍ରୁପ୍‌ରେ ପ୍ଲେ କରନ୍ତୁ"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"କୌଣସି ସୂଚନା ଉପଲବ୍ଧ ନାହିଁ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-pa/strings.xml b/mediarouter/mediarouter/src/main/res/values-pa/strings.xml
index 46a04e3..ed355f2 100644
--- a/mediarouter/mediarouter/src/main/res/values-pa/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-pa/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"ਸਿਸਟਮ"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"ਡੀਵਾਈਸਾਂ"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"\'ਕਾਸਟ ਕਰੋ\' ਬਟਨ"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"\'ਕਾਸਟ ਕਰੋ\' ਬਟਨ। ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"\'ਕਾਸਟ ਕਰੋ\' ਬਟਨ। ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"\'ਕਾਸਟ ਕਰੋ\' ਬਟਨ। ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"ਇਸਦੇ ਨਾਲ ਕਾਸਟ ਕਰੋ"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"ਡੀਵਾਈਸ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"ਕਾਸਟ ਕਰਨਾ ਬੰਦ ਕਰੋ"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"ਬੰਦ ਕਰੋ"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"ਚਲਾਓ"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"ਰੋਕੋ"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"ਬੰਦ ਕਰੋ"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"ਵਿਸਤਾਰ ਕਰੋ"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"ਸਮੇਟੋ"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"ਐਲਬਮ ਕਲਾ"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"ਵੌਲਿਊਮ ਸਲਾਈਡਰ"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"ਕੋਈ ਮੀਡੀਆ ਨਹੀਂ ਚੁਣਿਆ ਗਿਆ"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"ਕੋਈ ਜਾਣਕਾਰੀ ਉਪਲਬਧ ਨਹੀਂ"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"ਸਕ੍ਰੀਨ \'ਤੇ ਕਾਸਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"ਕੋਈ ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"ਕਿਸੇ ਗਰੁੱਪ ਵਿੱਚ ਖੇਡੋ"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"ਕੋਈ ਜਾਣਕਾਰੀ ਉਪਲਬਧ ਨਹੀਂ"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"ਸਿਸਟਮ"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"ਡੀਵਾਈਸਾਂ"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"\'ਕਾਸਟ ਕਰੋ\' ਬਟਨ"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"\'ਕਾਸਟ ਕਰੋ\' ਬਟਨ। ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"\'ਕਾਸਟ ਕਰੋ\' ਬਟਨ। ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"\'ਕਾਸਟ ਕਰੋ\' ਬਟਨ। ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"ਇਸਦੇ ਨਾਲ ਕਾਸਟ ਕਰੋ"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"ਡੀਵਾਈਸ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"ਕਾਸਟ ਕਰਨਾ ਬੰਦ ਕਰੋ"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"ਬੰਦ ਕਰੋ"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"ਚਲਾਓ"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"ਰੋਕੋ"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"ਬੰਦ ਕਰੋ"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"ਵਿਸਤਾਰ ਕਰੋ"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"ਸਮੇਟੋ"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"ਐਲਬਮ ਕਲਾ"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"ਵੌਲਿਊਮ ਸਲਾਈਡਰ"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"ਕੋਈ ਮੀਡੀਆ ਨਹੀਂ ਚੁਣਿਆ ਗਿਆ"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"ਕੋਈ ਜਾਣਕਾਰੀ ਉਪਲਬਧ ਨਹੀਂ"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"ਸਕ੍ਰੀਨ \'ਤੇ ਕਾਸਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"ਕੋਈ ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ਕਿਸੇ ਗਰੁੱਪ ਵਿੱਚ ਖੇਡੋ"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ਕੋਈ ਜਾਣਕਾਰੀ ਉਪਲਬਧ ਨਹੀਂ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-pl/strings.xml b/mediarouter/mediarouter/src/main/res/values-pl/strings.xml
index 457d5c8..6f95c01 100644
--- a/mediarouter/mediarouter/src/main/res/values-pl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-pl/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"System"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Urządzenia"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Przycisk Cast"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Przycisk Cast – rozłączono"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Przycisk Cast – łączę"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Przycisk Cast – połączono"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Przesyłaj na"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Szukam urządzeń"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Odłącz"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Zatrzymaj przesyłanie"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Zamknij"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Odtwórz"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Wstrzymaj"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Zatrzymaj"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Rozwiń"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Zwiń"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Okładka albumu"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Suwak głośności"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nie wybrano multimediów"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Brak informacji"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Przesyłam ekran"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Dodawanie urządzenia"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Odtwórz w grupie"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Brak informacji"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"System"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Urządzenia"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Przycisk Cast"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Przycisk Cast – rozłączono"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Przycisk Cast – łączę"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Przycisk Cast – połączono"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Przesyłaj na"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Szukam urządzeń"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Odłącz"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Zatrzymaj przesyłanie"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Zamknij"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Odtwórz"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Wstrzymaj"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Zatrzymaj"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Rozwiń"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Zwiń"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Okładka albumu"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Suwak głośności"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nie wybrano multimediów"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Brak informacji"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Przesyłam ekran"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Dodawanie urządzenia"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Odtwórz w grupie"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Brak informacji"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-pt-rBR/strings.xml b/mediarouter/mediarouter/src/main/res/values-pt-rBR/strings.xml
index f6bd751..5a17b7c 100644
--- a/mediarouter/mediarouter/src/main/res/values-pt-rBR/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-pt-rBR/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistema"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Dispositivos"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Botão \"Transmitir\""</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Botão \"Transmitir\". Desconectado"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Botão \"Transmitir\". Conectando"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Botão \"Transmitir\". Conectado"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Transmitir para"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Localizando dispositivos"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Desconectar"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Parar transmissão"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Fechar"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Reproduzir"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pausar"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Parar"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Expandir"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Recolher"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Arte do álbum"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Controle deslizante de volume"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nenhuma mídia selecionada"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nenhuma informação disponível"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Transmitindo tela"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Adicionar um dispositivo"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Reproduzir em um grupo"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nenhuma informação disponível"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistema"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Dispositivos"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Botão \"Transmitir\""</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Botão \"Transmitir\". Desconectado"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Botão \"Transmitir\". Conectando"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Botão \"Transmitir\". Conectado"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Transmitir para"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Localizando dispositivos"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Desconectar"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Parar transmissão"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Fechar"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Reproduzir"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pausar"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Parar"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Expandir"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Recolher"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Arte do álbum"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Controle deslizante de volume"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nenhuma mídia selecionada"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nenhuma informação disponível"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Transmitindo tela"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Adicionar um dispositivo"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproduzir em um grupo"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nenhuma informação disponível"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-pt-rPT/strings.xml b/mediarouter/mediarouter/src/main/res/values-pt-rPT/strings.xml
index 542ed3a..c95b013 100644
--- a/mediarouter/mediarouter/src/main/res/values-pt-rPT/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-pt-rPT/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistema"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Dispositivos"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Botão Transmitir"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Botão Transmitir. Desligado."</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Botão Transmitir. A ligar..."</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Botão Transmitir. Ligado."</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Transmitir para"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"A localizar dispositivos..."</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Desligar"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Parar transmissão"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Fechar"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Reproduzir"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Colocar em pausa"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Parar"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Expandir"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Reduzir"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Imagem do álbum"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Controlo de deslize do volume"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nenhum conteúdo multimédia selecionado."</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nenhuma informação disponível."</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"A transmitir o ecrã..."</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Adicionar um dispositivo"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Reproduzir num grupo"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nenhuma informação disponível"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistema"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Dispositivos"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Botão Transmitir"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Botão Transmitir. Desligado."</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Botão Transmitir. A ligar..."</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Botão Transmitir. Ligado."</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Transmitir para"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"A localizar dispositivos..."</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Desligar"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Parar transmissão"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Fechar"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Reproduzir"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Colocar em pausa"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Parar"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Expandir"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Reduzir"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Imagem do álbum"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Controlo de deslize do volume"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nenhum conteúdo multimédia selecionado."</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nenhuma informação disponível."</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"A transmitir o ecrã..."</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Adicionar um dispositivo"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproduzir num grupo"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nenhuma informação disponível"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-pt/strings.xml b/mediarouter/mediarouter/src/main/res/values-pt/strings.xml
index f6bd751..5a17b7c 100644
--- a/mediarouter/mediarouter/src/main/res/values-pt/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-pt/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistema"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Dispositivos"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Botão \"Transmitir\""</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Botão \"Transmitir\". Desconectado"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Botão \"Transmitir\". Conectando"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Botão \"Transmitir\". Conectado"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Transmitir para"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Localizando dispositivos"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Desconectar"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Parar transmissão"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Fechar"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Reproduzir"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pausar"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Parar"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Expandir"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Recolher"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Arte do álbum"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Controle deslizante de volume"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nenhuma mídia selecionada"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nenhuma informação disponível"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Transmitindo tela"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Adicionar um dispositivo"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Reproduzir em um grupo"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nenhuma informação disponível"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistema"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Dispositivos"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Botão \"Transmitir\""</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Botão \"Transmitir\". Desconectado"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Botão \"Transmitir\". Conectando"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Botão \"Transmitir\". Conectado"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Transmitir para"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Localizando dispositivos"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Desconectar"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Parar transmissão"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Fechar"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Reproduzir"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pausar"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Parar"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Expandir"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Recolher"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Arte do álbum"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Controle deslizante de volume"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nenhuma mídia selecionada"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nenhuma informação disponível"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Transmitindo tela"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Adicionar um dispositivo"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproduzir em um grupo"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nenhuma informação disponível"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ro/strings.xml b/mediarouter/mediarouter/src/main/res/values-ro/strings.xml
index 9c5d41c..2cf2770 100644
--- a/mediarouter/mediarouter/src/main/res/values-ro/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ro/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistem"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Dispozitive"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Butonul de proiecție"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Butonul de proiecție. Deconectat"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Butonul de proiecție. Se conectează"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Butonul de proiecție. Conectat"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Proiectați pe"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Se caută dispozitive"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Deconectați"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Nu mai proiectați"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Închideți"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Redați"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Întrerupeți"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Opriți"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Extindeți"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Restrângeți"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Grafica albumului"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Glisor pentru volum"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Niciun conținut media selectat"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nu sunt disponibile informații"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Se proiectează ecranul"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Adăugați un dispozitiv"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Redați într-un grup"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nu sunt informații disponibile"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistem"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Dispozitive"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Butonul de proiecție"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Butonul de proiecție. Deconectat"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Butonul de proiecție. Se conectează"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Butonul de proiecție. Conectat"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Proiectați pe"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Se caută dispozitive"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Deconectați"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Nu mai proiectați"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Închideți"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Redați"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Întrerupeți"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Opriți"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Extindeți"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Restrângeți"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Grafica albumului"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Glisor pentru volum"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Niciun conținut media selectat"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nu sunt disponibile informații"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Se proiectează ecranul"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Adăugați un dispozitiv"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Redați într-un grup"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nu sunt informații disponibile"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ru/strings.xml b/mediarouter/mediarouter/src/main/res/values-ru/strings.xml
index ecac6e3..ba44457 100644
--- a/mediarouter/mediarouter/src/main/res/values-ru/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ru/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Система"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Устройства"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Кнопка трансляции"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Кнопка трансляции. Устройство отключено."</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Кнопка трансляции. Устройство подключается."</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Кнопка трансляции. Устройство подключено."</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Транслировать на"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Поиск устройств…"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Отключить"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Остановить трансляцию"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Закрыть"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Воспроизвести"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Приостановить"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Остановить"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Показать"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Скрыть"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Обложка"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Регулятор громкости"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Медиафайл не выбран"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Данных нет"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Трансляция экрана…"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Добавление устройства"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Воспроизведение в группе"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Данных нет"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Система"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Устройства"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Кнопка трансляции"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Кнопка трансляции. Устройство отключено."</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Кнопка трансляции. Устройство подключается."</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Кнопка трансляции. Устройство подключено."</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Транслировать на"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Поиск устройств…"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Отключить"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Остановить трансляцию"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Закрыть"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Воспроизвести"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Приостановить"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Остановить"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Показать"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Скрыть"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Обложка"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Регулятор громкости"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Медиафайл не выбран"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Данных нет"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Трансляция экрана…"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Добавление устройства"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Воспроизведение в группе"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Данных нет"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-si/strings.xml b/mediarouter/mediarouter/src/main/res/values-si/strings.xml
index 0578256..aaf76d4 100644
--- a/mediarouter/mediarouter/src/main/res/values-si/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-si/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"පද්ධතිය"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"උපාංග"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"විකාශ බොත්තම"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"විකාශ බොත්තම. විසන්ධි කරන ලදී"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"විකාශ බොත්තම සම්බන්ධ කරමින්"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"විකාශ බොත්තම සම්බන්ධ කරන ලදී"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"විකාශය"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"උපාංග සෙවීම"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"විසන්ධි කරන්න"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"විකාශය නවතන්න"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"වසන්න"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"ධාවනය කරන්න"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"විරාමය"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"නවත්වන්න"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"දිග හරින්න"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"හකුළන්න"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"ඇල්බම කලාව"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"හඬ පරිමා ස්ලයිඩරය"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"මාධ්‍ය තෝරා නැත"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"ලබා ගත හැකි තොරතුරු නොමැත"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"විකාශ තිරය"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"උපාංගයක් එක් කරන්න"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"සමූහයක ධාවනය කරන්න"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"ලබා ගත හැකි තොරතුරු නොමැත"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"පද්ධතිය"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"උපාංග"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"විකාශ බොත්තම"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"විකාශ බොත්තම. විසන්ධි කරන ලදී"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"විකාශ බොත්තම සම්බන්ධ කරමින්"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"විකාශ බොත්තම සම්බන්ධ කරන ලදී"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"විකාශය"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"උපාංග සෙවීම"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"විසන්ධි කරන්න"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"විකාශය නවතන්න"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"වසන්න"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"ධාවනය කරන්න"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"විරාමය"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"නවත්වන්න"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"දිග හරින්න"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"හකුළන්න"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"ඇල්බම කලාව"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"හඬ පරිමා ස්ලයිඩරය"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"මාධ්‍ය තෝරා නැත"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"ලබා ගත හැකි තොරතුරු නොමැත"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"විකාශ තිරය"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"උපාංගයක් එක් කරන්න"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"සමූහයක ධාවනය කරන්න"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ලබා ගත හැකි තොරතුරු නොමැත"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sk/strings.xml b/mediarouter/mediarouter/src/main/res/values-sk/strings.xml
index 042007a..fd5498b 100644
--- a/mediarouter/mediarouter/src/main/res/values-sk/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sk/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Systém"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Zariadenia"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Tlačidlo prenosu"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Tlačidlo prenosu. Odpojené"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Tlačidlo prenosu. Pripája sa"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Tlačidlo prenosu. Pripojené"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Prenos do zariadenia"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Hľadajú sa zariadenia"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Odpojiť"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Zastaviť prenos"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Zavrieť"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Prehrať"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pozastaviť"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Zastaviť"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Rozbaliť"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Zbaliť"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Obrázok albumu"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Posúvač hlasitosti"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nie sú vybraté žiadne médiá"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nie sú k dispozícii žiadne informácie"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Prenáša sa obrazovka"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Pridanie zariadenia"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Prehrávanie v skupine"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nie sú k dispozícii žiadne informácie"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Systém"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Zariadenia"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Tlačidlo prenosu"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Tlačidlo prenosu. Odpojené"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Tlačidlo prenosu. Pripája sa"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Tlačidlo prenosu. Pripojené"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Prenos do zariadenia"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Hľadajú sa zariadenia"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Odpojiť"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Zastaviť prenos"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Zavrieť"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Prehrať"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pozastaviť"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Zastaviť"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Rozbaliť"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Zbaliť"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Obrázok albumu"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Posúvač hlasitosti"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nie sú vybraté žiadne médiá"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nie sú k dispozícii žiadne informácie"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Prenáša sa obrazovka"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Pridanie zariadenia"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Prehrávanie v skupine"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nie sú k dispozícii žiadne informácie"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sl/strings.xml b/mediarouter/mediarouter/src/main/res/values-sl/strings.xml
index 9bb0cc6..19a4958 100644
--- a/mediarouter/mediarouter/src/main/res/values-sl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sl/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistem"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Naprave"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Gumb za predvajanje"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Gumb za predvajanje. Povezava je prekinjena."</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Gumb za predvajanje. Vzpostavljanje povezave."</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Gumb za predvajanje. Povezava je vzpostavljena."</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Predvajanje v napravi:"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Iskanje naprav"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Prekini povezavo"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Ustavi predvajanje"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Zapri"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Predvajaj"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Začasno ustavi"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Ustavi"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Razširi"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Strni"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Naslovnica albuma"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Drsnik za glasnost"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Predstavnost ni izbrana"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Ni podatkov"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Predvajanje vsebine zaslona"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Dodajanje naprave"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Predvajanje v skupini"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Ni podatkov"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistem"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Naprave"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Gumb za predvajanje"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Gumb za predvajanje. Povezava je prekinjena."</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Gumb za predvajanje. Vzpostavljanje povezave."</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Gumb za predvajanje. Povezava je vzpostavljena."</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Predvajanje v napravi:"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Iskanje naprav"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Prekini povezavo"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Ustavi predvajanje"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Zapri"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Predvajaj"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Začasno ustavi"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Ustavi"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Razširi"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Strni"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Naslovnica albuma"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Drsnik za glasnost"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Predstavnost ni izbrana"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Ni podatkov"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Predvajanje vsebine zaslona"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Dodajanje naprave"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Predvajanje v skupini"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Ni podatkov"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sq/strings.xml b/mediarouter/mediarouter/src/main/res/values-sq/strings.xml
index 2460332..ece4524 100644
--- a/mediarouter/mediarouter/src/main/res/values-sq/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sq/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistemi"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Pajisjet"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Butoni i transmetimit"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Butoni i transmetimit. Je i shkëputur"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Butoni i transmetimit. Po lidhet"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Butoni i transmetimit. Je i lidhur"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Transmeto te"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Po kërkon pajisje"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Shkëput"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Ndalo transmetimin"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Mbyll"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Luaj"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pauzë"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Ndalo"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Zgjero"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Palos"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Kopertina e albumit"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Rrëshqitësi i volumit"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Nuk është zgjedhur asnjë media"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Nuk jepet asnjë informacion"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Po transmeton ekranin"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Shto një pajisje"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Luaj në një grup"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Nuk jepet asnjë informacion"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistemi"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Pajisjet"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Butoni i transmetimit"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Butoni i transmetimit. Je i shkëputur"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Butoni i transmetimit. Po lidhet"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Butoni i transmetimit. Je i lidhur"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Transmeto te"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Po kërkon pajisje"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Shkëput"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Ndalo transmetimin"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Mbyll"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Luaj"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pauzë"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Ndalo"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Zgjero"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Palos"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Kopertina e albumit"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Rrëshqitësi i volumit"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Nuk është zgjedhur asnjë media"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Nuk jepet asnjë informacion"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Po transmeton ekranin"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Shto një pajisje"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Luaj në një grup"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nuk jepet asnjë informacion"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sr/strings.xml b/mediarouter/mediarouter/src/main/res/values-sr/strings.xml
index 441ab41..1990c6e 100644
--- a/mediarouter/mediarouter/src/main/res/values-sr/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sr/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Систем"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Уређаји"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Дугме Пребаци"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Дугме Пребаци. Веза је прекинута"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Дугме Пребаци. Повезује се"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Дугме Пребаци. Повезан је"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Пребаците на"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Траже се уређаји"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Прекини везу"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Заустави пребацивање"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Затвори"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Пусти"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Паузирај"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Заустави"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Прошири"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Скупи"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Омот албума"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Клизач за јачину звука"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Нема изабраних медија"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Нема доступних информација"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Пребацује се екран"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Додајте уређај"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Пуштајте у групи"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Нема доступних информација"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Систем"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Уређаји"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Дугме Пребаци"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Дугме Пребаци. Веза је прекинута"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Дугме Пребаци. Повезује се"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Дугме Пребаци. Повезан је"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Пребаците на"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Траже се уређаји"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Прекини везу"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Заустави пребацивање"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Затвори"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Пусти"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Паузирај"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Заустави"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Прошири"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Скупи"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Омот албума"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Клизач за јачину звука"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Нема изабраних медија"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Нема доступних информација"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Пребацује се екран"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Додајте уређај"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Пуштајте у групи"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Нема доступних информација"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sv/strings.xml b/mediarouter/mediarouter/src/main/res/values-sv/strings.xml
index 9565717..a99a567 100644
--- a/mediarouter/mediarouter/src/main/res/values-sv/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sv/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"System"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Enheter"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast-knappen"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast-knappen. Frånkopplad"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast-knappen. Ansluter"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast-knappen. Ansluten"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Casta till"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Letar efter enheter"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Koppla från"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Sluta casta"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Stäng"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Spela upp"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pausa"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Stopp"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Utöka"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Dölj"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Skivomslag"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Volymreglage"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Ingen media har valts"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Det finns ingen information"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Skärmen castas"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Lägga till en enhet"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Spela upp på en grupp enheter"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Det finns ingen tillgänglig information"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"System"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Enheter"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast-knappen"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast-knappen. Frånkopplad"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast-knappen. Ansluter"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast-knappen. Ansluten"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Casta till"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Letar efter enheter"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Koppla från"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Sluta casta"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Stäng"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Spela upp"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pausa"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Stopp"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Utöka"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Dölj"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Skivomslag"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Volymreglage"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Ingen media har valts"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Det finns ingen information"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Skärmen castas"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Lägga till en enhet"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Spela upp på en grupp enheter"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Det finns ingen tillgänglig information"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sw/strings.xml b/mediarouter/mediarouter/src/main/res/values-sw/strings.xml
index 3a2ca3d..fdf6866 100644
--- a/mediarouter/mediarouter/src/main/res/values-sw/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sw/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Mfumo"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Vifaa"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Kitufe cha kutuma"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Kitufe cha kutuma. Kimeondolewa"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Kitufe cha kutuma. Kinaunganishwa"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Kitufe cha kutuma. Kimeunganishwa"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Tuma kwenye"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Inatafuta vifaa"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Ondoa"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Acha kutuma"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Funga"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Cheza"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Sitisha"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Acha kucheza"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Panua"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Kunja"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Sanaa ya albamu"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Kidhibiti cha sauti"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Hakuna maudhui yaliyochaguliwa"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Hakuna maelezo yaliyopatikana"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Inatuma skrini"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Ongeza kifaa"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Cheza kwenye kikundi"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Hakuna maelezo yaliyopatikana"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Mfumo"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Vifaa"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Kitufe cha kutuma"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Kitufe cha kutuma. Kimeondolewa"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Kitufe cha kutuma. Kinaunganishwa"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Kitufe cha kutuma. Kimeunganishwa"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Tuma kwenye"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Inatafuta vifaa"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Ondoa"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Acha kutuma"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Funga"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Cheza"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Sitisha"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Acha kucheza"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Panua"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Kunja"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Sanaa ya albamu"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Kidhibiti cha sauti"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Hakuna maudhui yaliyochaguliwa"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Hakuna maelezo yaliyopatikana"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Inatuma skrini"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Ongeza kifaa"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Cheza kwenye kikundi"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Hakuna maelezo yaliyopatikana"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ta/strings.xml b/mediarouter/mediarouter/src/main/res/values-ta/strings.xml
index 7a873a7..28e9f85 100644
--- a/mediarouter/mediarouter/src/main/res/values-ta/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ta/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"சிஸ்டம்"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"சாதனங்கள்"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"அலைபரப்பும் பட்டன்"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"அலைபரப்பும் பட்டன். துண்டிக்கப்பட்டது"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"அலைபரப்பும் பட்டன். இணைக்கிறது"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"அலைபரப்பும் பட்டன். இணைக்கப்பட்டது"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"இதற்கு அலைபரப்பு:"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"சாதனங்களைத் தேடுகிறது"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"தொடர்பைத் துண்டி"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"அலைபரப்புவதை நிறுத்து"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"மூடுவதற்கான பட்டன்"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"இயக்குவதற்கான பட்டன்"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"இடைநிறுத்துவதற்கான பட்டன்"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"நிறுத்துவதற்கான பட்டன்"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"விரிப்பதற்கான பட்டன்"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"சுருக்குவதற்கான பட்டன்"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"ஆல்பம் ஆர்ட்"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"ஒலியளவு ஸ்லைடர்"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"மீடியா எதுவும் தேர்ந்தெடுக்கப்படவில்லை"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"தகவல் எதுவுமில்லை"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"திரையை அலைபரப்புகிறது"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"சாதனத்தைச் சேர்த்தல்"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"குழுவில் இயக்கு"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"தகவல் எதுவுமில்லை"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"சிஸ்டம்"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"சாதனங்கள்"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"அலைபரப்பும் பட்டன்"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"அலைபரப்பும் பட்டன். துண்டிக்கப்பட்டது"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"அலைபரப்பும் பட்டன். இணைக்கிறது"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"அலைபரப்பும் பட்டன். இணைக்கப்பட்டது"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"இதற்கு அலைபரப்பு:"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"சாதனங்களைத் தேடுகிறது"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"தொடர்பைத் துண்டி"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"அலைபரப்புவதை நிறுத்து"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"மூடுவதற்கான பட்டன்"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"இயக்குவதற்கான பட்டன்"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"இடைநிறுத்துவதற்கான பட்டன்"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"நிறுத்துவதற்கான பட்டன்"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"விரிப்பதற்கான பட்டன்"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"சுருக்குவதற்கான பட்டன்"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"ஆல்பம் ஆர்ட்"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"ஒலியளவு ஸ்லைடர்"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"மீடியா எதுவும் தேர்ந்தெடுக்கப்படவில்லை"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"தகவல் எதுவுமில்லை"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"திரையை அலைபரப்புகிறது"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"சாதனத்தைச் சேர்த்தல்"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"குழுவில் இயக்கு"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"தகவல் எதுவுமில்லை"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-te/strings.xml b/mediarouter/mediarouter/src/main/res/values-te/strings.xml
index c7ecd6c..919ee21 100644
--- a/mediarouter/mediarouter/src/main/res/values-te/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-te/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"సిస్టమ్"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"పరికరాలు"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Cast బటన్"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Cast బటన్. డిస్‌కనెక్ట్ చేయబడింది"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Cast బటన్. కనెక్ట్ చేస్తోంది"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Cast బటన్. కనెక్ట్ చేయబడింది"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"దీనికి ప్రసారం చేయండి"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"పరికరాలను కనుగొంటోంది"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"డిస్‌కనెక్ట్ చేయి"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"ప్రసారాన్ని ఆపివేయి"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"మూసివేయి"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"ఆడండి"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"పాజ్ చేయి"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"ఆపు"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"విస్తరించు"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"కుదించు"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"ఆల్బమ్ ఆర్ట్"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"వాల్యూమ్ స్లయిడర్"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"మీడియా ఏదీ ఎంచుకోలేదు"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"సమాచారం అందుబాటులో లేదు"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"స్క్రీన్‌ను ప్రసారం చేస్తోంది"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"పరికరాన్ని జోడించండి"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"సమూహంలో ప్లే చేయండి"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"సమాచారం అందుబాటులో లేదు"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"సిస్టమ్"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"పరికరాలు"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Cast బటన్"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Cast బటన్. డిస్‌కనెక్ట్ చేయబడింది"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Cast బటన్. కనెక్ట్ చేస్తోంది"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Cast బటన్. కనెక్ట్ చేయబడింది"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"దీనికి ప్రసారం చేయండి"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"పరికరాలను కనుగొంటోంది"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"డిస్‌కనెక్ట్ చేయి"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"ప్రసారాన్ని ఆపివేయి"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"మూసివేయి"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"ప్లే చేయి"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"పాజ్ చేయి"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"ఆపు"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"విస్తరించు"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"కుదించు"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"ఆల్బమ్ ఆర్ట్"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"వాల్యూమ్ స్లయిడర్"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"మీడియా ఏదీ ఎంచుకోలేదు"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"సమాచారం అందుబాటులో లేదు"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"స్క్రీన్‌ను ప్రసారం చేస్తోంది"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"పరికరాన్ని జోడించండి"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"సమూహంలో ప్లే చేయండి"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"సమాచారం అందుబాటులో లేదు"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-th/strings.xml b/mediarouter/mediarouter/src/main/res/values-th/strings.xml
index 2d63643..9807e46 100644
--- a/mediarouter/mediarouter/src/main/res/values-th/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-th/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"ระบบ"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"อุปกรณ์"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"ปุ่ม \"แคสต์\""</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"ปุ่ม \"แคสต์\" ยกเลิกการเชื่อมต่อแล้ว"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"ปุ่ม \"แคสต์\" กำลังเชื่อมต่อ"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"ปุ่ม \"แคสต์\" เชื่อมต่อแล้ว"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"แคสต์ไปยัง"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"กำลังค้นหาอุปกรณ์"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"ยกเลิกการเชื่อมต่อ"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"หยุดแคสต์"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"ปิด"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"เปิด"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"หยุดชั่วคราว"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"หยุด"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"ขยาย"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"ยุบ"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"ปกอัลบั้ม"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"แถบเลื่อนปรับระดับเสียง"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"ไม่ได้เลือกสื่อไว้"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"ไม่มีข้อมูล"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"กำลังแคสต์หน้าจอ"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"เพิ่มอุปกรณ์"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"เล่นในกลุ่ม"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"ไม่มีข้อมูล"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"ระบบ"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"อุปกรณ์"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"ปุ่ม \"แคสต์\""</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"ปุ่ม \"แคสต์\" ยกเลิกการเชื่อมต่อแล้ว"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"ปุ่ม \"แคสต์\" กำลังเชื่อมต่อ"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"ปุ่ม \"แคสต์\" เชื่อมต่อแล้ว"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"แคสต์ไปยัง"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"กำลังค้นหาอุปกรณ์"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"ยกเลิกการเชื่อมต่อ"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"หยุดแคสต์"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"ปิด"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"เปิด"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"หยุดชั่วคราว"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"หยุด"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"ขยาย"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"ยุบ"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"ปกอัลบั้ม"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"แถบเลื่อนปรับระดับเสียง"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"ไม่ได้เลือกสื่อไว้"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"ไม่มีข้อมูล"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"กำลังแคสต์หน้าจอ"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"เพิ่มอุปกรณ์"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"เล่นในกลุ่ม"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ไม่มีข้อมูล"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-tl/strings.xml b/mediarouter/mediarouter/src/main/res/values-tl/strings.xml
index b020499..ec62ed1 100644
--- a/mediarouter/mediarouter/src/main/res/values-tl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-tl/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"System"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Mga Device"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Button na I-cast"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Button na I-cast. Nadiskonekta"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Button na I-cast. Kumokonekta"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Button na I-cast. Nakakonekta"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"I-cast sa"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Naghahanap ng mga device"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Idiskonekta"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Ihinto ang pag-cast"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Isara"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"I-play"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"I-pause"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Ihinto"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"I-expand"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"I-collapse"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Album art"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Slider ng volume"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Walang napiling media"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Walang available na impormasyon"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Ikina-cast ang screen"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Magdagdag ng device"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"I-play sa isang pangkat"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Walang available na impormasyon"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"System"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Mga Device"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Button na I-cast"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Button na I-cast. Nadiskonekta"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Button na I-cast. Kumokonekta"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Button na I-cast. Nakakonekta"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"I-cast sa"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Naghahanap ng mga device"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Idiskonekta"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Ihinto ang pag-cast"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Isara"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"I-play"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"I-pause"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Ihinto"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"I-expand"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"I-collapse"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Album art"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Slider ng volume"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Walang napiling media"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Walang available na impormasyon"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Ikina-cast ang screen"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Magdagdag ng device"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"I-play sa isang pangkat"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Walang available na impormasyon"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-tr/strings.xml b/mediarouter/mediarouter/src/main/res/values-tr/strings.xml
index b9f813c..9a38fcc 100644
--- a/mediarouter/mediarouter/src/main/res/values-tr/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-tr/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Sistem"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Cihazlar"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Yayınla düğmesi"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Yayınla düğmesi. Bağlantı kesildi"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Yayınla düğmesi. Bağlanıyor"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Yayınla düğmesi. Bağlandı"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Yayınlanacak yer:"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Cihazlar bulunuyor"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Bağlantıyı kes"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Yayını durdur"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Kapat"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Oynat"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Duraklat"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Durdur"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Genişlet"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Daralt"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albüm kapağı"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Ses düzeyi kaydırma çubuğu"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Medya seçilmedi"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Bilgi yok"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Ekran yayınlanıyor"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Cihaz ekleyin"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Bir grupta oynatın"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Bilgi yok"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Sistem"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Cihazlar"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Yayınla düğmesi"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Yayınla düğmesi. Bağlantı kesildi"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Yayınla düğmesi. Bağlanıyor"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Yayınla düğmesi. Bağlandı"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Yayınlanacak yer:"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Cihazlar bulunuyor"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Bağlantıyı kes"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Yayını durdur"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Kapat"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Oynat"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Duraklat"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Durdur"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Genişlet"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Daralt"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albüm kapağı"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Ses düzeyi kaydırma çubuğu"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Medya seçilmedi"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Bilgi yok"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Ekran yayınlanıyor"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Cihaz ekleyin"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Bir grupta oynatın"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Bilgi yok"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-uk/strings.xml b/mediarouter/mediarouter/src/main/res/values-uk/strings.xml
index 8fb875b..0c4c3bb 100644
--- a/mediarouter/mediarouter/src/main/res/values-uk/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-uk/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Система"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Пристрої"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Кнопка трансляції"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Кнопка трансляції. Від’єднано"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Кнопка трансляції. Під’єднання"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Кнопка трансляції. Під’єднано"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Транслювати на…"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Пошук пристроїв"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Від’єднати"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Припинити трансляцію"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Закрити"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Відтворити"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Призупинити"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Зупинити"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Розгорнути"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Згорнути"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Обкладинка альбому"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Повзунок гучності"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Не вибрано медіа-вміст"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Немає даних"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Трансляція екрана"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Додати пристрій"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Увімкнути на групі пристроїв"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Немає інформації"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Система"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Пристрої"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Кнопка трансляції"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Кнопка трансляції. Від’єднано"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Кнопка трансляції. Під’єднання"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Кнопка трансляції. Під’єднано"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Транслювати на…"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Пошук пристроїв"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Від’єднати"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Припинити трансляцію"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Закрити"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Відтворити"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Призупинити"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Зупинити"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Розгорнути"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Згорнути"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Обкладинка альбому"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Повзунок гучності"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Не вибрано медіа-вміст"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Немає даних"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Трансляція екрана"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Додати пристрій"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Увімкнути на групі пристроїв"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Немає інформації"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ur/strings.xml b/mediarouter/mediarouter/src/main/res/values-ur/strings.xml
index f242b70..0be3354 100644
--- a/mediarouter/mediarouter/src/main/res/values-ur/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ur/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"سسٹم"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"آلات"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"کاسٹ کرنے کا بٹن"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"کاسٹ کرنے کا بٹن۔ غیر منسلک ہے"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"کاسٹ کرنے کا بٹن۔ منسلک ہو رہا ہے"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"کاسٹ کرنے کا بٹن۔ منسلک ہے"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"اس میں کاسٹ کریں"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"آلات تلاش کیے جا رہے ہیں"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"غیر منسلک کریں"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"کاسٹ کرنا بند کریں"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"بند کریں"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"چلائیں"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"موقوف کریں"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"روکیں"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"پھیلائیں"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"سکیڑیں"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"البم آرٹ"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"والیوم سلائیڈر"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"کوئی میڈیا منتخب نہیں ہے"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"کوئی معلومات دستیاب نہیں ہے"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"اسکرین کاسٹ ہو رہی ہے"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"کوئی آلہ شامل کریں"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"گروپ پر چلائیں"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"کوئی معلومات دستیاب نہیں"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"سسٹم"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"آلات"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"کاسٹ کرنے کا بٹن"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"کاسٹ کرنے کا بٹن۔ غیر منسلک ہے"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"کاسٹ کرنے کا بٹن۔ منسلک ہو رہا ہے"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"کاسٹ کرنے کا بٹن۔ منسلک ہے"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"اس میں کاسٹ کریں"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"آلات تلاش کیے جا رہے ہیں"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"غیر منسلک کریں"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"کاسٹ کرنا بند کریں"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"بند کریں"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"چلائیں"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"موقوف کریں"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"روکیں"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"پھیلائیں"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"سکیڑیں"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"البم آرٹ"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"والیوم سلائیڈر"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"کوئی میڈیا منتخب نہیں ہے"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"کوئی معلومات دستیاب نہیں ہے"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"اسکرین کاسٹ ہو رہی ہے"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"کوئی آلہ شامل کریں"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"گروپ پر چلائیں"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"کوئی معلومات دستیاب نہیں"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-uz/strings.xml b/mediarouter/mediarouter/src/main/res/values-uz/strings.xml
index c0fb4067..2560a80 100644
--- a/mediarouter/mediarouter/src/main/res/values-uz/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-uz/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Tizim"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Qurilmalar"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Translatsiya tugmasi"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Translatsiya tugmasi. Uzildi"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Translatsiya tugmasi. Ulanmoqda"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Translatsiya tugmasi. Ulandi"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Bunga translatsiya qilish:"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Qurilmalarni topish"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Uzish"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Translatsiyani to‘xtatish"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Yopish"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Ijro"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Pauza"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"To‘xtatish"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Yoyish"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Kichraytirish"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Albom muqovasi"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Tovush balandligi slayderi"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Hech narsa tanlanmagan"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Hech narsa topilmadi"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Ekran namoyish qilinmoqda"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Qurilma qo‘shish"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Guruhda ijro qilish"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Hech narsa topilmadi"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Tizim"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Qurilmalar"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Translatsiya tugmasi"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Translatsiya tugmasi. Uzildi"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Translatsiya tugmasi. Ulanmoqda"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Translatsiya tugmasi. Ulandi"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Bunga translatsiya qilish:"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Qurilmalarni topish"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Uzish"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Translatsiyani to‘xtatish"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Yopish"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Ijro"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Pauza"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"To‘xtatish"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Yoyish"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Kichraytirish"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Albom muqovasi"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Tovush balandligi slayderi"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Hech narsa tanlanmagan"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Hech narsa topilmadi"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Ekran namoyish qilinmoqda"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Qurilma qo‘shish"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Guruhda ijro qilish"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Hech narsa topilmadi"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-vi/strings.xml b/mediarouter/mediarouter/src/main/res/values-vi/strings.xml
index 6797629..9231f7b0 100644
--- a/mediarouter/mediarouter/src/main/res/values-vi/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-vi/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Hệ thống"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Thiết bị"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Nút truyền"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Nút truyền. Đã ngắt kết nối"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Nút truyền. Đang kết nối"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Nút truyền. Đã kết nối"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Truyền tới"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Đang tìm thiết bị"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Ngắt kết nối"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Dừng truyền"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Đóng"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Phát"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Tạm dừng"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Dừng"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Mở rộng"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Thu gọn"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Ảnh bìa album"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Thanh trượt âm lượng"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Chưa chọn phương tiện nào"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Không có thông tin nào"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Đang truyền màn hình"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Thêm thiết bị"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Phát trên nhóm"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Không có thông tin nào"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Hệ thống"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Thiết bị"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Nút truyền"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Nút truyền. Đã ngắt kết nối"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Nút truyền. Đang kết nối"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Nút truyền. Đã kết nối"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Truyền tới"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Đang tìm thiết bị"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Ngắt kết nối"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Dừng truyền"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Đóng"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Phát"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Tạm dừng"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Dừng"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Mở rộng"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Thu gọn"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Ảnh bìa album"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Thanh trượt âm lượng"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Chưa chọn phương tiện nào"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Không có thông tin nào"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Đang truyền màn hình"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Thêm thiết bị"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Phát trên nhóm"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Không có thông tin nào"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml b/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml
index 589cff6..cc120cf 100644
--- a/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"系统"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"设备"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"投射按钮"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"投射按钮。已断开连接"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"投射按钮。正在连接"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"投射按钮。已连接"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"投射到"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"正在查找设备"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"断开连接"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"停止投射"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"关闭"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"播放"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"暂停"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"停止"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"展开"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"收起"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"专辑封面"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"音量滑块"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"未选择任何媒体内容"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"没有任何相关信息"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"正在投射屏幕"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"添加设备"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"在一组设备上播放"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"没有任何相关信息"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"系统"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"设备"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"投射按钮"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"投射按钮。已断开连接"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"投射按钮。正在连接"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"投射按钮。已连接"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"投射到"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"正在查找设备"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"断开连接"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"停止投射"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"关闭"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"播放"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"暂停"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"停止"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"展开"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"收起"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"专辑封面"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"音量滑块"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"未选择任何媒体内容"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"没有任何相关信息"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"正在投射屏幕"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"添加设备"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"在一组设备上播放"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"没有任何相关信息"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml b/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml
index 24db356..f4b4b49 100644
--- a/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"系統"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"裝置"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"投放按鈕"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"投放按鈕。解除咗連線"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"投放按鈕。連緊線"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"投放按鈕。連咗線"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"投放至"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"正在尋找裝置"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"解除連接"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"停止投放"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"閂"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"播"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"暫停"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"停"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"展開"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"收合"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"專輯封面"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"音量滑桿"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"未選取任何媒體"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"沒有資料可以提供"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"正在投放畫面"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"新增裝置"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"在群組裝置中播放"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"沒有資料可以提供"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"系統"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"裝置"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"投放按鈕"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"投放按鈕。解除咗連線"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"投放按鈕。連緊線"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"投放按鈕。連咗線"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"投放至"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"正在尋找裝置"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"解除連接"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"停止投放"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"閂"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"播"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"暫停"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"停"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"展開"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"收合"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"專輯封面"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"音量滑桿"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"未選取任何媒體"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"沒有資料可以提供"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"正在投放畫面"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"新增裝置"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"在群組裝置中播放"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"沒有資料可以提供"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml b/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml
index 2602b88..b6296a6 100644
--- a/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"系統"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"裝置"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"投放按鈕"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"投放按鈕;已中斷連線"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"投放按鈕;連線中"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"投放按鈕;已連線"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"投放到"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"正在尋找裝置"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"中斷連線"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"停止投放"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"關閉"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"播放"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"暫停"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"停止"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"展開"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"收合"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"專輯封面"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"音量滑桿"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"未選取任何媒體"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"沒有可用的資訊"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"正在投放畫面"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"新增裝置"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"在群組上播放"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"沒有可用的資訊"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"系統"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"裝置"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"投放按鈕"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"投放按鈕;已中斷連線"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"投放按鈕;連線中"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"投放按鈕;已連線"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"投放到"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"正在尋找裝置"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"中斷連線"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"停止投放"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"關閉"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"播放"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"暫停"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"停止"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"展開"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"收合"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"專輯封面"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"音量滑桿"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"未選取任何媒體"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"沒有可用的資訊"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"正在投放畫面"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"新增裝置"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"在群組上播放"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"沒有可用的資訊"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zu/strings.xml b/mediarouter/mediarouter/src/main/res/values-zu/strings.xml
index d53dfac..00a4777 100644
--- a/mediarouter/mediarouter/src/main/res/values-zu/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zu/strings.xml
@@ -16,28 +16,28 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mr_system_route_name" msgid="3117964881088969586">"Isistimu"</string>
-    <string name="mr_user_route_category_name" msgid="8236416097133080726">"Amadivayisi"</string>
-    <string name="mr_button_content_description" msgid="1685185767093348095">"Inkinobho yokusakaza"</string>
-    <string name="mr_cast_button_disconnected" msgid="5501231066847739632">"Inkinobho yokusakaza. Kunqanyuliwe"</string>
-    <string name="mr_cast_button_connecting" msgid="8959304318293841992">"Inkinobho yokusakaza. Kuyaxhunywa"</string>
-    <string name="mr_cast_button_connected" msgid="1350095112462806159">"Inkinobho yokusakaza. Kuxhunyiwe"</string>
-    <string name="mr_chooser_title" msgid="7548226170787476564">"Sakaza ku-"</string>
-    <string name="mr_chooser_searching" msgid="5504553798429329689">"Ithola amadivayisi"</string>
-    <string name="mr_controller_disconnect" msgid="1370654436555555647">"Nqamula"</string>
-    <string name="mr_controller_stop_casting" msgid="7617024847862349259">"Misa ukusakaza"</string>
-    <string name="mr_controller_close_description" msgid="5468775621814500662">"Vala"</string>
-    <string name="mr_controller_play" msgid="4443315438268112801">"Dlala"</string>
-    <string name="mr_controller_pause" msgid="4701315813294065305">"Phumula"</string>
-    <string name="mr_controller_stop" msgid="5106056093749454009">"Misa"</string>
-    <string name="mr_controller_expand_group" msgid="2422682304043876468">"Nweba"</string>
-    <string name="mr_controller_collapse_group" msgid="5518911192681928413">"Goqa"</string>
-    <string name="mr_controller_album_art" msgid="5813284753012893250">"Ubuciko be-albhamu"</string>
-    <string name="mr_controller_volume_slider" msgid="691656961160498512">"Isilayida sevolumu"</string>
-    <string name="mr_controller_no_media_selected" msgid="4342878516155861006">"Ayikho imidiya ekhethiwe"</string>
-    <string name="mr_controller_no_info_available" msgid="7299368841849988218">"Alukho ulwazi olutholakalayo"</string>
-    <string name="mr_controller_casting_screen" msgid="5286734709674025661">"Isikrini sokusakaza"</string>
-    <string name="mr_dialog_groupable_header" msgid="470815817763403488">"Engeza idivayisi"</string>
-    <string name="mr_dialog_transferable_header" msgid="8242946697267839296">"Dlala eqenjini"</string>
-    <string name="mr_cast_dialog_title_view_placeholder" msgid="6167045754274068030">"Alukho ulwazi olutholakalayo"</string>
+    <string name="mr_system_route_name" msgid="7449553026175453403">"Isistimu"</string>
+    <string name="mr_user_route_category_name" msgid="4088331695424166162">"Amadivayisi"</string>
+    <string name="mr_button_content_description" msgid="2312677190680671081">"Inkinobho yokusakaza"</string>
+    <string name="mr_cast_button_disconnected" msgid="5305518452578895913">"Inkinobho yokusakaza. Kunqanyuliwe"</string>
+    <string name="mr_cast_button_connecting" msgid="5725704441125342766">"Inkinobho yokusakaza. Kuyaxhunywa"</string>
+    <string name="mr_cast_button_connected" msgid="4266221213305642633">"Inkinobho yokusakaza. Kuxhunyiwe"</string>
+    <string name="mr_chooser_title" msgid="1419936397646839840">"Sakaza ku-"</string>
+    <string name="mr_chooser_searching" msgid="6114250663023140921">"Ithola amadivayisi"</string>
+    <string name="mr_controller_disconnect" msgid="7812275474138309497">"Nqamula"</string>
+    <string name="mr_controller_stop_casting" msgid="804210341192624074">"Misa ukusakaza"</string>
+    <string name="mr_controller_close_description" msgid="5684434439232634509">"Vala"</string>
+    <string name="mr_controller_play" msgid="1253345086594430054">"Dlala"</string>
+    <string name="mr_controller_pause" msgid="747801650871398383">"Phumula"</string>
+    <string name="mr_controller_stop" msgid="5497722768305745508">"Misa"</string>
+    <string name="mr_controller_expand_group" msgid="4521419834052044261">"Nweba"</string>
+    <string name="mr_controller_collapse_group" msgid="2585048604188129749">"Goqa"</string>
+    <string name="mr_controller_album_art" msgid="3330502667672708728">"Ubuciko be-albhamu"</string>
+    <string name="mr_controller_volume_slider" msgid="2955862765169128170">"Isilayida sevolumu"</string>
+    <string name="mr_controller_no_media_selected" msgid="5495452265246139458">"Ayikho imidiya ekhethiwe"</string>
+    <string name="mr_controller_no_info_available" msgid="855271725131981086">"Alukho ulwazi olutholakalayo"</string>
+    <string name="mr_controller_casting_screen" msgid="9171231064758955152">"Isikrini sokusakaza"</string>
+    <string name="mr_dialog_groupable_header" msgid="4307018456678388936">"Engeza idivayisi"</string>
+    <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Dlala eqenjini"</string>
+    <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Alukho ulwazi olutholakalayo"</string>
 </resources>
diff --git a/navigation/navigation-common-ktx/api/2.3.0-alpha05.txt b/navigation/navigation-common-ktx/api/2.3.0-alpha05.txt
index 66b075b..5817198 100644
--- a/navigation/navigation-common-ktx/api/2.3.0-alpha05.txt
+++ b/navigation/navigation-common-ktx/api/2.3.0-alpha05.txt
@@ -58,13 +58,13 @@
     ctor public NavDeepLinkDslBuilder();
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
     method public void setAction(String? p);
     method public void setMimeType(String? p);
-    method public void setUri(String? p);
+    method public void setUriPattern(String? p);
     property public final String? action;
     property public final String? mimeType;
-    property public final String? uri;
+    property public final String? uriPattern;
   }
 
   public final class NavDeepLinkDslBuilderKt {
diff --git a/navigation/navigation-common-ktx/api/2.3.0-alpha06.txt b/navigation/navigation-common-ktx/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..5817198
--- /dev/null
+++ b/navigation/navigation-common-ktx/api/2.3.0-alpha06.txt
@@ -0,0 +1,147 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  @androidx.navigation.NavOptionsDsl public final class AnimBuilder {
+    ctor public AnimBuilder();
+    method public int getEnter();
+    method public int getExit();
+    method public int getPopEnter();
+    method public int getPopExit();
+    method public void setEnter(int p);
+    method public void setExit(int p);
+    method public void setPopEnter(int p);
+    method public void setPopExit(int p);
+    property public final int enter;
+    property public final int exit;
+    property public final int popEnter;
+    property public final int popExit;
+  }
+
+  @androidx.navigation.NavDestinationDsl public final class NavActionBuilder {
+    ctor public NavActionBuilder();
+    method public java.util.Map<java.lang.String,java.lang.Object> getDefaultArguments();
+    method public int getDestinationId();
+    method public void navOptions(kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit> optionsBuilder);
+    method public void setDestinationId(int p);
+    property public final java.util.Map<java.lang.String,java.lang.Object> defaultArguments;
+    property public final int destinationId;
+  }
+
+  public final class NavArgsLazy<Args extends androidx.navigation.NavArgs> implements kotlin.Lazy<Args> {
+    ctor public NavArgsLazy(kotlin.reflect.KClass<Args> navArgsClass, kotlin.jvm.functions.Function0<android.os.Bundle> argumentProducer);
+    method public Args getValue();
+    method public boolean isInitialized();
+    property public Args value;
+  }
+
+  public final class NavArgsLazyKt {
+  }
+
+  @androidx.navigation.NavDestinationDsl public final class NavArgumentBuilder {
+    ctor public NavArgumentBuilder();
+    method public androidx.navigation.NavArgument build();
+    method public Object? getDefaultValue();
+    method public boolean getNullable();
+    method public androidx.navigation.NavType<?> getType();
+    method public void setDefaultValue(Object? value);
+    method public void setNullable(boolean value);
+    method public void setType(androidx.navigation.NavType<?> value);
+    property public final Object? defaultValue;
+    property public final boolean nullable;
+    property public final androidx.navigation.NavType<?> type;
+  }
+
+  @kotlin.DslMarker public @interface NavDeepLinkDsl {
+  }
+
+  @androidx.navigation.NavDeepLinkDsl public final class NavDeepLinkDslBuilder {
+    ctor public NavDeepLinkDslBuilder();
+    method public String? getAction();
+    method public String? getMimeType();
+    method public String? getUriPattern();
+    method public void setAction(String? p);
+    method public void setMimeType(String? p);
+    method public void setUriPattern(String? p);
+    property public final String? action;
+    property public final String? mimeType;
+    property public final String? uriPattern;
+  }
+
+  public final class NavDeepLinkDslBuilderKt {
+    method public static androidx.navigation.NavDeepLink navDeepLink(kotlin.jvm.functions.Function1<? super androidx.navigation.NavDeepLinkDslBuilder,kotlin.Unit> deepLinkBuilder);
+  }
+
+  @androidx.navigation.NavDestinationDsl public class NavDestinationBuilder<D extends androidx.navigation.NavDestination> {
+    ctor public NavDestinationBuilder(androidx.navigation.Navigator<? extends D> navigator, @IdRes int id);
+    method public final void action(int actionId, kotlin.jvm.functions.Function1<? super androidx.navigation.NavActionBuilder,kotlin.Unit> actionBuilder);
+    method public final void argument(String name, kotlin.jvm.functions.Function1<? super androidx.navigation.NavArgumentBuilder,kotlin.Unit> argumentBuilder);
+    method public D build();
+    method public final void deepLink(String uriPattern);
+    method public final void deepLink(kotlin.jvm.functions.Function1<? super androidx.navigation.NavDeepLinkDslBuilder,kotlin.Unit> navDeepLink);
+    method public final int getId();
+    method public final CharSequence? getLabel();
+    method protected final androidx.navigation.Navigator<? extends D> getNavigator();
+    method public final void setLabel(CharSequence? p);
+    property public final CharSequence? label;
+  }
+
+  @kotlin.DslMarker public @interface NavDestinationDsl {
+  }
+
+  @androidx.navigation.NavDestinationDsl public class NavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.NavGraph> {
+    ctor public NavGraphBuilder(androidx.navigation.NavigatorProvider provider, @IdRes int id, @IdRes int startDestination);
+    method public final void addDestination(androidx.navigation.NavDestination destination);
+    method public androidx.navigation.NavGraph build();
+    method public final <D extends androidx.navigation.NavDestination> void destination(androidx.navigation.NavDestinationBuilder<? extends D> navDestination);
+    method public final androidx.navigation.NavigatorProvider getProvider();
+    method public final operator void unaryPlus(androidx.navigation.NavDestination);
+  }
+
+  public final class NavGraphBuilderKt {
+    method public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline void navigation(androidx.navigation.NavGraphBuilder, @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavGraphKt {
+    method public static operator boolean contains(androidx.navigation.NavGraph, @IdRes int id);
+    method public static inline operator androidx.navigation.NavDestination get(androidx.navigation.NavGraph, @IdRes int id);
+    method public static inline operator void minusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
+    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
+    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavGraph other);
+  }
+
+  @androidx.navigation.NavOptionsDsl public final class NavOptionsBuilder {
+    ctor public NavOptionsBuilder();
+    method public void anim(kotlin.jvm.functions.Function1<? super androidx.navigation.AnimBuilder,kotlin.Unit> animBuilder);
+    method public boolean getLaunchSingleTop();
+    method public int getPopUpTo();
+    method public void popUpTo(@IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.PopUpToBuilder,kotlin.Unit> popUpToBuilder);
+    method public void setLaunchSingleTop(boolean p);
+    method public void setPopUpTo(int value);
+    property public final boolean launchSingleTop;
+    property public final int popUpTo;
+  }
+
+  public final class NavOptionsBuilderKt {
+    method public static androidx.navigation.NavOptions navOptions(kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit> optionsBuilder);
+  }
+
+  @kotlin.DslMarker public @interface NavOptionsDsl {
+  }
+
+  public final class NavigatorProviderKt {
+    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, String name);
+    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, kotlin.reflect.KClass<T> clazz);
+    method public static inline operator void plusAssign(androidx.navigation.NavigatorProvider, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
+    method public static inline operator androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? set(androidx.navigation.NavigatorProvider, String name, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
+  }
+
+  @androidx.navigation.NavOptionsDsl public final class PopUpToBuilder {
+    ctor public PopUpToBuilder();
+    method public boolean getInclusive();
+    method public void setInclusive(boolean p);
+    property public final boolean inclusive;
+  }
+
+}
+
diff --git a/navigation/navigation-common-ktx/api/api_lint.ignore b/navigation/navigation-common-ktx/api/api_lint.ignore
index 6580f64..6ba701d 100644
--- a/navigation/navigation-common-ktx/api/api_lint.ignore
+++ b/navigation/navigation-common-ktx/api/api_lint.ignore
@@ -37,8 +37,8 @@
     Methods must return the builder object (return type androidx.navigation.NavDeepLinkDslBuilder instead of void): method androidx.navigation.NavDeepLinkDslBuilder.setAction(String)
 SetterReturnsThis: androidx.navigation.NavDeepLinkDslBuilder#setMimeType(String):
     Methods must return the builder object (return type androidx.navigation.NavDeepLinkDslBuilder instead of void): method androidx.navigation.NavDeepLinkDslBuilder.setMimeType(String)
-SetterReturnsThis: androidx.navigation.NavDeepLinkDslBuilder#setUri(String):
-    Methods must return the builder object (return type androidx.navigation.NavDeepLinkDslBuilder instead of void): method androidx.navigation.NavDeepLinkDslBuilder.setUri(String)
+SetterReturnsThis: androidx.navigation.NavDeepLinkDslBuilder#setUriPattern(String):
+    Methods must return the builder object (return type androidx.navigation.NavDeepLinkDslBuilder instead of void): method androidx.navigation.NavDeepLinkDslBuilder.setUriPattern(String)
 SetterReturnsThis: androidx.navigation.NavDestinationBuilder#setLabel(CharSequence):
     Methods must return the builder object (return type androidx.navigation.NavDestinationBuilder<D> instead of void): method androidx.navigation.NavDestinationBuilder.setLabel(CharSequence)
 SetterReturnsThis: androidx.navigation.NavOptionsBuilder#setLaunchSingleTop(boolean):
diff --git a/navigation/navigation-common-ktx/api/current.txt b/navigation/navigation-common-ktx/api/current.txt
index 66b075b..5817198 100644
--- a/navigation/navigation-common-ktx/api/current.txt
+++ b/navigation/navigation-common-ktx/api/current.txt
@@ -58,13 +58,13 @@
     ctor public NavDeepLinkDslBuilder();
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
     method public void setAction(String? p);
     method public void setMimeType(String? p);
-    method public void setUri(String? p);
+    method public void setUriPattern(String? p);
     property public final String? action;
     property public final String? mimeType;
-    property public final String? uri;
+    property public final String? uriPattern;
   }
 
   public final class NavDeepLinkDslBuilderKt {
diff --git a/navigation/navigation-common-ktx/api/public_plus_experimental_2.3.0-alpha05.txt b/navigation/navigation-common-ktx/api/public_plus_experimental_2.3.0-alpha05.txt
index 66b075b..5817198 100644
--- a/navigation/navigation-common-ktx/api/public_plus_experimental_2.3.0-alpha05.txt
+++ b/navigation/navigation-common-ktx/api/public_plus_experimental_2.3.0-alpha05.txt
@@ -58,13 +58,13 @@
     ctor public NavDeepLinkDslBuilder();
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
     method public void setAction(String? p);
     method public void setMimeType(String? p);
-    method public void setUri(String? p);
+    method public void setUriPattern(String? p);
     property public final String? action;
     property public final String? mimeType;
-    property public final String? uri;
+    property public final String? uriPattern;
   }
 
   public final class NavDeepLinkDslBuilderKt {
diff --git a/navigation/navigation-common-ktx/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-common-ktx/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..5817198
--- /dev/null
+++ b/navigation/navigation-common-ktx/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,147 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  @androidx.navigation.NavOptionsDsl public final class AnimBuilder {
+    ctor public AnimBuilder();
+    method public int getEnter();
+    method public int getExit();
+    method public int getPopEnter();
+    method public int getPopExit();
+    method public void setEnter(int p);
+    method public void setExit(int p);
+    method public void setPopEnter(int p);
+    method public void setPopExit(int p);
+    property public final int enter;
+    property public final int exit;
+    property public final int popEnter;
+    property public final int popExit;
+  }
+
+  @androidx.navigation.NavDestinationDsl public final class NavActionBuilder {
+    ctor public NavActionBuilder();
+    method public java.util.Map<java.lang.String,java.lang.Object> getDefaultArguments();
+    method public int getDestinationId();
+    method public void navOptions(kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit> optionsBuilder);
+    method public void setDestinationId(int p);
+    property public final java.util.Map<java.lang.String,java.lang.Object> defaultArguments;
+    property public final int destinationId;
+  }
+
+  public final class NavArgsLazy<Args extends androidx.navigation.NavArgs> implements kotlin.Lazy<Args> {
+    ctor public NavArgsLazy(kotlin.reflect.KClass<Args> navArgsClass, kotlin.jvm.functions.Function0<android.os.Bundle> argumentProducer);
+    method public Args getValue();
+    method public boolean isInitialized();
+    property public Args value;
+  }
+
+  public final class NavArgsLazyKt {
+  }
+
+  @androidx.navigation.NavDestinationDsl public final class NavArgumentBuilder {
+    ctor public NavArgumentBuilder();
+    method public androidx.navigation.NavArgument build();
+    method public Object? getDefaultValue();
+    method public boolean getNullable();
+    method public androidx.navigation.NavType<?> getType();
+    method public void setDefaultValue(Object? value);
+    method public void setNullable(boolean value);
+    method public void setType(androidx.navigation.NavType<?> value);
+    property public final Object? defaultValue;
+    property public final boolean nullable;
+    property public final androidx.navigation.NavType<?> type;
+  }
+
+  @kotlin.DslMarker public @interface NavDeepLinkDsl {
+  }
+
+  @androidx.navigation.NavDeepLinkDsl public final class NavDeepLinkDslBuilder {
+    ctor public NavDeepLinkDslBuilder();
+    method public String? getAction();
+    method public String? getMimeType();
+    method public String? getUriPattern();
+    method public void setAction(String? p);
+    method public void setMimeType(String? p);
+    method public void setUriPattern(String? p);
+    property public final String? action;
+    property public final String? mimeType;
+    property public final String? uriPattern;
+  }
+
+  public final class NavDeepLinkDslBuilderKt {
+    method public static androidx.navigation.NavDeepLink navDeepLink(kotlin.jvm.functions.Function1<? super androidx.navigation.NavDeepLinkDslBuilder,kotlin.Unit> deepLinkBuilder);
+  }
+
+  @androidx.navigation.NavDestinationDsl public class NavDestinationBuilder<D extends androidx.navigation.NavDestination> {
+    ctor public NavDestinationBuilder(androidx.navigation.Navigator<? extends D> navigator, @IdRes int id);
+    method public final void action(int actionId, kotlin.jvm.functions.Function1<? super androidx.navigation.NavActionBuilder,kotlin.Unit> actionBuilder);
+    method public final void argument(String name, kotlin.jvm.functions.Function1<? super androidx.navigation.NavArgumentBuilder,kotlin.Unit> argumentBuilder);
+    method public D build();
+    method public final void deepLink(String uriPattern);
+    method public final void deepLink(kotlin.jvm.functions.Function1<? super androidx.navigation.NavDeepLinkDslBuilder,kotlin.Unit> navDeepLink);
+    method public final int getId();
+    method public final CharSequence? getLabel();
+    method protected final androidx.navigation.Navigator<? extends D> getNavigator();
+    method public final void setLabel(CharSequence? p);
+    property public final CharSequence? label;
+  }
+
+  @kotlin.DslMarker public @interface NavDestinationDsl {
+  }
+
+  @androidx.navigation.NavDestinationDsl public class NavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.NavGraph> {
+    ctor public NavGraphBuilder(androidx.navigation.NavigatorProvider provider, @IdRes int id, @IdRes int startDestination);
+    method public final void addDestination(androidx.navigation.NavDestination destination);
+    method public androidx.navigation.NavGraph build();
+    method public final <D extends androidx.navigation.NavDestination> void destination(androidx.navigation.NavDestinationBuilder<? extends D> navDestination);
+    method public final androidx.navigation.NavigatorProvider getProvider();
+    method public final operator void unaryPlus(androidx.navigation.NavDestination);
+  }
+
+  public final class NavGraphBuilderKt {
+    method public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline void navigation(androidx.navigation.NavGraphBuilder, @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavGraphKt {
+    method public static operator boolean contains(androidx.navigation.NavGraph, @IdRes int id);
+    method public static inline operator androidx.navigation.NavDestination get(androidx.navigation.NavGraph, @IdRes int id);
+    method public static inline operator void minusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
+    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
+    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavGraph other);
+  }
+
+  @androidx.navigation.NavOptionsDsl public final class NavOptionsBuilder {
+    ctor public NavOptionsBuilder();
+    method public void anim(kotlin.jvm.functions.Function1<? super androidx.navigation.AnimBuilder,kotlin.Unit> animBuilder);
+    method public boolean getLaunchSingleTop();
+    method public int getPopUpTo();
+    method public void popUpTo(@IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.PopUpToBuilder,kotlin.Unit> popUpToBuilder);
+    method public void setLaunchSingleTop(boolean p);
+    method public void setPopUpTo(int value);
+    property public final boolean launchSingleTop;
+    property public final int popUpTo;
+  }
+
+  public final class NavOptionsBuilderKt {
+    method public static androidx.navigation.NavOptions navOptions(kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit> optionsBuilder);
+  }
+
+  @kotlin.DslMarker public @interface NavOptionsDsl {
+  }
+
+  public final class NavigatorProviderKt {
+    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, String name);
+    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, kotlin.reflect.KClass<T> clazz);
+    method public static inline operator void plusAssign(androidx.navigation.NavigatorProvider, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
+    method public static inline operator androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? set(androidx.navigation.NavigatorProvider, String name, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
+  }
+
+  @androidx.navigation.NavOptionsDsl public final class PopUpToBuilder {
+    ctor public PopUpToBuilder();
+    method public boolean getInclusive();
+    method public void setInclusive(boolean p);
+    property public final boolean inclusive;
+  }
+
+}
+
diff --git a/navigation/navigation-common-ktx/api/public_plus_experimental_current.txt b/navigation/navigation-common-ktx/api/public_plus_experimental_current.txt
index 66b075b..5817198 100644
--- a/navigation/navigation-common-ktx/api/public_plus_experimental_current.txt
+++ b/navigation/navigation-common-ktx/api/public_plus_experimental_current.txt
@@ -58,13 +58,13 @@
     ctor public NavDeepLinkDslBuilder();
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
     method public void setAction(String? p);
     method public void setMimeType(String? p);
-    method public void setUri(String? p);
+    method public void setUriPattern(String? p);
     property public final String? action;
     property public final String? mimeType;
-    property public final String? uri;
+    property public final String? uriPattern;
   }
 
   public final class NavDeepLinkDslBuilderKt {
diff --git a/navigation/navigation-common-ktx/api/res-2.3.0-alpha06.txt b/navigation/navigation-common-ktx/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-common-ktx/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-common-ktx/api/restricted_2.3.0-alpha05.txt b/navigation/navigation-common-ktx/api/restricted_2.3.0-alpha05.txt
index 66b075b..5817198 100644
--- a/navigation/navigation-common-ktx/api/restricted_2.3.0-alpha05.txt
+++ b/navigation/navigation-common-ktx/api/restricted_2.3.0-alpha05.txt
@@ -58,13 +58,13 @@
     ctor public NavDeepLinkDslBuilder();
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
     method public void setAction(String? p);
     method public void setMimeType(String? p);
-    method public void setUri(String? p);
+    method public void setUriPattern(String? p);
     property public final String? action;
     property public final String? mimeType;
-    property public final String? uri;
+    property public final String? uriPattern;
   }
 
   public final class NavDeepLinkDslBuilderKt {
diff --git a/navigation/navigation-common-ktx/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-common-ktx/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..5817198
--- /dev/null
+++ b/navigation/navigation-common-ktx/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,147 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  @androidx.navigation.NavOptionsDsl public final class AnimBuilder {
+    ctor public AnimBuilder();
+    method public int getEnter();
+    method public int getExit();
+    method public int getPopEnter();
+    method public int getPopExit();
+    method public void setEnter(int p);
+    method public void setExit(int p);
+    method public void setPopEnter(int p);
+    method public void setPopExit(int p);
+    property public final int enter;
+    property public final int exit;
+    property public final int popEnter;
+    property public final int popExit;
+  }
+
+  @androidx.navigation.NavDestinationDsl public final class NavActionBuilder {
+    ctor public NavActionBuilder();
+    method public java.util.Map<java.lang.String,java.lang.Object> getDefaultArguments();
+    method public int getDestinationId();
+    method public void navOptions(kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit> optionsBuilder);
+    method public void setDestinationId(int p);
+    property public final java.util.Map<java.lang.String,java.lang.Object> defaultArguments;
+    property public final int destinationId;
+  }
+
+  public final class NavArgsLazy<Args extends androidx.navigation.NavArgs> implements kotlin.Lazy<Args> {
+    ctor public NavArgsLazy(kotlin.reflect.KClass<Args> navArgsClass, kotlin.jvm.functions.Function0<android.os.Bundle> argumentProducer);
+    method public Args getValue();
+    method public boolean isInitialized();
+    property public Args value;
+  }
+
+  public final class NavArgsLazyKt {
+  }
+
+  @androidx.navigation.NavDestinationDsl public final class NavArgumentBuilder {
+    ctor public NavArgumentBuilder();
+    method public androidx.navigation.NavArgument build();
+    method public Object? getDefaultValue();
+    method public boolean getNullable();
+    method public androidx.navigation.NavType<?> getType();
+    method public void setDefaultValue(Object? value);
+    method public void setNullable(boolean value);
+    method public void setType(androidx.navigation.NavType<?> value);
+    property public final Object? defaultValue;
+    property public final boolean nullable;
+    property public final androidx.navigation.NavType<?> type;
+  }
+
+  @kotlin.DslMarker public @interface NavDeepLinkDsl {
+  }
+
+  @androidx.navigation.NavDeepLinkDsl public final class NavDeepLinkDslBuilder {
+    ctor public NavDeepLinkDslBuilder();
+    method public String? getAction();
+    method public String? getMimeType();
+    method public String? getUriPattern();
+    method public void setAction(String? p);
+    method public void setMimeType(String? p);
+    method public void setUriPattern(String? p);
+    property public final String? action;
+    property public final String? mimeType;
+    property public final String? uriPattern;
+  }
+
+  public final class NavDeepLinkDslBuilderKt {
+    method public static androidx.navigation.NavDeepLink navDeepLink(kotlin.jvm.functions.Function1<? super androidx.navigation.NavDeepLinkDslBuilder,kotlin.Unit> deepLinkBuilder);
+  }
+
+  @androidx.navigation.NavDestinationDsl public class NavDestinationBuilder<D extends androidx.navigation.NavDestination> {
+    ctor public NavDestinationBuilder(androidx.navigation.Navigator<? extends D> navigator, @IdRes int id);
+    method public final void action(int actionId, kotlin.jvm.functions.Function1<? super androidx.navigation.NavActionBuilder,kotlin.Unit> actionBuilder);
+    method public final void argument(String name, kotlin.jvm.functions.Function1<? super androidx.navigation.NavArgumentBuilder,kotlin.Unit> argumentBuilder);
+    method public D build();
+    method public final void deepLink(String uriPattern);
+    method public final void deepLink(kotlin.jvm.functions.Function1<? super androidx.navigation.NavDeepLinkDslBuilder,kotlin.Unit> navDeepLink);
+    method public final int getId();
+    method public final CharSequence? getLabel();
+    method protected final androidx.navigation.Navigator<? extends D> getNavigator();
+    method public final void setLabel(CharSequence? p);
+    property public final CharSequence? label;
+  }
+
+  @kotlin.DslMarker public @interface NavDestinationDsl {
+  }
+
+  @androidx.navigation.NavDestinationDsl public class NavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.NavGraph> {
+    ctor public NavGraphBuilder(androidx.navigation.NavigatorProvider provider, @IdRes int id, @IdRes int startDestination);
+    method public final void addDestination(androidx.navigation.NavDestination destination);
+    method public androidx.navigation.NavGraph build();
+    method public final <D extends androidx.navigation.NavDestination> void destination(androidx.navigation.NavDestinationBuilder<? extends D> navDestination);
+    method public final androidx.navigation.NavigatorProvider getProvider();
+    method public final operator void unaryPlus(androidx.navigation.NavDestination);
+  }
+
+  public final class NavGraphBuilderKt {
+    method public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline void navigation(androidx.navigation.NavGraphBuilder, @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavGraphKt {
+    method public static operator boolean contains(androidx.navigation.NavGraph, @IdRes int id);
+    method public static inline operator androidx.navigation.NavDestination get(androidx.navigation.NavGraph, @IdRes int id);
+    method public static inline operator void minusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
+    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
+    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavGraph other);
+  }
+
+  @androidx.navigation.NavOptionsDsl public final class NavOptionsBuilder {
+    ctor public NavOptionsBuilder();
+    method public void anim(kotlin.jvm.functions.Function1<? super androidx.navigation.AnimBuilder,kotlin.Unit> animBuilder);
+    method public boolean getLaunchSingleTop();
+    method public int getPopUpTo();
+    method public void popUpTo(@IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.PopUpToBuilder,kotlin.Unit> popUpToBuilder);
+    method public void setLaunchSingleTop(boolean p);
+    method public void setPopUpTo(int value);
+    property public final boolean launchSingleTop;
+    property public final int popUpTo;
+  }
+
+  public final class NavOptionsBuilderKt {
+    method public static androidx.navigation.NavOptions navOptions(kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit> optionsBuilder);
+  }
+
+  @kotlin.DslMarker public @interface NavOptionsDsl {
+  }
+
+  public final class NavigatorProviderKt {
+    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, String name);
+    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, kotlin.reflect.KClass<T> clazz);
+    method public static inline operator void plusAssign(androidx.navigation.NavigatorProvider, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
+    method public static inline operator androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? set(androidx.navigation.NavigatorProvider, String name, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
+  }
+
+  @androidx.navigation.NavOptionsDsl public final class PopUpToBuilder {
+    ctor public PopUpToBuilder();
+    method public boolean getInclusive();
+    method public void setInclusive(boolean p);
+    property public final boolean inclusive;
+  }
+
+}
+
diff --git a/navigation/navigation-common-ktx/api/restricted_current.txt b/navigation/navigation-common-ktx/api/restricted_current.txt
index 66b075b..5817198 100644
--- a/navigation/navigation-common-ktx/api/restricted_current.txt
+++ b/navigation/navigation-common-ktx/api/restricted_current.txt
@@ -58,13 +58,13 @@
     ctor public NavDeepLinkDslBuilder();
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
     method public void setAction(String? p);
     method public void setMimeType(String? p);
-    method public void setUri(String? p);
+    method public void setUriPattern(String? p);
     property public final String? action;
     property public final String? mimeType;
-    property public final String? uri;
+    property public final String? uriPattern;
   }
 
   public final class NavDeepLinkDslBuilderKt {
diff --git a/navigation/navigation-common-ktx/src/androidTest/java/androidx/navigation/NavDeepLinkBuilderTest.kt b/navigation/navigation-common-ktx/src/androidTest/java/androidx/navigation/NavDeepLinkBuilderTest.kt
index 04892b5..a04bdab 100644
--- a/navigation/navigation-common-ktx/src/androidTest/java/androidx/navigation/NavDeepLinkBuilderTest.kt
+++ b/navigation/navigation-common-ktx/src/androidTest/java/androidx/navigation/NavDeepLinkBuilderTest.kt
@@ -34,12 +34,12 @@
         val expectedAction = "test.action"
         val expectedMimeType = "test/type"
         val navDeepLink = navDeepLink {
-            uri = expectedUri
+            uriPattern = expectedUri
             action = expectedAction
             mimeType = expectedMimeType
         }
-        assertWithMessage("NavDeepLink should have uri set")
-            .that(navDeepLink.uri)
+        assertWithMessage("NavDeepLink should have uri pattern set")
+            .that(navDeepLink.uriPattern)
             .isEqualTo(expectedUri)
         assertWithMessage("NavDeepLink should have action set")
             .that(navDeepLink.action)
@@ -79,13 +79,13 @@
     fun buildDeepLinkDoubleActionSetNull() {
         val expectedUri = "www.example.com"
         val navDeepLink = navDeepLink {
-            uri = expectedUri
+            uriPattern = expectedUri
             action = "blah"
             action = null
         }
 
-        assertWithMessage("NavDeepLink should have uri set")
-            .that(navDeepLink.uri)
+        assertWithMessage("NavDeepLink should have uri pattern set")
+            .that(navDeepLink.uriPattern)
             .isEqualTo(expectedUri)
         assertWithMessage("NavDeepLink should have action set")
             .that(navDeepLink.action)
diff --git a/navigation/navigation-common-ktx/src/main/java/androidx/navigation/NavDeepLinkDslBuilder.kt b/navigation/navigation-common-ktx/src/main/java/androidx/navigation/NavDeepLinkDslBuilder.kt
index 7f20c7f..00098f5 100644
--- a/navigation/navigation-common-ktx/src/main/java/androidx/navigation/NavDeepLinkDslBuilder.kt
+++ b/navigation/navigation-common-ktx/src/main/java/androidx/navigation/NavDeepLinkDslBuilder.kt
@@ -33,9 +33,9 @@
     private val builder = NavDeepLink.Builder()
 
     /**
-     * The uri of the deep link
+     * The uri pattern of the deep link
      */
-    var uri: String? = null
+    var uriPattern: String? = null
 
     /**
      * Intent action for the deep link
@@ -56,10 +56,10 @@
     var mimeType: String? = null
 
     internal fun build() = builder.apply {
-        check(!(uri == null && action == null && mimeType == null)) {
+        check(!(uriPattern == null && action == null && mimeType == null)) {
             ("The NavDeepLink must have an uri, action, and/or mimeType.")
         }
-        uri?.let { setUri(it) }
+        uriPattern?.let { setUriPattern(it) }
         action?.let { setAction(it) }
         mimeType?.let { setMimeType(it) }
     }.build()
diff --git a/navigation/navigation-common/api/2.3.0-alpha05.txt b/navigation/navigation-common/api/2.3.0-alpha05.txt
index 32c3303..a5e68d6 100644
--- a/navigation/navigation-common/api/2.3.0-alpha05.txt
+++ b/navigation/navigation-common/api/2.3.0-alpha05.txt
@@ -42,17 +42,17 @@
   public final class NavDeepLink {
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
   }
 
   public static final class NavDeepLink.Builder {
     method public androidx.navigation.NavDeepLink build();
     method public static androidx.navigation.NavDeepLink.Builder fromAction(String);
     method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String);
-    method public static androidx.navigation.NavDeepLink.Builder fromUri(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromUriPattern(String);
     method public androidx.navigation.NavDeepLink.Builder setAction(String);
     method public androidx.navigation.NavDeepLink.Builder setMimeType(String);
-    method public androidx.navigation.NavDeepLink.Builder setUri(String);
+    method public androidx.navigation.NavDeepLink.Builder setUriPattern(String);
   }
 
   public class NavDeepLinkRequest {
diff --git a/navigation/navigation-common/api/2.3.0-alpha06.txt b/navigation/navigation-common/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..a5e68d6
--- /dev/null
+++ b/navigation/navigation-common/api/2.3.0-alpha06.txt
@@ -0,0 +1,230 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  public final class ActionOnlyNavDirections implements androidx.navigation.NavDirections {
+    ctor public ActionOnlyNavDirections(int);
+    method public int getActionId();
+    method public android.os.Bundle getArguments();
+  }
+
+  public interface FloatingWindow {
+  }
+
+  public final class NavAction {
+    ctor public NavAction(@IdRes int);
+    ctor public NavAction(@IdRes int, androidx.navigation.NavOptions?);
+    ctor public NavAction(@IdRes int, androidx.navigation.NavOptions?, android.os.Bundle?);
+    method public android.os.Bundle? getDefaultArguments();
+    method public int getDestinationId();
+    method public androidx.navigation.NavOptions? getNavOptions();
+    method public void setDefaultArguments(android.os.Bundle?);
+    method public void setNavOptions(androidx.navigation.NavOptions?);
+  }
+
+  public interface NavArgs {
+  }
+
+  public final class NavArgument {
+    method public Object? getDefaultValue();
+    method public androidx.navigation.NavType<?> getType();
+    method public boolean isDefaultValuePresent();
+    method public boolean isNullable();
+  }
+
+  public static final class NavArgument.Builder {
+    ctor public NavArgument.Builder();
+    method public androidx.navigation.NavArgument build();
+    method public androidx.navigation.NavArgument.Builder setDefaultValue(Object?);
+    method public androidx.navigation.NavArgument.Builder setIsNullable(boolean);
+    method public androidx.navigation.NavArgument.Builder setType(androidx.navigation.NavType<?>);
+  }
+
+  public final class NavDeepLink {
+    method public String? getAction();
+    method public String? getMimeType();
+    method public String? getUriPattern();
+  }
+
+  public static final class NavDeepLink.Builder {
+    method public androidx.navigation.NavDeepLink build();
+    method public static androidx.navigation.NavDeepLink.Builder fromAction(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromUriPattern(String);
+    method public androidx.navigation.NavDeepLink.Builder setAction(String);
+    method public androidx.navigation.NavDeepLink.Builder setMimeType(String);
+    method public androidx.navigation.NavDeepLink.Builder setUriPattern(String);
+  }
+
+  public class NavDeepLinkRequest {
+    method public String? getAction();
+    method public String? getMimeType();
+    method public android.net.Uri? getUri();
+  }
+
+  public static final class NavDeepLinkRequest.Builder {
+    method public androidx.navigation.NavDeepLinkRequest build();
+    method public static androidx.navigation.NavDeepLinkRequest.Builder fromAction(String);
+    method public static androidx.navigation.NavDeepLinkRequest.Builder fromMimeType(String);
+    method public static androidx.navigation.NavDeepLinkRequest.Builder fromUri(android.net.Uri);
+    method public androidx.navigation.NavDeepLinkRequest.Builder setAction(String);
+    method public androidx.navigation.NavDeepLinkRequest.Builder setMimeType(String);
+    method public androidx.navigation.NavDeepLinkRequest.Builder setUri(android.net.Uri);
+  }
+
+  public class NavDestination {
+    ctor public NavDestination(androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>);
+    ctor public NavDestination(String);
+    method public final void addArgument(String, androidx.navigation.NavArgument);
+    method public final void addDeepLink(String);
+    method public final void addDeepLink(androidx.navigation.NavDeepLink);
+    method public final androidx.navigation.NavAction? getAction(@IdRes int);
+    method public final java.util.Map<java.lang.String!,androidx.navigation.NavArgument!> getArguments();
+    method @IdRes public final int getId();
+    method public final CharSequence? getLabel();
+    method public final String getNavigatorName();
+    method public final androidx.navigation.NavGraph? getParent();
+    method public boolean hasDeepLink(android.net.Uri);
+    method public boolean hasDeepLink(androidx.navigation.NavDeepLinkRequest);
+    method @CallSuper public void onInflate(android.content.Context, android.util.AttributeSet);
+    method protected static <C> Class<? extends C> parseClassFromName(android.content.Context, String, Class<? extends C>);
+    method public final void putAction(@IdRes int, @IdRes int);
+    method public final void putAction(@IdRes int, androidx.navigation.NavAction);
+    method public final void removeAction(@IdRes int);
+    method public final void removeArgument(String);
+    method public final void setId(@IdRes int);
+    method public final void setLabel(CharSequence?);
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public static @interface NavDestination.ClassType {
+    method public abstract Class<?> value();
+  }
+
+  public interface NavDirections {
+    method @IdRes public int getActionId();
+    method public android.os.Bundle getArguments();
+  }
+
+  public class NavGraph extends androidx.navigation.NavDestination implements java.lang.Iterable<androidx.navigation.NavDestination> {
+    ctor public NavGraph(androidx.navigation.Navigator<? extends androidx.navigation.NavGraph>);
+    method public final void addAll(androidx.navigation.NavGraph);
+    method public final void addDestination(androidx.navigation.NavDestination);
+    method public final void addDestinations(java.util.Collection<androidx.navigation.NavDestination!>);
+    method public final void addDestinations(androidx.navigation.NavDestination!...);
+    method public final void clear();
+    method public final androidx.navigation.NavDestination? findNode(@IdRes int);
+    method @IdRes public final int getStartDestination();
+    method public final java.util.Iterator<androidx.navigation.NavDestination!> iterator();
+    method public final void remove(androidx.navigation.NavDestination);
+    method public final void setStartDestination(@IdRes int);
+  }
+
+  @androidx.navigation.Navigator.Name("navigation") public class NavGraphNavigator extends androidx.navigation.Navigator<androidx.navigation.NavGraph> {
+    ctor public NavGraphNavigator(androidx.navigation.NavigatorProvider);
+    method public androidx.navigation.NavGraph createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.NavGraph, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  public final class NavOptions {
+    method @AnimRes @AnimatorRes public int getEnterAnim();
+    method @AnimRes @AnimatorRes public int getExitAnim();
+    method @AnimRes @AnimatorRes public int getPopEnterAnim();
+    method @AnimRes @AnimatorRes public int getPopExitAnim();
+    method @IdRes public int getPopUpTo();
+    method public boolean isPopUpToInclusive();
+    method public boolean shouldLaunchSingleTop();
+  }
+
+  public static final class NavOptions.Builder {
+    ctor public NavOptions.Builder();
+    method public androidx.navigation.NavOptions build();
+    method public androidx.navigation.NavOptions.Builder setEnterAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setExitAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setLaunchSingleTop(boolean);
+    method public androidx.navigation.NavOptions.Builder setPopEnterAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setPopExitAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setPopUpTo(@IdRes int, boolean);
+  }
+
+  public abstract class NavType<T> {
+    method public static androidx.navigation.NavType<?> fromArgType(String?, String?);
+    method public abstract T? get(android.os.Bundle, String);
+    method public abstract String getName();
+    method public boolean isNullableAllowed();
+    method public abstract T parseValue(String);
+    method public abstract void put(android.os.Bundle, String, T?);
+    field public static final androidx.navigation.NavType<boolean[]!> BoolArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Boolean!> BoolType;
+    field public static final androidx.navigation.NavType<float[]!> FloatArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Float!> FloatType;
+    field public static final androidx.navigation.NavType<int[]!> IntArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Integer!> IntType;
+    field public static final androidx.navigation.NavType<long[]!> LongArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Long!> LongType;
+    field public static final androidx.navigation.NavType<java.lang.Integer!> ReferenceType;
+    field public static final androidx.navigation.NavType<java.lang.String![]!> StringArrayType;
+    field public static final androidx.navigation.NavType<java.lang.String!> StringType;
+  }
+
+  public static final class NavType.EnumType<D extends java.lang.Enum> extends androidx.navigation.NavType.SerializableType<D> {
+    ctor public NavType.EnumType(Class<D!>);
+  }
+
+  public static final class NavType.ParcelableArrayType<D extends android.os.Parcelable> extends androidx.navigation.NavType<D[]> {
+    ctor public NavType.ParcelableArrayType(Class<D!>);
+    method public D![]? get(android.os.Bundle, String);
+    method public String getName();
+    method public D![] parseValue(String);
+    method public void put(android.os.Bundle, String, D![]?);
+  }
+
+  public static final class NavType.ParcelableType<D> extends androidx.navigation.NavType<D> {
+    ctor public NavType.ParcelableType(Class<D!>);
+    method public D? get(android.os.Bundle, String);
+    method public String getName();
+    method public D parseValue(String);
+    method public void put(android.os.Bundle, String, D?);
+  }
+
+  public static final class NavType.SerializableArrayType<D extends java.io.Serializable> extends androidx.navigation.NavType<D[]> {
+    ctor public NavType.SerializableArrayType(Class<D!>);
+    method public D![]? get(android.os.Bundle, String);
+    method public String getName();
+    method public D![] parseValue(String);
+    method public void put(android.os.Bundle, String, D![]?);
+  }
+
+  public static class NavType.SerializableType<D extends java.io.Serializable> extends androidx.navigation.NavType<D> {
+    ctor public NavType.SerializableType(Class<D!>);
+    method public D? get(android.os.Bundle, String);
+    method public String getName();
+    method public D parseValue(String);
+    method public void put(android.os.Bundle, String, D?);
+  }
+
+  public abstract class Navigator<D extends androidx.navigation.NavDestination> {
+    ctor public Navigator();
+    method public abstract D createDestination();
+    method public abstract androidx.navigation.NavDestination? navigate(D, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void onRestoreState(android.os.Bundle);
+    method public android.os.Bundle? onSaveState();
+    method public abstract boolean popBackStack();
+  }
+
+  public static interface Navigator.Extras {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public static @interface Navigator.Name {
+    method public abstract String value();
+  }
+
+  public class NavigatorProvider {
+    ctor public NavigatorProvider();
+    method public final androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? addNavigator(androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>);
+    method @CallSuper public androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? addNavigator(String, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>);
+    method public final <T extends androidx.navigation.Navigator<?>> T getNavigator(Class<T!>);
+    method @CallSuper public <T extends androidx.navigation.Navigator<?>> T getNavigator(String);
+  }
+
+}
+
diff --git a/navigation/navigation-common/api/current.txt b/navigation/navigation-common/api/current.txt
index 32c3303..a5e68d6 100644
--- a/navigation/navigation-common/api/current.txt
+++ b/navigation/navigation-common/api/current.txt
@@ -42,17 +42,17 @@
   public final class NavDeepLink {
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
   }
 
   public static final class NavDeepLink.Builder {
     method public androidx.navigation.NavDeepLink build();
     method public static androidx.navigation.NavDeepLink.Builder fromAction(String);
     method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String);
-    method public static androidx.navigation.NavDeepLink.Builder fromUri(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromUriPattern(String);
     method public androidx.navigation.NavDeepLink.Builder setAction(String);
     method public androidx.navigation.NavDeepLink.Builder setMimeType(String);
-    method public androidx.navigation.NavDeepLink.Builder setUri(String);
+    method public androidx.navigation.NavDeepLink.Builder setUriPattern(String);
   }
 
   public class NavDeepLinkRequest {
diff --git a/navigation/navigation-common/api/public_plus_experimental_2.3.0-alpha05.txt b/navigation/navigation-common/api/public_plus_experimental_2.3.0-alpha05.txt
index 32c3303..a5e68d6 100644
--- a/navigation/navigation-common/api/public_plus_experimental_2.3.0-alpha05.txt
+++ b/navigation/navigation-common/api/public_plus_experimental_2.3.0-alpha05.txt
@@ -42,17 +42,17 @@
   public final class NavDeepLink {
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
   }
 
   public static final class NavDeepLink.Builder {
     method public androidx.navigation.NavDeepLink build();
     method public static androidx.navigation.NavDeepLink.Builder fromAction(String);
     method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String);
-    method public static androidx.navigation.NavDeepLink.Builder fromUri(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromUriPattern(String);
     method public androidx.navigation.NavDeepLink.Builder setAction(String);
     method public androidx.navigation.NavDeepLink.Builder setMimeType(String);
-    method public androidx.navigation.NavDeepLink.Builder setUri(String);
+    method public androidx.navigation.NavDeepLink.Builder setUriPattern(String);
   }
 
   public class NavDeepLinkRequest {
diff --git a/navigation/navigation-common/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-common/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..a5e68d6
--- /dev/null
+++ b/navigation/navigation-common/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,230 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  public final class ActionOnlyNavDirections implements androidx.navigation.NavDirections {
+    ctor public ActionOnlyNavDirections(int);
+    method public int getActionId();
+    method public android.os.Bundle getArguments();
+  }
+
+  public interface FloatingWindow {
+  }
+
+  public final class NavAction {
+    ctor public NavAction(@IdRes int);
+    ctor public NavAction(@IdRes int, androidx.navigation.NavOptions?);
+    ctor public NavAction(@IdRes int, androidx.navigation.NavOptions?, android.os.Bundle?);
+    method public android.os.Bundle? getDefaultArguments();
+    method public int getDestinationId();
+    method public androidx.navigation.NavOptions? getNavOptions();
+    method public void setDefaultArguments(android.os.Bundle?);
+    method public void setNavOptions(androidx.navigation.NavOptions?);
+  }
+
+  public interface NavArgs {
+  }
+
+  public final class NavArgument {
+    method public Object? getDefaultValue();
+    method public androidx.navigation.NavType<?> getType();
+    method public boolean isDefaultValuePresent();
+    method public boolean isNullable();
+  }
+
+  public static final class NavArgument.Builder {
+    ctor public NavArgument.Builder();
+    method public androidx.navigation.NavArgument build();
+    method public androidx.navigation.NavArgument.Builder setDefaultValue(Object?);
+    method public androidx.navigation.NavArgument.Builder setIsNullable(boolean);
+    method public androidx.navigation.NavArgument.Builder setType(androidx.navigation.NavType<?>);
+  }
+
+  public final class NavDeepLink {
+    method public String? getAction();
+    method public String? getMimeType();
+    method public String? getUriPattern();
+  }
+
+  public static final class NavDeepLink.Builder {
+    method public androidx.navigation.NavDeepLink build();
+    method public static androidx.navigation.NavDeepLink.Builder fromAction(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromUriPattern(String);
+    method public androidx.navigation.NavDeepLink.Builder setAction(String);
+    method public androidx.navigation.NavDeepLink.Builder setMimeType(String);
+    method public androidx.navigation.NavDeepLink.Builder setUriPattern(String);
+  }
+
+  public class NavDeepLinkRequest {
+    method public String? getAction();
+    method public String? getMimeType();
+    method public android.net.Uri? getUri();
+  }
+
+  public static final class NavDeepLinkRequest.Builder {
+    method public androidx.navigation.NavDeepLinkRequest build();
+    method public static androidx.navigation.NavDeepLinkRequest.Builder fromAction(String);
+    method public static androidx.navigation.NavDeepLinkRequest.Builder fromMimeType(String);
+    method public static androidx.navigation.NavDeepLinkRequest.Builder fromUri(android.net.Uri);
+    method public androidx.navigation.NavDeepLinkRequest.Builder setAction(String);
+    method public androidx.navigation.NavDeepLinkRequest.Builder setMimeType(String);
+    method public androidx.navigation.NavDeepLinkRequest.Builder setUri(android.net.Uri);
+  }
+
+  public class NavDestination {
+    ctor public NavDestination(androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>);
+    ctor public NavDestination(String);
+    method public final void addArgument(String, androidx.navigation.NavArgument);
+    method public final void addDeepLink(String);
+    method public final void addDeepLink(androidx.navigation.NavDeepLink);
+    method public final androidx.navigation.NavAction? getAction(@IdRes int);
+    method public final java.util.Map<java.lang.String!,androidx.navigation.NavArgument!> getArguments();
+    method @IdRes public final int getId();
+    method public final CharSequence? getLabel();
+    method public final String getNavigatorName();
+    method public final androidx.navigation.NavGraph? getParent();
+    method public boolean hasDeepLink(android.net.Uri);
+    method public boolean hasDeepLink(androidx.navigation.NavDeepLinkRequest);
+    method @CallSuper public void onInflate(android.content.Context, android.util.AttributeSet);
+    method protected static <C> Class<? extends C> parseClassFromName(android.content.Context, String, Class<? extends C>);
+    method public final void putAction(@IdRes int, @IdRes int);
+    method public final void putAction(@IdRes int, androidx.navigation.NavAction);
+    method public final void removeAction(@IdRes int);
+    method public final void removeArgument(String);
+    method public final void setId(@IdRes int);
+    method public final void setLabel(CharSequence?);
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public static @interface NavDestination.ClassType {
+    method public abstract Class<?> value();
+  }
+
+  public interface NavDirections {
+    method @IdRes public int getActionId();
+    method public android.os.Bundle getArguments();
+  }
+
+  public class NavGraph extends androidx.navigation.NavDestination implements java.lang.Iterable<androidx.navigation.NavDestination> {
+    ctor public NavGraph(androidx.navigation.Navigator<? extends androidx.navigation.NavGraph>);
+    method public final void addAll(androidx.navigation.NavGraph);
+    method public final void addDestination(androidx.navigation.NavDestination);
+    method public final void addDestinations(java.util.Collection<androidx.navigation.NavDestination!>);
+    method public final void addDestinations(androidx.navigation.NavDestination!...);
+    method public final void clear();
+    method public final androidx.navigation.NavDestination? findNode(@IdRes int);
+    method @IdRes public final int getStartDestination();
+    method public final java.util.Iterator<androidx.navigation.NavDestination!> iterator();
+    method public final void remove(androidx.navigation.NavDestination);
+    method public final void setStartDestination(@IdRes int);
+  }
+
+  @androidx.navigation.Navigator.Name("navigation") public class NavGraphNavigator extends androidx.navigation.Navigator<androidx.navigation.NavGraph> {
+    ctor public NavGraphNavigator(androidx.navigation.NavigatorProvider);
+    method public androidx.navigation.NavGraph createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.NavGraph, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  public final class NavOptions {
+    method @AnimRes @AnimatorRes public int getEnterAnim();
+    method @AnimRes @AnimatorRes public int getExitAnim();
+    method @AnimRes @AnimatorRes public int getPopEnterAnim();
+    method @AnimRes @AnimatorRes public int getPopExitAnim();
+    method @IdRes public int getPopUpTo();
+    method public boolean isPopUpToInclusive();
+    method public boolean shouldLaunchSingleTop();
+  }
+
+  public static final class NavOptions.Builder {
+    ctor public NavOptions.Builder();
+    method public androidx.navigation.NavOptions build();
+    method public androidx.navigation.NavOptions.Builder setEnterAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setExitAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setLaunchSingleTop(boolean);
+    method public androidx.navigation.NavOptions.Builder setPopEnterAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setPopExitAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setPopUpTo(@IdRes int, boolean);
+  }
+
+  public abstract class NavType<T> {
+    method public static androidx.navigation.NavType<?> fromArgType(String?, String?);
+    method public abstract T? get(android.os.Bundle, String);
+    method public abstract String getName();
+    method public boolean isNullableAllowed();
+    method public abstract T parseValue(String);
+    method public abstract void put(android.os.Bundle, String, T?);
+    field public static final androidx.navigation.NavType<boolean[]!> BoolArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Boolean!> BoolType;
+    field public static final androidx.navigation.NavType<float[]!> FloatArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Float!> FloatType;
+    field public static final androidx.navigation.NavType<int[]!> IntArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Integer!> IntType;
+    field public static final androidx.navigation.NavType<long[]!> LongArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Long!> LongType;
+    field public static final androidx.navigation.NavType<java.lang.Integer!> ReferenceType;
+    field public static final androidx.navigation.NavType<java.lang.String![]!> StringArrayType;
+    field public static final androidx.navigation.NavType<java.lang.String!> StringType;
+  }
+
+  public static final class NavType.EnumType<D extends java.lang.Enum> extends androidx.navigation.NavType.SerializableType<D> {
+    ctor public NavType.EnumType(Class<D!>);
+  }
+
+  public static final class NavType.ParcelableArrayType<D extends android.os.Parcelable> extends androidx.navigation.NavType<D[]> {
+    ctor public NavType.ParcelableArrayType(Class<D!>);
+    method public D![]? get(android.os.Bundle, String);
+    method public String getName();
+    method public D![] parseValue(String);
+    method public void put(android.os.Bundle, String, D![]?);
+  }
+
+  public static final class NavType.ParcelableType<D> extends androidx.navigation.NavType<D> {
+    ctor public NavType.ParcelableType(Class<D!>);
+    method public D? get(android.os.Bundle, String);
+    method public String getName();
+    method public D parseValue(String);
+    method public void put(android.os.Bundle, String, D?);
+  }
+
+  public static final class NavType.SerializableArrayType<D extends java.io.Serializable> extends androidx.navigation.NavType<D[]> {
+    ctor public NavType.SerializableArrayType(Class<D!>);
+    method public D![]? get(android.os.Bundle, String);
+    method public String getName();
+    method public D![] parseValue(String);
+    method public void put(android.os.Bundle, String, D![]?);
+  }
+
+  public static class NavType.SerializableType<D extends java.io.Serializable> extends androidx.navigation.NavType<D> {
+    ctor public NavType.SerializableType(Class<D!>);
+    method public D? get(android.os.Bundle, String);
+    method public String getName();
+    method public D parseValue(String);
+    method public void put(android.os.Bundle, String, D?);
+  }
+
+  public abstract class Navigator<D extends androidx.navigation.NavDestination> {
+    ctor public Navigator();
+    method public abstract D createDestination();
+    method public abstract androidx.navigation.NavDestination? navigate(D, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void onRestoreState(android.os.Bundle);
+    method public android.os.Bundle? onSaveState();
+    method public abstract boolean popBackStack();
+  }
+
+  public static interface Navigator.Extras {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public static @interface Navigator.Name {
+    method public abstract String value();
+  }
+
+  public class NavigatorProvider {
+    ctor public NavigatorProvider();
+    method public final androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? addNavigator(androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>);
+    method @CallSuper public androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? addNavigator(String, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>);
+    method public final <T extends androidx.navigation.Navigator<?>> T getNavigator(Class<T!>);
+    method @CallSuper public <T extends androidx.navigation.Navigator<?>> T getNavigator(String);
+  }
+
+}
+
diff --git a/navigation/navigation-common/api/public_plus_experimental_current.txt b/navigation/navigation-common/api/public_plus_experimental_current.txt
index 32c3303..a5e68d6 100644
--- a/navigation/navigation-common/api/public_plus_experimental_current.txt
+++ b/navigation/navigation-common/api/public_plus_experimental_current.txt
@@ -42,17 +42,17 @@
   public final class NavDeepLink {
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
   }
 
   public static final class NavDeepLink.Builder {
     method public androidx.navigation.NavDeepLink build();
     method public static androidx.navigation.NavDeepLink.Builder fromAction(String);
     method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String);
-    method public static androidx.navigation.NavDeepLink.Builder fromUri(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromUriPattern(String);
     method public androidx.navigation.NavDeepLink.Builder setAction(String);
     method public androidx.navigation.NavDeepLink.Builder setMimeType(String);
-    method public androidx.navigation.NavDeepLink.Builder setUri(String);
+    method public androidx.navigation.NavDeepLink.Builder setUriPattern(String);
   }
 
   public class NavDeepLinkRequest {
diff --git a/navigation/navigation-common/api/res-2.3.0-alpha06.txt b/navigation/navigation-common/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-common/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-common/api/restricted_2.3.0-alpha05.txt b/navigation/navigation-common/api/restricted_2.3.0-alpha05.txt
index 32c3303..a5e68d6 100644
--- a/navigation/navigation-common/api/restricted_2.3.0-alpha05.txt
+++ b/navigation/navigation-common/api/restricted_2.3.0-alpha05.txt
@@ -42,17 +42,17 @@
   public final class NavDeepLink {
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
   }
 
   public static final class NavDeepLink.Builder {
     method public androidx.navigation.NavDeepLink build();
     method public static androidx.navigation.NavDeepLink.Builder fromAction(String);
     method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String);
-    method public static androidx.navigation.NavDeepLink.Builder fromUri(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromUriPattern(String);
     method public androidx.navigation.NavDeepLink.Builder setAction(String);
     method public androidx.navigation.NavDeepLink.Builder setMimeType(String);
-    method public androidx.navigation.NavDeepLink.Builder setUri(String);
+    method public androidx.navigation.NavDeepLink.Builder setUriPattern(String);
   }
 
   public class NavDeepLinkRequest {
diff --git a/navigation/navigation-common/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-common/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..a5e68d6
--- /dev/null
+++ b/navigation/navigation-common/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,230 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  public final class ActionOnlyNavDirections implements androidx.navigation.NavDirections {
+    ctor public ActionOnlyNavDirections(int);
+    method public int getActionId();
+    method public android.os.Bundle getArguments();
+  }
+
+  public interface FloatingWindow {
+  }
+
+  public final class NavAction {
+    ctor public NavAction(@IdRes int);
+    ctor public NavAction(@IdRes int, androidx.navigation.NavOptions?);
+    ctor public NavAction(@IdRes int, androidx.navigation.NavOptions?, android.os.Bundle?);
+    method public android.os.Bundle? getDefaultArguments();
+    method public int getDestinationId();
+    method public androidx.navigation.NavOptions? getNavOptions();
+    method public void setDefaultArguments(android.os.Bundle?);
+    method public void setNavOptions(androidx.navigation.NavOptions?);
+  }
+
+  public interface NavArgs {
+  }
+
+  public final class NavArgument {
+    method public Object? getDefaultValue();
+    method public androidx.navigation.NavType<?> getType();
+    method public boolean isDefaultValuePresent();
+    method public boolean isNullable();
+  }
+
+  public static final class NavArgument.Builder {
+    ctor public NavArgument.Builder();
+    method public androidx.navigation.NavArgument build();
+    method public androidx.navigation.NavArgument.Builder setDefaultValue(Object?);
+    method public androidx.navigation.NavArgument.Builder setIsNullable(boolean);
+    method public androidx.navigation.NavArgument.Builder setType(androidx.navigation.NavType<?>);
+  }
+
+  public final class NavDeepLink {
+    method public String? getAction();
+    method public String? getMimeType();
+    method public String? getUriPattern();
+  }
+
+  public static final class NavDeepLink.Builder {
+    method public androidx.navigation.NavDeepLink build();
+    method public static androidx.navigation.NavDeepLink.Builder fromAction(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromUriPattern(String);
+    method public androidx.navigation.NavDeepLink.Builder setAction(String);
+    method public androidx.navigation.NavDeepLink.Builder setMimeType(String);
+    method public androidx.navigation.NavDeepLink.Builder setUriPattern(String);
+  }
+
+  public class NavDeepLinkRequest {
+    method public String? getAction();
+    method public String? getMimeType();
+    method public android.net.Uri? getUri();
+  }
+
+  public static final class NavDeepLinkRequest.Builder {
+    method public androidx.navigation.NavDeepLinkRequest build();
+    method public static androidx.navigation.NavDeepLinkRequest.Builder fromAction(String);
+    method public static androidx.navigation.NavDeepLinkRequest.Builder fromMimeType(String);
+    method public static androidx.navigation.NavDeepLinkRequest.Builder fromUri(android.net.Uri);
+    method public androidx.navigation.NavDeepLinkRequest.Builder setAction(String);
+    method public androidx.navigation.NavDeepLinkRequest.Builder setMimeType(String);
+    method public androidx.navigation.NavDeepLinkRequest.Builder setUri(android.net.Uri);
+  }
+
+  public class NavDestination {
+    ctor public NavDestination(androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>);
+    ctor public NavDestination(String);
+    method public final void addArgument(String, androidx.navigation.NavArgument);
+    method public final void addDeepLink(String);
+    method public final void addDeepLink(androidx.navigation.NavDeepLink);
+    method public final androidx.navigation.NavAction? getAction(@IdRes int);
+    method public final java.util.Map<java.lang.String!,androidx.navigation.NavArgument!> getArguments();
+    method @IdRes public final int getId();
+    method public final CharSequence? getLabel();
+    method public final String getNavigatorName();
+    method public final androidx.navigation.NavGraph? getParent();
+    method public boolean hasDeepLink(android.net.Uri);
+    method public boolean hasDeepLink(androidx.navigation.NavDeepLinkRequest);
+    method @CallSuper public void onInflate(android.content.Context, android.util.AttributeSet);
+    method protected static <C> Class<? extends C> parseClassFromName(android.content.Context, String, Class<? extends C>);
+    method public final void putAction(@IdRes int, @IdRes int);
+    method public final void putAction(@IdRes int, androidx.navigation.NavAction);
+    method public final void removeAction(@IdRes int);
+    method public final void removeArgument(String);
+    method public final void setId(@IdRes int);
+    method public final void setLabel(CharSequence?);
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public static @interface NavDestination.ClassType {
+    method public abstract Class<?> value();
+  }
+
+  public interface NavDirections {
+    method @IdRes public int getActionId();
+    method public android.os.Bundle getArguments();
+  }
+
+  public class NavGraph extends androidx.navigation.NavDestination implements java.lang.Iterable<androidx.navigation.NavDestination> {
+    ctor public NavGraph(androidx.navigation.Navigator<? extends androidx.navigation.NavGraph>);
+    method public final void addAll(androidx.navigation.NavGraph);
+    method public final void addDestination(androidx.navigation.NavDestination);
+    method public final void addDestinations(java.util.Collection<androidx.navigation.NavDestination!>);
+    method public final void addDestinations(androidx.navigation.NavDestination!...);
+    method public final void clear();
+    method public final androidx.navigation.NavDestination? findNode(@IdRes int);
+    method @IdRes public final int getStartDestination();
+    method public final java.util.Iterator<androidx.navigation.NavDestination!> iterator();
+    method public final void remove(androidx.navigation.NavDestination);
+    method public final void setStartDestination(@IdRes int);
+  }
+
+  @androidx.navigation.Navigator.Name("navigation") public class NavGraphNavigator extends androidx.navigation.Navigator<androidx.navigation.NavGraph> {
+    ctor public NavGraphNavigator(androidx.navigation.NavigatorProvider);
+    method public androidx.navigation.NavGraph createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.NavGraph, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  public final class NavOptions {
+    method @AnimRes @AnimatorRes public int getEnterAnim();
+    method @AnimRes @AnimatorRes public int getExitAnim();
+    method @AnimRes @AnimatorRes public int getPopEnterAnim();
+    method @AnimRes @AnimatorRes public int getPopExitAnim();
+    method @IdRes public int getPopUpTo();
+    method public boolean isPopUpToInclusive();
+    method public boolean shouldLaunchSingleTop();
+  }
+
+  public static final class NavOptions.Builder {
+    ctor public NavOptions.Builder();
+    method public androidx.navigation.NavOptions build();
+    method public androidx.navigation.NavOptions.Builder setEnterAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setExitAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setLaunchSingleTop(boolean);
+    method public androidx.navigation.NavOptions.Builder setPopEnterAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setPopExitAnim(@AnimRes @AnimatorRes int);
+    method public androidx.navigation.NavOptions.Builder setPopUpTo(@IdRes int, boolean);
+  }
+
+  public abstract class NavType<T> {
+    method public static androidx.navigation.NavType<?> fromArgType(String?, String?);
+    method public abstract T? get(android.os.Bundle, String);
+    method public abstract String getName();
+    method public boolean isNullableAllowed();
+    method public abstract T parseValue(String);
+    method public abstract void put(android.os.Bundle, String, T?);
+    field public static final androidx.navigation.NavType<boolean[]!> BoolArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Boolean!> BoolType;
+    field public static final androidx.navigation.NavType<float[]!> FloatArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Float!> FloatType;
+    field public static final androidx.navigation.NavType<int[]!> IntArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Integer!> IntType;
+    field public static final androidx.navigation.NavType<long[]!> LongArrayType;
+    field public static final androidx.navigation.NavType<java.lang.Long!> LongType;
+    field public static final androidx.navigation.NavType<java.lang.Integer!> ReferenceType;
+    field public static final androidx.navigation.NavType<java.lang.String![]!> StringArrayType;
+    field public static final androidx.navigation.NavType<java.lang.String!> StringType;
+  }
+
+  public static final class NavType.EnumType<D extends java.lang.Enum> extends androidx.navigation.NavType.SerializableType<D> {
+    ctor public NavType.EnumType(Class<D!>);
+  }
+
+  public static final class NavType.ParcelableArrayType<D extends android.os.Parcelable> extends androidx.navigation.NavType<D[]> {
+    ctor public NavType.ParcelableArrayType(Class<D!>);
+    method public D![]? get(android.os.Bundle, String);
+    method public String getName();
+    method public D![] parseValue(String);
+    method public void put(android.os.Bundle, String, D![]?);
+  }
+
+  public static final class NavType.ParcelableType<D> extends androidx.navigation.NavType<D> {
+    ctor public NavType.ParcelableType(Class<D!>);
+    method public D? get(android.os.Bundle, String);
+    method public String getName();
+    method public D parseValue(String);
+    method public void put(android.os.Bundle, String, D?);
+  }
+
+  public static final class NavType.SerializableArrayType<D extends java.io.Serializable> extends androidx.navigation.NavType<D[]> {
+    ctor public NavType.SerializableArrayType(Class<D!>);
+    method public D![]? get(android.os.Bundle, String);
+    method public String getName();
+    method public D![] parseValue(String);
+    method public void put(android.os.Bundle, String, D![]?);
+  }
+
+  public static class NavType.SerializableType<D extends java.io.Serializable> extends androidx.navigation.NavType<D> {
+    ctor public NavType.SerializableType(Class<D!>);
+    method public D? get(android.os.Bundle, String);
+    method public String getName();
+    method public D parseValue(String);
+    method public void put(android.os.Bundle, String, D?);
+  }
+
+  public abstract class Navigator<D extends androidx.navigation.NavDestination> {
+    ctor public Navigator();
+    method public abstract D createDestination();
+    method public abstract androidx.navigation.NavDestination? navigate(D, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void onRestoreState(android.os.Bundle);
+    method public android.os.Bundle? onSaveState();
+    method public abstract boolean popBackStack();
+  }
+
+  public static interface Navigator.Extras {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public static @interface Navigator.Name {
+    method public abstract String value();
+  }
+
+  public class NavigatorProvider {
+    ctor public NavigatorProvider();
+    method public final androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? addNavigator(androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>);
+    method @CallSuper public androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? addNavigator(String, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>);
+    method public final <T extends androidx.navigation.Navigator<?>> T getNavigator(Class<T!>);
+    method @CallSuper public <T extends androidx.navigation.Navigator<?>> T getNavigator(String);
+  }
+
+}
+
diff --git a/navigation/navigation-common/api/restricted_current.txt b/navigation/navigation-common/api/restricted_current.txt
index 32c3303..a5e68d6 100644
--- a/navigation/navigation-common/api/restricted_current.txt
+++ b/navigation/navigation-common/api/restricted_current.txt
@@ -42,17 +42,17 @@
   public final class NavDeepLink {
     method public String? getAction();
     method public String? getMimeType();
-    method public String? getUri();
+    method public String? getUriPattern();
   }
 
   public static final class NavDeepLink.Builder {
     method public androidx.navigation.NavDeepLink build();
     method public static androidx.navigation.NavDeepLink.Builder fromAction(String);
     method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String);
-    method public static androidx.navigation.NavDeepLink.Builder fromUri(String);
+    method public static androidx.navigation.NavDeepLink.Builder fromUriPattern(String);
     method public androidx.navigation.NavDeepLink.Builder setAction(String);
     method public androidx.navigation.NavDeepLink.Builder setMimeType(String);
-    method public androidx.navigation.NavDeepLink.Builder setUri(String);
+    method public androidx.navigation.NavDeepLink.Builder setUriPattern(String);
   }
 
   public class NavDeepLinkRequest {
diff --git a/navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDeepLinkActionTest.kt b/navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDeepLinkActionTest.kt
index 509c4d8..b11cdd1 100644
--- a/navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDeepLinkActionTest.kt
+++ b/navigation/navigation-common/src/androidTest/java/androidx/navigation/NavDeepLinkActionTest.kt
@@ -83,7 +83,7 @@
     @Test
     fun deepLinkEmptySetAction() {
         try {
-            NavDeepLink.Builder.fromUri(DEEP_LINK_EXACT_HTTPS).setAction("").build()
+            NavDeepLink.Builder.fromUriPattern(DEEP_LINK_EXACT_HTTPS).setAction("").build()
         } catch (e: IllegalArgumentException) {
             assertThat(e)
                 .hasMessageThat().contains(
diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLink.java b/navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLink.java
index 289dfb9..a3cc9484 100644
--- a/navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLink.java
+++ b/navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLink.java
@@ -204,13 +204,13 @@
     }
 
     /**
-     * Get the uri from the NavDeepLink.
+     * Get the uri pattern from the NavDeepLink.
      *
-     * @return the uri for the deep link.
+     * @return the uri pattern for the deep link.
      * @see NavDeepLinkRequest#getUri()
      */
     @Nullable
-    public String getUri() {
+    public String getUriPattern() {
         return mUri;
     }
 
@@ -382,22 +382,22 @@
      * A builder for constructing {@link NavDeepLink} instances.
      */
     public static final class Builder {
-        private String mUri;
+        private String mUriPattern;
         private String mAction;
         private String mMimeType;
 
         Builder() {}
 
         /**
-         * Creates a {@link NavDeepLink.Builder} with a set uri.
+         * Creates a {@link NavDeepLink.Builder} with a set uri pattern.
          *
-         * @param uri The uri pattern to add to the NavDeepLink
+         * @param uriPattern The uri pattern to add to the NavDeepLink
          * @return a {@link Builder} instance
          */
         @NonNull
-        public static Builder fromUri(@NonNull String uri) {
+        public static Builder fromUriPattern(@NonNull String uriPattern) {
             Builder builder = new Builder();
-            builder.setUri(uri);
+            builder.setUriPattern(uriPattern);
             return builder;
         }
 
@@ -434,15 +434,15 @@
         }
 
         /**
-         * Set the uri for the {@link NavDeepLink}.
+         * Set the uri pattern for the {@link NavDeepLink}.
          *
-         * @param uri The uri pattern to add to the NavDeepLink
+         * @param uriPattern The uri pattern to add to the NavDeepLink
          *
          * @return This builder.
          */
         @NonNull
-        public Builder setUri(@NonNull String uri) {
-            mUri = uri;
+        public Builder setUriPattern(@NonNull String uriPattern) {
+            mUriPattern = uriPattern;
             return this;
         }
 
@@ -485,7 +485,7 @@
          */
         @NonNull
         public NavDeepLink build() {
-            return new NavDeepLink(mUri, mAction, mMimeType);
+            return new NavDeepLink(mUriPattern, mAction, mMimeType);
         }
     }
 }
diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLinkRequest.java b/navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLinkRequest.java
index 8e76b55..d35cefe 100644
--- a/navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLinkRequest.java
+++ b/navigation/navigation-common/src/main/java/androidx/navigation/NavDeepLinkRequest.java
@@ -51,7 +51,7 @@
      * Get the uri from the NavDeepLinkRequest.
      *
      * @return the uri for the request.
-     * @see NavDeepLink#getUri()
+     * @see NavDeepLink#getUriPattern()
      */
     @Nullable
     public Uri getUri() {
@@ -118,7 +118,7 @@
         /**
          * Creates a {@link NavDeepLinkRequest.Builder} with a set uri.
          *
-         * @param uri The uri pattern to add to the NavDeepLinkRequest
+         * @param uri The uri to add to the NavDeepLinkRequest
          * @return a {@link Builder} instance
          */
         @NonNull
@@ -163,7 +163,7 @@
         /**
          * Set the uri for the {@link NavDeepLinkRequest}.
          *
-         * @param uri The uri pattern to add to the NavDeepLinkRequest
+         * @param uri The uri to add to the NavDeepLinkRequest
          *
          * @return This builder.
          */
diff --git a/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.java b/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.java
index 230e545..7169d96 100644
--- a/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.java
+++ b/navigation/navigation-common/src/main/java/androidx/navigation/NavDestination.java
@@ -404,7 +404,7 @@
      * @see #addDeepLink(NavDeepLink)
      */
     public final void addDeepLink(@NonNull String uriPattern) {
-        addDeepLink(new NavDeepLink.Builder().setUri(uriPattern).build());
+        addDeepLink(new NavDeepLink.Builder().setUriPattern(uriPattern).build());
     }
 
     /**
diff --git a/navigation/navigation-dynamic-features-fragment/api/2.3.0-alpha06.txt b/navigation/navigation-dynamic-features-fragment/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..9d22e3d
--- /dev/null
+++ b/navigation/navigation-dynamic-features-fragment/api/2.3.0-alpha06.txt
@@ -0,0 +1,57 @@
+// Signature format: 3.0
+package androidx.navigation.dynamicfeatures.fragment {
+
+  @androidx.navigation.Navigator.Name("fragment") public final class DynamicFragmentNavigator extends androidx.navigation.fragment.FragmentNavigator {
+    ctor public DynamicFragmentNavigator(android.content.Context context, androidx.fragment.app.FragmentManager manager, int containerId, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator.Destination createDestination();
+  }
+
+  public static final class DynamicFragmentNavigator.Destination extends androidx.navigation.fragment.FragmentNavigator.Destination {
+    ctor public DynamicFragmentNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
+    ctor public DynamicFragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination> fragmentNavigator);
+    method public String? getModuleName();
+    method public void setModuleName(String? p);
+    property public final String? moduleName;
+  }
+
+  public final class DynamicFragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.FragmentNavigator.Destination> {
+    ctor public DynamicFragmentNavigatorDestinationBuilder(androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator navigator, @IdRes int id, String fragmentClassName);
+    method public androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator.Destination build();
+    method public String? getModuleName();
+    method public void setModuleName(String? p);
+    property public final String? moduleName;
+  }
+
+  public final class DynamicFragmentNavigatorDestinationBuilderKt {
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public class DynamicNavHostFragment extends androidx.navigation.fragment.NavHostFragment {
+    ctor public DynamicNavHostFragment();
+    method protected com.google.android.play.core.splitinstall.SplitInstallManager createSplitInstallManager();
+  }
+
+}
+
+package androidx.navigation.dynamicfeatures.fragment.ui {
+
+  public abstract class AbstractProgressFragment extends androidx.fragment.app.Fragment {
+    ctor public AbstractProgressFragment();
+    ctor public AbstractProgressFragment(int contentLayoutId);
+    method protected abstract void onCancelled();
+    method protected abstract void onFailed(int errorCode);
+    method protected void onInstalled();
+    method protected abstract void onProgress(int status, long bytesDownloaded, long bytesTotal);
+  }
+
+  public final class DefaultProgressFragment extends androidx.navigation.dynamicfeatures.fragment.ui.AbstractProgressFragment {
+    ctor public DefaultProgressFragment();
+    method protected void onCancelled();
+    method protected void onFailed(int errorCode);
+    method protected void onProgress(int status, long bytesDownloaded, long bytesTotal);
+  }
+
+}
+
diff --git a/navigation/navigation-dynamic-features-fragment/api/current.txt b/navigation/navigation-dynamic-features-fragment/api/current.txt
index 9179532..9d22e3d 100644
--- a/navigation/navigation-dynamic-features-fragment/api/current.txt
+++ b/navigation/navigation-dynamic-features-fragment/api/current.txt
@@ -23,7 +23,9 @@
   }
 
   public final class DynamicFragmentNavigatorDestinationBuilderKt {
-    method public static inline void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
   }
 
   public class DynamicNavHostFragment extends androidx.navigation.fragment.NavHostFragment {
diff --git a/navigation/navigation-dynamic-features-fragment/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-dynamic-features-fragment/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..9d22e3d
--- /dev/null
+++ b/navigation/navigation-dynamic-features-fragment/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,57 @@
+// Signature format: 3.0
+package androidx.navigation.dynamicfeatures.fragment {
+
+  @androidx.navigation.Navigator.Name("fragment") public final class DynamicFragmentNavigator extends androidx.navigation.fragment.FragmentNavigator {
+    ctor public DynamicFragmentNavigator(android.content.Context context, androidx.fragment.app.FragmentManager manager, int containerId, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator.Destination createDestination();
+  }
+
+  public static final class DynamicFragmentNavigator.Destination extends androidx.navigation.fragment.FragmentNavigator.Destination {
+    ctor public DynamicFragmentNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
+    ctor public DynamicFragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination> fragmentNavigator);
+    method public String? getModuleName();
+    method public void setModuleName(String? p);
+    property public final String? moduleName;
+  }
+
+  public final class DynamicFragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.FragmentNavigator.Destination> {
+    ctor public DynamicFragmentNavigatorDestinationBuilder(androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator navigator, @IdRes int id, String fragmentClassName);
+    method public androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator.Destination build();
+    method public String? getModuleName();
+    method public void setModuleName(String? p);
+    property public final String? moduleName;
+  }
+
+  public final class DynamicFragmentNavigatorDestinationBuilderKt {
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public class DynamicNavHostFragment extends androidx.navigation.fragment.NavHostFragment {
+    ctor public DynamicNavHostFragment();
+    method protected com.google.android.play.core.splitinstall.SplitInstallManager createSplitInstallManager();
+  }
+
+}
+
+package androidx.navigation.dynamicfeatures.fragment.ui {
+
+  public abstract class AbstractProgressFragment extends androidx.fragment.app.Fragment {
+    ctor public AbstractProgressFragment();
+    ctor public AbstractProgressFragment(int contentLayoutId);
+    method protected abstract void onCancelled();
+    method protected abstract void onFailed(int errorCode);
+    method protected void onInstalled();
+    method protected abstract void onProgress(int status, long bytesDownloaded, long bytesTotal);
+  }
+
+  public final class DefaultProgressFragment extends androidx.navigation.dynamicfeatures.fragment.ui.AbstractProgressFragment {
+    ctor public DefaultProgressFragment();
+    method protected void onCancelled();
+    method protected void onFailed(int errorCode);
+    method protected void onProgress(int status, long bytesDownloaded, long bytesTotal);
+  }
+
+}
+
diff --git a/navigation/navigation-dynamic-features-fragment/api/public_plus_experimental_current.txt b/navigation/navigation-dynamic-features-fragment/api/public_plus_experimental_current.txt
index 9179532..9d22e3d 100644
--- a/navigation/navigation-dynamic-features-fragment/api/public_plus_experimental_current.txt
+++ b/navigation/navigation-dynamic-features-fragment/api/public_plus_experimental_current.txt
@@ -23,7 +23,9 @@
   }
 
   public final class DynamicFragmentNavigatorDestinationBuilderKt {
-    method public static inline void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
   }
 
   public class DynamicNavHostFragment extends androidx.navigation.fragment.NavHostFragment {
diff --git a/navigation/navigation-dynamic-features-fragment/api/res-2.3.0-alpha06.txt b/navigation/navigation-dynamic-features-fragment/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-dynamic-features-fragment/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-dynamic-features-fragment/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-dynamic-features-fragment/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..9d22e3d
--- /dev/null
+++ b/navigation/navigation-dynamic-features-fragment/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,57 @@
+// Signature format: 3.0
+package androidx.navigation.dynamicfeatures.fragment {
+
+  @androidx.navigation.Navigator.Name("fragment") public final class DynamicFragmentNavigator extends androidx.navigation.fragment.FragmentNavigator {
+    ctor public DynamicFragmentNavigator(android.content.Context context, androidx.fragment.app.FragmentManager manager, int containerId, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator.Destination createDestination();
+  }
+
+  public static final class DynamicFragmentNavigator.Destination extends androidx.navigation.fragment.FragmentNavigator.Destination {
+    ctor public DynamicFragmentNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
+    ctor public DynamicFragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination> fragmentNavigator);
+    method public String? getModuleName();
+    method public void setModuleName(String? p);
+    property public final String? moduleName;
+  }
+
+  public final class DynamicFragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.FragmentNavigator.Destination> {
+    ctor public DynamicFragmentNavigatorDestinationBuilder(androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator navigator, @IdRes int id, String fragmentClassName);
+    method public androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator.Destination build();
+    method public String? getModuleName();
+    method public void setModuleName(String? p);
+    property public final String? moduleName;
+  }
+
+  public final class DynamicFragmentNavigatorDestinationBuilderKt {
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public class DynamicNavHostFragment extends androidx.navigation.fragment.NavHostFragment {
+    ctor public DynamicNavHostFragment();
+    method protected com.google.android.play.core.splitinstall.SplitInstallManager createSplitInstallManager();
+  }
+
+}
+
+package androidx.navigation.dynamicfeatures.fragment.ui {
+
+  public abstract class AbstractProgressFragment extends androidx.fragment.app.Fragment {
+    ctor public AbstractProgressFragment();
+    ctor public AbstractProgressFragment(int contentLayoutId);
+    method protected abstract void onCancelled();
+    method protected abstract void onFailed(int errorCode);
+    method protected void onInstalled();
+    method protected abstract void onProgress(int status, long bytesDownloaded, long bytesTotal);
+  }
+
+  public final class DefaultProgressFragment extends androidx.navigation.dynamicfeatures.fragment.ui.AbstractProgressFragment {
+    ctor public DefaultProgressFragment();
+    method protected void onCancelled();
+    method protected void onFailed(int errorCode);
+    method protected void onProgress(int status, long bytesDownloaded, long bytesTotal);
+  }
+
+}
+
diff --git a/navigation/navigation-dynamic-features-fragment/api/restricted_current.txt b/navigation/navigation-dynamic-features-fragment/api/restricted_current.txt
index 9179532..9d22e3d 100644
--- a/navigation/navigation-dynamic-features-fragment/api/restricted_current.txt
+++ b/navigation/navigation-dynamic-features-fragment/api/restricted_current.txt
@@ -23,7 +23,9 @@
   }
 
   public final class DynamicFragmentNavigatorDestinationBuilderKt {
-    method public static inline void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
   }
 
   public class DynamicNavHostFragment extends androidx.navigation.fragment.NavHostFragment {
diff --git a/navigation/navigation-dynamic-features-fragment/src/androidTest/java/androidx/navigation/dynamicfeatures/fragment/DynamicFragmentNavigatorDestinationBuilderTest.kt b/navigation/navigation-dynamic-features-fragment/src/androidTest/java/androidx/navigation/dynamicfeatures/fragment/DynamicFragmentNavigatorDestinationBuilderTest.kt
index b6bacce..06953cf 100644
--- a/navigation/navigation-dynamic-features-fragment/src/androidTest/java/androidx/navigation/dynamicfeatures/fragment/DynamicFragmentNavigatorDestinationBuilderTest.kt
+++ b/navigation/navigation-dynamic-features-fragment/src/androidTest/java/androidx/navigation/dynamicfeatures/fragment/DynamicFragmentNavigatorDestinationBuilderTest.kt
@@ -16,14 +16,15 @@
 
 package androidx.navigation.dynamicfeatures.fragment
 
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
-import androidx.navigation.contains
-import androidx.navigation.createGraph
+import androidx.navigation.dynamicfeatures.createGraph
+import androidx.navigation.get
 import androidx.test.annotation.UiThreadTest
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.rule.ActivityTestRule
-import org.junit.Assert.assertTrue
+import com.google.common.truth.Truth.assertWithMessage
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -36,6 +37,21 @@
     private val fragmentManager get() = activityRule.activity.supportFragmentManager
 
     @UiThreadTest
+    @Test fun reified() {
+        val navHostFragment = DynamicNavHostFragment()
+        fragmentManager.beginTransaction()
+            .add(android.R.id.content, navHostFragment)
+            .commitNow()
+        val graph = navHostFragment.createGraph(startDestination = DESTINATION_ID) {
+            fragment<TestFragment>(DESTINATION_ID)
+        }
+        val fragmentDestination = graph[DESTINATION_ID] as DynamicFragmentNavigator.Destination
+        assertWithMessage("Fragment class should be set")
+            .that(fragmentDestination.className)
+            .isEqualTo(TestFragment::class.java.name)
+    }
+
+    @UiThreadTest
     @Test fun moduleName() {
         val navHostFragment = DynamicNavHostFragment()
         fragmentManager.beginTransaction()
@@ -46,8 +62,13 @@
                 moduleName = MODULE_NAME
             }
         }
-        assertTrue("Destination should be added to the graph",
-                DESTINATION_ID in graph)
+        val fragmentDestination = graph[DESTINATION_ID] as DynamicFragmentNavigator.Destination
+        assertWithMessage("Fragment class should be set")
+            .that(fragmentDestination.className)
+            .isEqualTo(FRAGMENT_CLASS_NAME)
+        assertWithMessage("Module name should be set")
+            .that(fragmentDestination.moduleName)
+            .isEqualTo(MODULE_NAME)
     }
 
     @UiThreadTest
@@ -59,8 +80,13 @@
         val graph = navHostFragment.createGraph(startDestination = DESTINATION_ID) {
             fragment(DESTINATION_ID, FRAGMENT_CLASS_NAME) {}
         }
-        assertTrue("Destination should be added to the graph",
-                DESTINATION_ID in graph)
+        val fragmentDestination = graph[DESTINATION_ID] as DynamicFragmentNavigator.Destination
+        assertWithMessage("Fragment class should be set")
+            .that(fragmentDestination.className)
+            .isEqualTo(FRAGMENT_CLASS_NAME)
+        assertWithMessage("Module name should be null")
+            .that(fragmentDestination.moduleName)
+            .isNull()
     }
 }
 
@@ -68,4 +94,5 @@
 private const val MODULE_NAME = "module"
 private const val FRAGMENT_CLASS_NAME = "androidx.navigation.dynamicfeatures.fragment.TestFragment"
 
-class TestActivity : FragmentActivity()
\ No newline at end of file
+class TestActivity : FragmentActivity()
+class TestFragment : Fragment()
diff --git a/navigation/navigation-dynamic-features-fragment/src/main/java/androidx/navigation/dynamicfeatures/fragment/DynamicFragmentNavigatorDestinationBuilder.kt b/navigation/navigation-dynamic-features-fragment/src/main/java/androidx/navigation/dynamicfeatures/fragment/DynamicFragmentNavigatorDestinationBuilder.kt
index 6b5576a..e02af61 100644
--- a/navigation/navigation-dynamic-features-fragment/src/main/java/androidx/navigation/dynamicfeatures/fragment/DynamicFragmentNavigatorDestinationBuilder.kt
+++ b/navigation/navigation-dynamic-features-fragment/src/main/java/androidx/navigation/dynamicfeatures/fragment/DynamicFragmentNavigatorDestinationBuilder.kt
@@ -17,18 +17,37 @@
 package androidx.navigation.dynamicfeatures.fragment
 
 import androidx.annotation.IdRes
+import androidx.fragment.app.Fragment
 import androidx.navigation.NavDestinationBuilder
 import androidx.navigation.NavDestinationDsl
-import androidx.navigation.NavGraphBuilder
+import androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder
 import androidx.navigation.fragment.FragmentNavigator
+import androidx.navigation.fragment.fragment
 import androidx.navigation.get
 
 /**
  * Construct a new [DynamicFragmentNavigator.Destination]
  * @param id Destination id.
+ */
+inline fun <reified F : Fragment> DynamicNavGraphBuilder.fragment(
+    @IdRes id: Int
+) = fragment<F>(id) {}
+
+/**
+ * Construct a new [DynamicFragmentNavigator.Destination]
+ * @param id Destination id.
+ */
+inline fun <reified F : Fragment> DynamicNavGraphBuilder.fragment(
+    @IdRes id: Int,
+    builder: DynamicFragmentNavigatorDestinationBuilder.() -> Unit
+) = fragment(id, F::class.java.name, builder)
+
+/**
+ * Construct a new [DynamicFragmentNavigator.Destination]
+ * @param id Destination id.
  * @param fragmentClassName Fully qualified class name of destination Fragment.
  */
-inline fun NavGraphBuilder.fragment(
+inline fun DynamicNavGraphBuilder.fragment(
     @IdRes id: Int,
     fragmentClassName: String,
     builder: DynamicFragmentNavigatorDestinationBuilder.() -> Unit
diff --git a/navigation/navigation-dynamic-features-runtime/api/2.3.0-alpha06.txt b/navigation/navigation-dynamic-features-runtime/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..450b285b
--- /dev/null
+++ b/navigation/navigation-dynamic-features-runtime/api/2.3.0-alpha06.txt
@@ -0,0 +1,135 @@
+// Signature format: 3.0
+package androidx.navigation.dynamicfeatures {
+
+  @androidx.navigation.Navigator.Name("activity") public final class DynamicActivityNavigator extends androidx.navigation.ActivityNavigator {
+    ctor public DynamicActivityNavigator(android.content.Context context, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.DynamicActivityNavigator.Destination createDestination();
+  }
+
+  public static final class DynamicActivityNavigator.Destination extends androidx.navigation.ActivityNavigator.Destination {
+    ctor public DynamicActivityNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
+    ctor public DynamicActivityNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.ActivityNavigator.Destination> activityNavigator);
+    method public String? getModuleName();
+    method public void setModuleName(String? p);
+    property public final String? moduleName;
+  }
+
+  public final class DynamicActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
+    ctor public DynamicActivityNavigatorDestinationBuilder(androidx.navigation.dynamicfeatures.DynamicActivityNavigator activityNavigator, @IdRes int id);
+    method public androidx.navigation.dynamicfeatures.DynamicActivityNavigator.Destination build();
+    method public String? getAction();
+    method public String? getActivityClassName();
+    method public android.net.Uri? getData();
+    method public String? getDataPattern();
+    method public String? getModuleName();
+    method public String? getTargetPackage();
+    method public void setAction(String? p);
+    method public void setActivityClassName(String? p);
+    method public void setData(android.net.Uri? p);
+    method public void setDataPattern(String? p);
+    method public void setModuleName(String? p);
+    method public void setTargetPackage(String? p);
+    property public final String? action;
+    property public final String? activityClassName;
+    property public final android.net.Uri? data;
+    property public final String? dataPattern;
+    property public final String? moduleName;
+    property public final String? targetPackage;
+  }
+
+  public final class DynamicActivityNavigatorDestinationBuilderKt {
+    method public static inline void activity(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class DynamicExtras implements androidx.navigation.Navigator.Extras {
+    ctor public DynamicExtras(androidx.navigation.dynamicfeatures.DynamicInstallMonitor? installMonitor, androidx.navigation.Navigator.Extras? destinationExtras);
+    ctor public DynamicExtras(androidx.navigation.dynamicfeatures.DynamicInstallMonitor? installMonitor);
+    ctor public DynamicExtras();
+    method public androidx.navigation.Navigator.Extras? getDestinationExtras();
+    method public androidx.navigation.dynamicfeatures.DynamicInstallMonitor? getInstallMonitor();
+  }
+
+  @androidx.navigation.Navigator.Name("navigation") public final class DynamicGraphNavigator extends androidx.navigation.NavGraphNavigator {
+    ctor public DynamicGraphNavigator(androidx.navigation.NavigatorProvider navigatorProvider, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.DynamicGraphNavigator.DynamicNavGraph createDestination();
+    method public void installDefaultProgressDestination(kotlin.jvm.functions.Function0<? extends androidx.navigation.NavDestination> progressDestinationSupplier);
+  }
+
+  public static final class DynamicGraphNavigator.DynamicNavGraph extends androidx.navigation.NavGraph {
+    ctor public DynamicGraphNavigator.DynamicNavGraph(internal androidx.navigation.dynamicfeatures.DynamicGraphNavigator navGraphNavigator, internal androidx.navigation.NavigatorProvider navigatorProvider);
+    method public String? getModuleName();
+    method public int getProgressDestination();
+    method public void setModuleName(String? p);
+    method public void setProgressDestination(int p);
+    property public final String? moduleName;
+    property public final int progressDestination;
+  }
+
+  @androidx.navigation.Navigator.Name("include-dynamic") public final class DynamicIncludeGraphNavigator extends androidx.navigation.Navigator<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
+    ctor public DynamicIncludeGraphNavigator(android.content.Context context, androidx.navigation.NavigatorProvider navigatorProvider, androidx.navigation.NavInflater navInflater, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph destination, android.os.Bundle? args, androidx.navigation.NavOptions? navOptions, androidx.navigation.Navigator.Extras? navigatorExtras);
+    method public boolean popBackStack();
+  }
+
+  public static final class DynamicIncludeGraphNavigator.DynamicIncludeNavGraph extends androidx.navigation.NavDestination {
+    method public String? getGraphPackage();
+    method public String? getGraphResourceName();
+    method public String? getModuleName();
+    method public void setGraphPackage(String? p);
+    method public void setGraphResourceName(String? p);
+    method public void setModuleName(String? p);
+    property public final String? graphPackage;
+    property public final String? graphResourceName;
+    property public final String? moduleName;
+  }
+
+  public final class DynamicIncludeNavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
+    ctor public DynamicIncludeNavGraphBuilder(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator dynamicIncludeGraphNavigator, @IdRes int id, String moduleName, String graphResourceName);
+    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph build();
+    method public String? getGraphPackage();
+    method public void setGraphPackage(String? p);
+    property public final String? graphPackage;
+  }
+
+  public final class DynamicIncludeNavGraphBuilderKt {
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName);
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicIncludeNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public class DynamicInstallManager {
+    ctor public DynamicInstallManager(android.content.Context context, com.google.android.play.core.splitinstall.SplitInstallManager splitInstallManager);
+  }
+
+  public final class DynamicInstallMonitor {
+    ctor public DynamicInstallMonitor();
+    method public void cancelInstall();
+    method public Exception? getException();
+    method public int getSessionId();
+    method public androidx.lifecycle.LiveData<com.google.android.play.core.splitinstall.SplitInstallSessionState> getStatus();
+    method public boolean isInstallRequired();
+    property public final Exception? exception;
+    property public final boolean isInstallRequired;
+    property public final int sessionId;
+    property public final androidx.lifecycle.LiveData<com.google.android.play.core.splitinstall.SplitInstallSessionState> status;
+  }
+
+  public final class DynamicNavGraphBuilder extends androidx.navigation.NavGraphBuilder {
+    ctor public DynamicNavGraphBuilder(androidx.navigation.NavigatorProvider provider, @IdRes int id, @IdRes int startDestination, String? moduleName, int progressDestination);
+  }
+
+  public final class DynamicNavGraphBuilderKt {
+    method public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+    method public static inline void navigation(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavControllerKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavHostKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+}
+
diff --git a/navigation/navigation-dynamic-features-runtime/api/current.txt b/navigation/navigation-dynamic-features-runtime/api/current.txt
index bbcbf2c..450b285b 100644
--- a/navigation/navigation-dynamic-features-runtime/api/current.txt
+++ b/navigation/navigation-dynamic-features-runtime/api/current.txt
@@ -38,7 +38,7 @@
   }
 
   public final class DynamicActivityNavigatorDestinationBuilderKt {
-    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void activity(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
   }
 
   public final class DynamicExtras implements androidx.navigation.Navigator.Extras {
@@ -84,6 +84,19 @@
     property public final String? moduleName;
   }
 
+  public final class DynamicIncludeNavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
+    ctor public DynamicIncludeNavGraphBuilder(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator dynamicIncludeGraphNavigator, @IdRes int id, String moduleName, String graphResourceName);
+    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph build();
+    method public String? getGraphPackage();
+    method public void setGraphPackage(String? p);
+    property public final String? graphPackage;
+  }
+
+  public final class DynamicIncludeNavGraphBuilderKt {
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName);
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicIncludeNavGraphBuilder,kotlin.Unit> builder);
+  }
+
   public class DynamicInstallManager {
     ctor public DynamicInstallManager(android.content.Context context, com.google.android.play.core.splitinstall.SplitInstallManager splitInstallManager);
   }
@@ -110,5 +123,13 @@
     method public static inline void navigation(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
   }
 
+  public final class NavControllerKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavHostKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
 }
 
diff --git a/navigation/navigation-dynamic-features-runtime/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-dynamic-features-runtime/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..450b285b
--- /dev/null
+++ b/navigation/navigation-dynamic-features-runtime/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,135 @@
+// Signature format: 3.0
+package androidx.navigation.dynamicfeatures {
+
+  @androidx.navigation.Navigator.Name("activity") public final class DynamicActivityNavigator extends androidx.navigation.ActivityNavigator {
+    ctor public DynamicActivityNavigator(android.content.Context context, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.DynamicActivityNavigator.Destination createDestination();
+  }
+
+  public static final class DynamicActivityNavigator.Destination extends androidx.navigation.ActivityNavigator.Destination {
+    ctor public DynamicActivityNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
+    ctor public DynamicActivityNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.ActivityNavigator.Destination> activityNavigator);
+    method public String? getModuleName();
+    method public void setModuleName(String? p);
+    property public final String? moduleName;
+  }
+
+  public final class DynamicActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
+    ctor public DynamicActivityNavigatorDestinationBuilder(androidx.navigation.dynamicfeatures.DynamicActivityNavigator activityNavigator, @IdRes int id);
+    method public androidx.navigation.dynamicfeatures.DynamicActivityNavigator.Destination build();
+    method public String? getAction();
+    method public String? getActivityClassName();
+    method public android.net.Uri? getData();
+    method public String? getDataPattern();
+    method public String? getModuleName();
+    method public String? getTargetPackage();
+    method public void setAction(String? p);
+    method public void setActivityClassName(String? p);
+    method public void setData(android.net.Uri? p);
+    method public void setDataPattern(String? p);
+    method public void setModuleName(String? p);
+    method public void setTargetPackage(String? p);
+    property public final String? action;
+    property public final String? activityClassName;
+    property public final android.net.Uri? data;
+    property public final String? dataPattern;
+    property public final String? moduleName;
+    property public final String? targetPackage;
+  }
+
+  public final class DynamicActivityNavigatorDestinationBuilderKt {
+    method public static inline void activity(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class DynamicExtras implements androidx.navigation.Navigator.Extras {
+    ctor public DynamicExtras(androidx.navigation.dynamicfeatures.DynamicInstallMonitor? installMonitor, androidx.navigation.Navigator.Extras? destinationExtras);
+    ctor public DynamicExtras(androidx.navigation.dynamicfeatures.DynamicInstallMonitor? installMonitor);
+    ctor public DynamicExtras();
+    method public androidx.navigation.Navigator.Extras? getDestinationExtras();
+    method public androidx.navigation.dynamicfeatures.DynamicInstallMonitor? getInstallMonitor();
+  }
+
+  @androidx.navigation.Navigator.Name("navigation") public final class DynamicGraphNavigator extends androidx.navigation.NavGraphNavigator {
+    ctor public DynamicGraphNavigator(androidx.navigation.NavigatorProvider navigatorProvider, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.DynamicGraphNavigator.DynamicNavGraph createDestination();
+    method public void installDefaultProgressDestination(kotlin.jvm.functions.Function0<? extends androidx.navigation.NavDestination> progressDestinationSupplier);
+  }
+
+  public static final class DynamicGraphNavigator.DynamicNavGraph extends androidx.navigation.NavGraph {
+    ctor public DynamicGraphNavigator.DynamicNavGraph(internal androidx.navigation.dynamicfeatures.DynamicGraphNavigator navGraphNavigator, internal androidx.navigation.NavigatorProvider navigatorProvider);
+    method public String? getModuleName();
+    method public int getProgressDestination();
+    method public void setModuleName(String? p);
+    method public void setProgressDestination(int p);
+    property public final String? moduleName;
+    property public final int progressDestination;
+  }
+
+  @androidx.navigation.Navigator.Name("include-dynamic") public final class DynamicIncludeGraphNavigator extends androidx.navigation.Navigator<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
+    ctor public DynamicIncludeGraphNavigator(android.content.Context context, androidx.navigation.NavigatorProvider navigatorProvider, androidx.navigation.NavInflater navInflater, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph destination, android.os.Bundle? args, androidx.navigation.NavOptions? navOptions, androidx.navigation.Navigator.Extras? navigatorExtras);
+    method public boolean popBackStack();
+  }
+
+  public static final class DynamicIncludeGraphNavigator.DynamicIncludeNavGraph extends androidx.navigation.NavDestination {
+    method public String? getGraphPackage();
+    method public String? getGraphResourceName();
+    method public String? getModuleName();
+    method public void setGraphPackage(String? p);
+    method public void setGraphResourceName(String? p);
+    method public void setModuleName(String? p);
+    property public final String? graphPackage;
+    property public final String? graphResourceName;
+    property public final String? moduleName;
+  }
+
+  public final class DynamicIncludeNavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
+    ctor public DynamicIncludeNavGraphBuilder(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator dynamicIncludeGraphNavigator, @IdRes int id, String moduleName, String graphResourceName);
+    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph build();
+    method public String? getGraphPackage();
+    method public void setGraphPackage(String? p);
+    property public final String? graphPackage;
+  }
+
+  public final class DynamicIncludeNavGraphBuilderKt {
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName);
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicIncludeNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public class DynamicInstallManager {
+    ctor public DynamicInstallManager(android.content.Context context, com.google.android.play.core.splitinstall.SplitInstallManager splitInstallManager);
+  }
+
+  public final class DynamicInstallMonitor {
+    ctor public DynamicInstallMonitor();
+    method public void cancelInstall();
+    method public Exception? getException();
+    method public int getSessionId();
+    method public androidx.lifecycle.LiveData<com.google.android.play.core.splitinstall.SplitInstallSessionState> getStatus();
+    method public boolean isInstallRequired();
+    property public final Exception? exception;
+    property public final boolean isInstallRequired;
+    property public final int sessionId;
+    property public final androidx.lifecycle.LiveData<com.google.android.play.core.splitinstall.SplitInstallSessionState> status;
+  }
+
+  public final class DynamicNavGraphBuilder extends androidx.navigation.NavGraphBuilder {
+    ctor public DynamicNavGraphBuilder(androidx.navigation.NavigatorProvider provider, @IdRes int id, @IdRes int startDestination, String? moduleName, int progressDestination);
+  }
+
+  public final class DynamicNavGraphBuilderKt {
+    method public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+    method public static inline void navigation(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavControllerKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavHostKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+}
+
diff --git a/navigation/navigation-dynamic-features-runtime/api/public_plus_experimental_current.txt b/navigation/navigation-dynamic-features-runtime/api/public_plus_experimental_current.txt
index bbcbf2c..450b285b 100644
--- a/navigation/navigation-dynamic-features-runtime/api/public_plus_experimental_current.txt
+++ b/navigation/navigation-dynamic-features-runtime/api/public_plus_experimental_current.txt
@@ -38,7 +38,7 @@
   }
 
   public final class DynamicActivityNavigatorDestinationBuilderKt {
-    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void activity(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
   }
 
   public final class DynamicExtras implements androidx.navigation.Navigator.Extras {
@@ -84,6 +84,19 @@
     property public final String? moduleName;
   }
 
+  public final class DynamicIncludeNavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
+    ctor public DynamicIncludeNavGraphBuilder(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator dynamicIncludeGraphNavigator, @IdRes int id, String moduleName, String graphResourceName);
+    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph build();
+    method public String? getGraphPackage();
+    method public void setGraphPackage(String? p);
+    property public final String? graphPackage;
+  }
+
+  public final class DynamicIncludeNavGraphBuilderKt {
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName);
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicIncludeNavGraphBuilder,kotlin.Unit> builder);
+  }
+
   public class DynamicInstallManager {
     ctor public DynamicInstallManager(android.content.Context context, com.google.android.play.core.splitinstall.SplitInstallManager splitInstallManager);
   }
@@ -110,5 +123,13 @@
     method public static inline void navigation(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
   }
 
+  public final class NavControllerKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavHostKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
 }
 
diff --git a/navigation/navigation-dynamic-features-runtime/api/res-2.3.0-alpha06.txt b/navigation/navigation-dynamic-features-runtime/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-dynamic-features-runtime/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-dynamic-features-runtime/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-dynamic-features-runtime/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..450b285b
--- /dev/null
+++ b/navigation/navigation-dynamic-features-runtime/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,135 @@
+// Signature format: 3.0
+package androidx.navigation.dynamicfeatures {
+
+  @androidx.navigation.Navigator.Name("activity") public final class DynamicActivityNavigator extends androidx.navigation.ActivityNavigator {
+    ctor public DynamicActivityNavigator(android.content.Context context, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.DynamicActivityNavigator.Destination createDestination();
+  }
+
+  public static final class DynamicActivityNavigator.Destination extends androidx.navigation.ActivityNavigator.Destination {
+    ctor public DynamicActivityNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
+    ctor public DynamicActivityNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.ActivityNavigator.Destination> activityNavigator);
+    method public String? getModuleName();
+    method public void setModuleName(String? p);
+    property public final String? moduleName;
+  }
+
+  public final class DynamicActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
+    ctor public DynamicActivityNavigatorDestinationBuilder(androidx.navigation.dynamicfeatures.DynamicActivityNavigator activityNavigator, @IdRes int id);
+    method public androidx.navigation.dynamicfeatures.DynamicActivityNavigator.Destination build();
+    method public String? getAction();
+    method public String? getActivityClassName();
+    method public android.net.Uri? getData();
+    method public String? getDataPattern();
+    method public String? getModuleName();
+    method public String? getTargetPackage();
+    method public void setAction(String? p);
+    method public void setActivityClassName(String? p);
+    method public void setData(android.net.Uri? p);
+    method public void setDataPattern(String? p);
+    method public void setModuleName(String? p);
+    method public void setTargetPackage(String? p);
+    property public final String? action;
+    property public final String? activityClassName;
+    property public final android.net.Uri? data;
+    property public final String? dataPattern;
+    property public final String? moduleName;
+    property public final String? targetPackage;
+  }
+
+  public final class DynamicActivityNavigatorDestinationBuilderKt {
+    method public static inline void activity(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class DynamicExtras implements androidx.navigation.Navigator.Extras {
+    ctor public DynamicExtras(androidx.navigation.dynamicfeatures.DynamicInstallMonitor? installMonitor, androidx.navigation.Navigator.Extras? destinationExtras);
+    ctor public DynamicExtras(androidx.navigation.dynamicfeatures.DynamicInstallMonitor? installMonitor);
+    ctor public DynamicExtras();
+    method public androidx.navigation.Navigator.Extras? getDestinationExtras();
+    method public androidx.navigation.dynamicfeatures.DynamicInstallMonitor? getInstallMonitor();
+  }
+
+  @androidx.navigation.Navigator.Name("navigation") public final class DynamicGraphNavigator extends androidx.navigation.NavGraphNavigator {
+    ctor public DynamicGraphNavigator(androidx.navigation.NavigatorProvider navigatorProvider, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.DynamicGraphNavigator.DynamicNavGraph createDestination();
+    method public void installDefaultProgressDestination(kotlin.jvm.functions.Function0<? extends androidx.navigation.NavDestination> progressDestinationSupplier);
+  }
+
+  public static final class DynamicGraphNavigator.DynamicNavGraph extends androidx.navigation.NavGraph {
+    ctor public DynamicGraphNavigator.DynamicNavGraph(internal androidx.navigation.dynamicfeatures.DynamicGraphNavigator navGraphNavigator, internal androidx.navigation.NavigatorProvider navigatorProvider);
+    method public String? getModuleName();
+    method public int getProgressDestination();
+    method public void setModuleName(String? p);
+    method public void setProgressDestination(int p);
+    property public final String? moduleName;
+    property public final int progressDestination;
+  }
+
+  @androidx.navigation.Navigator.Name("include-dynamic") public final class DynamicIncludeGraphNavigator extends androidx.navigation.Navigator<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
+    ctor public DynamicIncludeGraphNavigator(android.content.Context context, androidx.navigation.NavigatorProvider navigatorProvider, androidx.navigation.NavInflater navInflater, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
+    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph destination, android.os.Bundle? args, androidx.navigation.NavOptions? navOptions, androidx.navigation.Navigator.Extras? navigatorExtras);
+    method public boolean popBackStack();
+  }
+
+  public static final class DynamicIncludeGraphNavigator.DynamicIncludeNavGraph extends androidx.navigation.NavDestination {
+    method public String? getGraphPackage();
+    method public String? getGraphResourceName();
+    method public String? getModuleName();
+    method public void setGraphPackage(String? p);
+    method public void setGraphResourceName(String? p);
+    method public void setModuleName(String? p);
+    property public final String? graphPackage;
+    property public final String? graphResourceName;
+    property public final String? moduleName;
+  }
+
+  public final class DynamicIncludeNavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
+    ctor public DynamicIncludeNavGraphBuilder(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator dynamicIncludeGraphNavigator, @IdRes int id, String moduleName, String graphResourceName);
+    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph build();
+    method public String? getGraphPackage();
+    method public void setGraphPackage(String? p);
+    property public final String? graphPackage;
+  }
+
+  public final class DynamicIncludeNavGraphBuilderKt {
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName);
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicIncludeNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public class DynamicInstallManager {
+    ctor public DynamicInstallManager(android.content.Context context, com.google.android.play.core.splitinstall.SplitInstallManager splitInstallManager);
+  }
+
+  public final class DynamicInstallMonitor {
+    ctor public DynamicInstallMonitor();
+    method public void cancelInstall();
+    method public Exception? getException();
+    method public int getSessionId();
+    method public androidx.lifecycle.LiveData<com.google.android.play.core.splitinstall.SplitInstallSessionState> getStatus();
+    method public boolean isInstallRequired();
+    property public final Exception? exception;
+    property public final boolean isInstallRequired;
+    property public final int sessionId;
+    property public final androidx.lifecycle.LiveData<com.google.android.play.core.splitinstall.SplitInstallSessionState> status;
+  }
+
+  public final class DynamicNavGraphBuilder extends androidx.navigation.NavGraphBuilder {
+    ctor public DynamicNavGraphBuilder(androidx.navigation.NavigatorProvider provider, @IdRes int id, @IdRes int startDestination, String? moduleName, int progressDestination);
+  }
+
+  public final class DynamicNavGraphBuilderKt {
+    method public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+    method public static inline void navigation(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavControllerKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavHostKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+}
+
diff --git a/navigation/navigation-dynamic-features-runtime/api/restricted_current.txt b/navigation/navigation-dynamic-features-runtime/api/restricted_current.txt
index bbcbf2c..450b285b 100644
--- a/navigation/navigation-dynamic-features-runtime/api/restricted_current.txt
+++ b/navigation/navigation-dynamic-features-runtime/api/restricted_current.txt
@@ -38,7 +38,7 @@
   }
 
   public final class DynamicActivityNavigatorDestinationBuilderKt {
-    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void activity(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
   }
 
   public final class DynamicExtras implements androidx.navigation.Navigator.Extras {
@@ -84,6 +84,19 @@
     property public final String? moduleName;
   }
 
+  public final class DynamicIncludeNavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
+    ctor public DynamicIncludeNavGraphBuilder(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator dynamicIncludeGraphNavigator, @IdRes int id, String moduleName, String graphResourceName);
+    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph build();
+    method public String? getGraphPackage();
+    method public void setGraphPackage(String? p);
+    property public final String? graphPackage;
+  }
+
+  public final class DynamicIncludeNavGraphBuilderKt {
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName);
+    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicIncludeNavGraphBuilder,kotlin.Unit> builder);
+  }
+
   public class DynamicInstallManager {
     ctor public DynamicInstallManager(android.content.Context context, com.google.android.play.core.splitinstall.SplitInstallManager splitInstallManager);
   }
@@ -110,5 +123,13 @@
     method public static inline void navigation(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
   }
 
+  public final class NavControllerKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavHostKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, String? moduleName = null, int progressDestination = 0, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
+  }
+
 }
 
diff --git a/navigation/navigation-dynamic-features-runtime/src/androidTest/java/androidx/navigation/dynamicfeatures/DynamicActivityNavigatorDestinationBuilderTest.kt b/navigation/navigation-dynamic-features-runtime/src/androidTest/java/androidx/navigation/dynamicfeatures/DynamicActivityNavigatorDestinationBuilderTest.kt
index 01fc143..b2abbe1 100644
--- a/navigation/navigation-dynamic-features-runtime/src/androidTest/java/androidx/navigation/dynamicfeatures/DynamicActivityNavigatorDestinationBuilderTest.kt
+++ b/navigation/navigation-dynamic-features-runtime/src/androidTest/java/androidx/navigation/dynamicfeatures/DynamicActivityNavigatorDestinationBuilderTest.kt
@@ -18,7 +18,6 @@
 import android.content.ComponentName
 import android.content.Context
 import androidx.navigation.NavController
-import androidx.navigation.createGraph
 import androidx.navigation.plusAssign
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/navigation/navigation-dynamic-features-runtime/src/androidTest/java/androidx/navigation/dynamicfeatures/DynamicIncludeNavGraphBuilderTest.kt b/navigation/navigation-dynamic-features-runtime/src/androidTest/java/androidx/navigation/dynamicfeatures/DynamicIncludeNavGraphBuilderTest.kt
new file mode 100644
index 0000000..024c82a
--- /dev/null
+++ b/navigation/navigation-dynamic-features-runtime/src/androidTest/java/androidx/navigation/dynamicfeatures/DynamicIncludeNavGraphBuilderTest.kt
@@ -0,0 +1,118 @@
+/*
+ * 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.navigation.dynamicfeatures
+
+import android.content.Context
+import androidx.navigation.NavController
+import androidx.navigation.NoOpNavigator
+import androidx.navigation.dynamicfeatures.shared.AndroidTestDynamicInstallManager
+import androidx.navigation.get
+import androidx.navigation.plusAssign
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.assertWithMessage
+import org.junit.Assert.fail
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@SmallTest
+@RunWith(AndroidJUnit4::class)
+class DynamicIncludeNavGraphBuilderTest {
+
+    private val context: Context = ApplicationProvider.getApplicationContext()
+    private val navController = NavController(context).apply {
+        navigatorProvider += DynamicIncludeGraphNavigator(context, navigatorProvider, navInflater,
+            AndroidTestDynamicInstallManager(context))
+        navigatorProvider += NoOpNavigator()
+    }
+
+    @Test
+    fun includeDynamic() {
+        val graph = navController.navigatorProvider.navigation(startDestination = GRAPH_ID) {
+            includeDynamic(GRAPH_ID, MODULE_NAME, GRAPH_RESOURCE_NAME) {
+                graphPackage = GRAPH_PACKAGE
+            }
+        }
+        val includeDynamic = graph[GRAPH_ID] as DynamicIncludeGraphNavigator.DynamicIncludeNavGraph
+        assertWithMessage("Module should be set in the graph")
+            .that(includeDynamic.moduleName)
+            .isEqualTo(MODULE_NAME)
+
+        assertWithMessage("graphPackage has to be set")
+            .that(includeDynamic.graphPackage)
+            .isEqualTo(GRAPH_PACKAGE)
+
+        assertWithMessage("graphResourceName has to be set")
+            .that(includeDynamic.graphResourceName)
+            .isEqualTo(GRAPH_RESOURCE_NAME)
+    }
+
+    fun includeDynamic_emptyModuleName() {
+        navController.navigatorProvider.navigation(startDestination = GRAPH_ID) {
+            try {
+                includeDynamic(GRAPH_ID, "", GRAPH_RESOURCE_NAME)
+                fail("includeDynamic should fail with an empty module name")
+            } catch (e: IllegalStateException) {
+                assertThat(e).hasMessageThat().isEqualTo("Module name cannot be empty")
+            }
+        }
+    }
+
+    @Test
+    fun includeDynamic_graphPackage_null() {
+        val graph = navController.navigatorProvider.navigation(startDestination = GRAPH_ID) {
+            includeDynamic(GRAPH_ID, MODULE_NAME, GRAPH_RESOURCE_NAME)
+        }
+        val includeDynamic = graph[GRAPH_ID] as DynamicIncludeGraphNavigator.DynamicIncludeNavGraph
+
+        assertWithMessage("graphPackage should be filled in from package name and module name")
+            .that(includeDynamic.graphPackage).isEqualTo("${context.packageName}.$MODULE_NAME")
+    }
+
+    @Test
+    fun includeDynamic_graphPackage_empty() {
+        navController.navigatorProvider.navigation(startDestination = GRAPH_ID) {
+            try {
+                includeDynamic(GRAPH_ID, MODULE_NAME, GRAPH_RESOURCE_NAME) {
+                    graphPackage = ""
+                }
+                fail("includeDynamic should fail with an empty graph package")
+            } catch (e: IllegalStateException) {
+                assertThat(e).hasMessageThat().isEqualTo("Graph package name cannot be empty")
+            }
+        }
+    }
+
+    @Test
+    fun includeDynamic_graphResourceName_empty() {
+        navController.navigatorProvider.navigation(startDestination = GRAPH_ID) {
+            try {
+                includeDynamic(GRAPH_ID, MODULE_NAME, "")
+                fail("includeDynamic should fail with an empty graph resource name")
+            } catch (e: IllegalStateException) {
+                assertThat(e).hasMessageThat().isEqualTo("Graph resource name cannot be empty")
+            }
+        }
+    }
+}
+
+private const val GRAPH_ID = 1
+private const val MODULE_NAME = "myModule"
+private const val GRAPH_PACKAGE = "com.example.mypackage"
+private const val GRAPH_RESOURCE_NAME = "graphName"
\ No newline at end of file
diff --git a/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicActivityNavigatorDestinationBuilder.kt b/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicActivityNavigatorDestinationBuilder.kt
index ece7835..dbbaf2a 100644
--- a/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicActivityNavigatorDestinationBuilder.kt
+++ b/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicActivityNavigatorDestinationBuilder.kt
@@ -24,14 +24,13 @@
 import androidx.navigation.ActivityNavigator
 import androidx.navigation.NavDestinationBuilder
 import androidx.navigation.NavDestinationDsl
-import androidx.navigation.NavGraphBuilder
 import androidx.navigation.get
 
 /**
  * Construct a new [DynamicActivityNavigator.Destination]
  * @param id Destination id.
  */
-inline fun NavGraphBuilder.activity(
+inline fun DynamicNavGraphBuilder.activity(
     @IdRes id: Int,
     builder: DynamicActivityNavigatorDestinationBuilder.() -> Unit
 ) = destination(
diff --git a/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicIncludeGraphNavigator.kt b/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicIncludeGraphNavigator.kt
index 5815dcd..980068f 100644
--- a/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicIncludeGraphNavigator.kt
+++ b/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicIncludeGraphNavigator.kt
@@ -20,6 +20,7 @@
 import android.content.res.Resources
 import android.os.Bundle
 import android.util.AttributeSet
+import androidx.annotation.RestrictTo
 import androidx.core.content.withStyledAttributes
 import androidx.navigation.NavDestination
 import androidx.navigation.NavGraph
@@ -43,6 +44,12 @@
     private val installManager: DynamicInstallManager
 ) : Navigator<DynamicIncludeGraphNavigator.DynamicIncludeNavGraph>() {
 
+    /**
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    val packageName: String = context.packageName
+
     private val createdDestinations = mutableListOf<DynamicIncludeNavGraph>()
 
     override fun createDestination(): DynamicIncludeNavGraph {
diff --git a/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicIncludeNavGraphBuilder.kt b/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicIncludeNavGraphBuilder.kt
new file mode 100644
index 0000000..d64718c
--- /dev/null
+++ b/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/DynamicIncludeNavGraphBuilder.kt
@@ -0,0 +1,113 @@
+/*
+ * 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("NOTHING_TO_INLINE")
+
+package androidx.navigation.dynamicfeatures
+
+import androidx.annotation.IdRes
+import androidx.navigation.NavDestinationBuilder
+import androidx.navigation.NavDestinationDsl
+import androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph
+import androidx.navigation.get
+
+/**
+ * Construct a new [DynamicIncludeGraphNavigator.DynamicIncludeNavGraph].
+ *
+ * @param id NavGraph id.
+ * @param moduleName Dynamic feature module name as defined in the module's `AndroidManifest`.
+ * This must not be an empty string.
+ * @param graphResourceName Graph's resource name without the `navigation` qualifier. This
+ * must not be an empty string.
+ */
+inline fun DynamicNavGraphBuilder.includeDynamic(
+    @IdRes id: Int,
+    moduleName: String,
+    graphResourceName: String
+) = includeDynamic(id, moduleName, graphResourceName) {}
+
+/**
+ * Construct a new [DynamicIncludeGraphNavigator.DynamicIncludeNavGraph].
+ *
+ * @param id NavGraph id.
+ * @param moduleName Dynamic feature module name as defined in the module's `AndroidManifest`.
+ * This must not be an empty string.
+ * @param graphResourceName Graph's resource name without the `navigation` qualifier. This
+ * must not be an empty string.
+ * @param builder Another builder for chaining.
+ */
+inline fun DynamicNavGraphBuilder.includeDynamic(
+    @IdRes id: Int,
+    moduleName: String,
+    graphResourceName: String,
+    builder: DynamicIncludeNavGraphBuilder.() -> Unit
+) = destination(DynamicIncludeNavGraphBuilder(
+    provider[DynamicIncludeGraphNavigator::class],
+    id,
+    moduleName,
+    graphResourceName
+).apply(builder))
+
+/**
+ * DSL for constructing a new [DynamicIncludeGraphNavigator.DynamicIncludeNavGraph]
+ *
+ * @param dynamicIncludeGraphNavigator [DynamicIncludeGraphNavigator] to use.
+ * @param id NavGraph id.
+ * @param moduleName Dynamic feature module name as defined in the module's `AndroidManifest`.
+ * This must not be an empty string.
+ * @param graphResourceName Graph's resource name without the `navigation` qualifier. This
+ * must not be an empty string.
+ */
+@NavDestinationDsl
+class DynamicIncludeNavGraphBuilder(
+    private val dynamicIncludeGraphNavigator: DynamicIncludeGraphNavigator,
+    @IdRes id: Int,
+    private val moduleName: String,
+    private val graphResourceName: String
+) : NavDestinationBuilder<DynamicIncludeNavGraph>(dynamicIncludeGraphNavigator, id) {
+
+    /**
+     * Destination NavGraph's resource package as defined in the module's
+     * `AndroidManifest`. This generally does not need to be manually set and will
+     * be set `applicationId.moduleName` if left null.
+     *
+     * This cannot be an empty string.
+     */
+    var graphPackage: String? = null
+
+    /**
+     * @return The [DynamicGraphNavigator.DynamicNavGraph]
+     */
+    override fun build(): DynamicIncludeNavGraph =
+        super.build().also { navGraph ->
+            check(moduleName.isNotEmpty()) {
+                "Module name cannot be empty"
+            }
+            navGraph.moduleName = moduleName
+            if (graphPackage == null) {
+                navGraph.graphPackage = "${dynamicIncludeGraphNavigator.packageName}.$moduleName"
+            } else {
+                check(!graphPackage.isNullOrEmpty()) {
+                    "Graph package name cannot be empty"
+                }
+                navGraph.graphPackage = graphPackage
+            }
+            check(graphResourceName.isNotEmpty()) {
+                "Graph resource name cannot be empty"
+            }
+            navGraph.graphResourceName = graphResourceName
+        }
+}
diff --git a/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/NavController.kt b/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/NavController.kt
new file mode 100644
index 0000000..bf4ed58
--- /dev/null
+++ b/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/NavController.kt
@@ -0,0 +1,31 @@
+/*
+ * 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.navigation.dynamicfeatures
+
+import androidx.annotation.IdRes
+import androidx.navigation.NavController
+
+/**
+ * Construct a new [androidx.navigation.NavGraph] that supports dynamic navigation destinations
+ */
+inline fun NavController.createGraph(
+    @IdRes id: Int = 0,
+    @IdRes startDestination: Int,
+    moduleName: String? = null,
+    progressDestination: Int = 0,
+    builder: DynamicNavGraphBuilder.() -> Unit
+) = navigatorProvider.navigation(id, startDestination, moduleName, progressDestination, builder)
diff --git a/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/NavHost.kt b/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/NavHost.kt
new file mode 100644
index 0000000..3109cd3
--- /dev/null
+++ b/navigation/navigation-dynamic-features-runtime/src/main/java/androidx/navigation/dynamicfeatures/NavHost.kt
@@ -0,0 +1,33 @@
+/*
+ * 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.navigation.dynamicfeatures
+
+import androidx.annotation.IdRes
+import androidx.navigation.NavGraph
+import androidx.navigation.NavHost
+
+/**
+ * Construct a new [androidx.navigation.NavGraph] that supports dynamic navigation destinations
+ */
+inline fun NavHost.createGraph(
+    @IdRes id: Int = 0,
+    @IdRes startDestination: Int,
+    moduleName: String? = null,
+    progressDestination: Int = 0,
+    builder: DynamicNavGraphBuilder.() -> Unit
+): NavGraph = navController.createGraph(id, startDestination, moduleName, progressDestination,
+    builder)
diff --git a/navigation/navigation-fragment-ktx/api/2.3.0-alpha06.txt b/navigation/navigation-fragment-ktx/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..a09cb97
--- /dev/null
+++ b/navigation/navigation-fragment-ktx/api/2.3.0-alpha06.txt
@@ -0,0 +1,45 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  public final class NavGraphViewModelLazyKt {
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM> navGraphViewModels(androidx.fragment.app.Fragment, @IdRes int navGraphId, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>? factoryProducer = null);
+  }
+
+}
+
+package androidx.navigation.fragment {
+
+  public final class DialogFragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.DialogFragmentNavigator.Destination> {
+    ctor public DialogFragmentNavigatorDestinationBuilder(androidx.navigation.fragment.DialogFragmentNavigator navigator, @IdRes int id, kotlin.reflect.KClass<? extends androidx.fragment.app.DialogFragment> fragmentClass);
+    method public androidx.navigation.fragment.DialogFragmentNavigator.Destination build();
+  }
+
+  public final class DialogFragmentNavigatorDestinationBuilderKt {
+    method public static inline <reified F extends androidx.fragment.app.DialogFragment> void dialog(androidx.navigation.NavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.DialogFragment> void dialog(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.DialogFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class FragmentKt {
+    method public static androidx.navigation.NavController findNavController(androidx.fragment.app.Fragment);
+  }
+
+  public final class FragmentNavArgsLazyKt {
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args> navArgs(androidx.fragment.app.Fragment);
+  }
+
+  public final class FragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.FragmentNavigator.Destination> {
+    ctor public FragmentNavigatorDestinationBuilder(androidx.navigation.fragment.FragmentNavigator navigator, @IdRes int id, kotlin.reflect.KClass<? extends androidx.fragment.app.Fragment> fragmentClass);
+    method public androidx.navigation.fragment.FragmentNavigator.Destination build();
+  }
+
+  public final class FragmentNavigatorDestinationBuilderKt {
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.FragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class FragmentNavigatorExtrasKt {
+    method public static androidx.navigation.fragment.FragmentNavigator.Extras FragmentNavigatorExtras(kotlin.Pair<? extends android.view.View,java.lang.String>... sharedElements);
+  }
+
+}
+
diff --git a/navigation/navigation-fragment-ktx/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-fragment-ktx/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..a09cb97
--- /dev/null
+++ b/navigation/navigation-fragment-ktx/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,45 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  public final class NavGraphViewModelLazyKt {
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM> navGraphViewModels(androidx.fragment.app.Fragment, @IdRes int navGraphId, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>? factoryProducer = null);
+  }
+
+}
+
+package androidx.navigation.fragment {
+
+  public final class DialogFragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.DialogFragmentNavigator.Destination> {
+    ctor public DialogFragmentNavigatorDestinationBuilder(androidx.navigation.fragment.DialogFragmentNavigator navigator, @IdRes int id, kotlin.reflect.KClass<? extends androidx.fragment.app.DialogFragment> fragmentClass);
+    method public androidx.navigation.fragment.DialogFragmentNavigator.Destination build();
+  }
+
+  public final class DialogFragmentNavigatorDestinationBuilderKt {
+    method public static inline <reified F extends androidx.fragment.app.DialogFragment> void dialog(androidx.navigation.NavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.DialogFragment> void dialog(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.DialogFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class FragmentKt {
+    method public static androidx.navigation.NavController findNavController(androidx.fragment.app.Fragment);
+  }
+
+  public final class FragmentNavArgsLazyKt {
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args> navArgs(androidx.fragment.app.Fragment);
+  }
+
+  public final class FragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.FragmentNavigator.Destination> {
+    ctor public FragmentNavigatorDestinationBuilder(androidx.navigation.fragment.FragmentNavigator navigator, @IdRes int id, kotlin.reflect.KClass<? extends androidx.fragment.app.Fragment> fragmentClass);
+    method public androidx.navigation.fragment.FragmentNavigator.Destination build();
+  }
+
+  public final class FragmentNavigatorDestinationBuilderKt {
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.FragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class FragmentNavigatorExtrasKt {
+    method public static androidx.navigation.fragment.FragmentNavigator.Extras FragmentNavigatorExtras(kotlin.Pair<? extends android.view.View,java.lang.String>... sharedElements);
+  }
+
+}
+
diff --git a/navigation/navigation-fragment-ktx/api/res-2.3.0-alpha06.txt b/navigation/navigation-fragment-ktx/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-fragment-ktx/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-fragment-ktx/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-fragment-ktx/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..a09cb97
--- /dev/null
+++ b/navigation/navigation-fragment-ktx/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,45 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  public final class NavGraphViewModelLazyKt {
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM> navGraphViewModels(androidx.fragment.app.Fragment, @IdRes int navGraphId, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>? factoryProducer = null);
+  }
+
+}
+
+package androidx.navigation.fragment {
+
+  public final class DialogFragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.DialogFragmentNavigator.Destination> {
+    ctor public DialogFragmentNavigatorDestinationBuilder(androidx.navigation.fragment.DialogFragmentNavigator navigator, @IdRes int id, kotlin.reflect.KClass<? extends androidx.fragment.app.DialogFragment> fragmentClass);
+    method public androidx.navigation.fragment.DialogFragmentNavigator.Destination build();
+  }
+
+  public final class DialogFragmentNavigatorDestinationBuilderKt {
+    method public static inline <reified F extends androidx.fragment.app.DialogFragment> void dialog(androidx.navigation.NavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.DialogFragment> void dialog(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.DialogFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class FragmentKt {
+    method public static androidx.navigation.NavController findNavController(androidx.fragment.app.Fragment);
+  }
+
+  public final class FragmentNavArgsLazyKt {
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args> navArgs(androidx.fragment.app.Fragment);
+  }
+
+  public final class FragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.FragmentNavigator.Destination> {
+    ctor public FragmentNavigatorDestinationBuilder(androidx.navigation.fragment.FragmentNavigator navigator, @IdRes int id, kotlin.reflect.KClass<? extends androidx.fragment.app.Fragment> fragmentClass);
+    method public androidx.navigation.fragment.FragmentNavigator.Destination build();
+  }
+
+  public final class FragmentNavigatorDestinationBuilderKt {
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.FragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class FragmentNavigatorExtrasKt {
+    method public static androidx.navigation.fragment.FragmentNavigator.Extras FragmentNavigatorExtras(kotlin.Pair<? extends android.view.View,java.lang.String>... sharedElements);
+  }
+
+}
+
diff --git a/navigation/navigation-fragment/api/2.3.0-alpha06.txt b/navigation/navigation-fragment/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..fa67952
--- /dev/null
+++ b/navigation/navigation-fragment/api/2.3.0-alpha06.txt
@@ -0,0 +1,55 @@
+// Signature format: 3.0
+package androidx.navigation.fragment {
+
+  @androidx.navigation.Navigator.Name("dialog") public final class DialogFragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.DialogFragmentNavigator.Destination> {
+    ctor public DialogFragmentNavigator(android.content.Context, androidx.fragment.app.FragmentManager);
+    method public androidx.navigation.fragment.DialogFragmentNavigator.Destination createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.fragment.DialogFragmentNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  @androidx.navigation.NavDestination.ClassType(DialogFragment.class) public static class DialogFragmentNavigator.Destination extends androidx.navigation.NavDestination implements androidx.navigation.FloatingWindow {
+    ctor public DialogFragmentNavigator.Destination(androidx.navigation.NavigatorProvider);
+    ctor public DialogFragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.DialogFragmentNavigator.Destination>);
+    method public final String getClassName();
+    method public final androidx.navigation.fragment.DialogFragmentNavigator.Destination setClassName(String);
+  }
+
+  @androidx.navigation.Navigator.Name("fragment") public class FragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.FragmentNavigator.Destination> {
+    ctor public FragmentNavigator(android.content.Context, androidx.fragment.app.FragmentManager, int);
+    method public androidx.navigation.fragment.FragmentNavigator.Destination createDestination();
+    method @Deprecated public androidx.fragment.app.Fragment instantiateFragment(android.content.Context, androidx.fragment.app.FragmentManager, String, android.os.Bundle?);
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.fragment.FragmentNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  @androidx.navigation.NavDestination.ClassType(Fragment.class) public static class FragmentNavigator.Destination extends androidx.navigation.NavDestination {
+    ctor public FragmentNavigator.Destination(androidx.navigation.NavigatorProvider);
+    ctor public FragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination>);
+    method public final String getClassName();
+    method public final androidx.navigation.fragment.FragmentNavigator.Destination setClassName(String);
+  }
+
+  public static final class FragmentNavigator.Extras implements androidx.navigation.Navigator.Extras {
+    method public java.util.Map<android.view.View!,java.lang.String!> getSharedElements();
+  }
+
+  public static final class FragmentNavigator.Extras.Builder {
+    ctor public FragmentNavigator.Extras.Builder();
+    method public androidx.navigation.fragment.FragmentNavigator.Extras.Builder addSharedElement(android.view.View, String);
+    method public androidx.navigation.fragment.FragmentNavigator.Extras.Builder addSharedElements(java.util.Map<android.view.View!,java.lang.String!>);
+    method public androidx.navigation.fragment.FragmentNavigator.Extras build();
+  }
+
+  public class NavHostFragment extends androidx.fragment.app.Fragment implements androidx.navigation.NavHost {
+    ctor public NavHostFragment();
+    method public static androidx.navigation.fragment.NavHostFragment create(@NavigationRes int);
+    method public static androidx.navigation.fragment.NavHostFragment create(@NavigationRes int, android.os.Bundle?);
+    method @Deprecated protected androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination> createFragmentNavigator();
+    method public static androidx.navigation.NavController findNavController(androidx.fragment.app.Fragment);
+    method public final androidx.navigation.NavController getNavController();
+    method @CallSuper protected void onCreateNavController(androidx.navigation.NavController);
+  }
+
+}
+
diff --git a/navigation/navigation-fragment/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-fragment/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..fa67952
--- /dev/null
+++ b/navigation/navigation-fragment/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,55 @@
+// Signature format: 3.0
+package androidx.navigation.fragment {
+
+  @androidx.navigation.Navigator.Name("dialog") public final class DialogFragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.DialogFragmentNavigator.Destination> {
+    ctor public DialogFragmentNavigator(android.content.Context, androidx.fragment.app.FragmentManager);
+    method public androidx.navigation.fragment.DialogFragmentNavigator.Destination createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.fragment.DialogFragmentNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  @androidx.navigation.NavDestination.ClassType(DialogFragment.class) public static class DialogFragmentNavigator.Destination extends androidx.navigation.NavDestination implements androidx.navigation.FloatingWindow {
+    ctor public DialogFragmentNavigator.Destination(androidx.navigation.NavigatorProvider);
+    ctor public DialogFragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.DialogFragmentNavigator.Destination>);
+    method public final String getClassName();
+    method public final androidx.navigation.fragment.DialogFragmentNavigator.Destination setClassName(String);
+  }
+
+  @androidx.navigation.Navigator.Name("fragment") public class FragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.FragmentNavigator.Destination> {
+    ctor public FragmentNavigator(android.content.Context, androidx.fragment.app.FragmentManager, int);
+    method public androidx.navigation.fragment.FragmentNavigator.Destination createDestination();
+    method @Deprecated public androidx.fragment.app.Fragment instantiateFragment(android.content.Context, androidx.fragment.app.FragmentManager, String, android.os.Bundle?);
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.fragment.FragmentNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  @androidx.navigation.NavDestination.ClassType(Fragment.class) public static class FragmentNavigator.Destination extends androidx.navigation.NavDestination {
+    ctor public FragmentNavigator.Destination(androidx.navigation.NavigatorProvider);
+    ctor public FragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination>);
+    method public final String getClassName();
+    method public final androidx.navigation.fragment.FragmentNavigator.Destination setClassName(String);
+  }
+
+  public static final class FragmentNavigator.Extras implements androidx.navigation.Navigator.Extras {
+    method public java.util.Map<android.view.View!,java.lang.String!> getSharedElements();
+  }
+
+  public static final class FragmentNavigator.Extras.Builder {
+    ctor public FragmentNavigator.Extras.Builder();
+    method public androidx.navigation.fragment.FragmentNavigator.Extras.Builder addSharedElement(android.view.View, String);
+    method public androidx.navigation.fragment.FragmentNavigator.Extras.Builder addSharedElements(java.util.Map<android.view.View!,java.lang.String!>);
+    method public androidx.navigation.fragment.FragmentNavigator.Extras build();
+  }
+
+  public class NavHostFragment extends androidx.fragment.app.Fragment implements androidx.navigation.NavHost {
+    ctor public NavHostFragment();
+    method public static androidx.navigation.fragment.NavHostFragment create(@NavigationRes int);
+    method public static androidx.navigation.fragment.NavHostFragment create(@NavigationRes int, android.os.Bundle?);
+    method @Deprecated protected androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination> createFragmentNavigator();
+    method public static androidx.navigation.NavController findNavController(androidx.fragment.app.Fragment);
+    method public final androidx.navigation.NavController getNavController();
+    method @CallSuper protected void onCreateNavController(androidx.navigation.NavController);
+  }
+
+}
+
diff --git a/navigation/navigation-fragment/api/res-2.3.0-alpha06.txt b/navigation/navigation-fragment/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-fragment/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-fragment/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-fragment/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..fa67952
--- /dev/null
+++ b/navigation/navigation-fragment/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,55 @@
+// Signature format: 3.0
+package androidx.navigation.fragment {
+
+  @androidx.navigation.Navigator.Name("dialog") public final class DialogFragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.DialogFragmentNavigator.Destination> {
+    ctor public DialogFragmentNavigator(android.content.Context, androidx.fragment.app.FragmentManager);
+    method public androidx.navigation.fragment.DialogFragmentNavigator.Destination createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.fragment.DialogFragmentNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  @androidx.navigation.NavDestination.ClassType(DialogFragment.class) public static class DialogFragmentNavigator.Destination extends androidx.navigation.NavDestination implements androidx.navigation.FloatingWindow {
+    ctor public DialogFragmentNavigator.Destination(androidx.navigation.NavigatorProvider);
+    ctor public DialogFragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.DialogFragmentNavigator.Destination>);
+    method public final String getClassName();
+    method public final androidx.navigation.fragment.DialogFragmentNavigator.Destination setClassName(String);
+  }
+
+  @androidx.navigation.Navigator.Name("fragment") public class FragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.FragmentNavigator.Destination> {
+    ctor public FragmentNavigator(android.content.Context, androidx.fragment.app.FragmentManager, int);
+    method public androidx.navigation.fragment.FragmentNavigator.Destination createDestination();
+    method @Deprecated public androidx.fragment.app.Fragment instantiateFragment(android.content.Context, androidx.fragment.app.FragmentManager, String, android.os.Bundle?);
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.fragment.FragmentNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  @androidx.navigation.NavDestination.ClassType(Fragment.class) public static class FragmentNavigator.Destination extends androidx.navigation.NavDestination {
+    ctor public FragmentNavigator.Destination(androidx.navigation.NavigatorProvider);
+    ctor public FragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination>);
+    method public final String getClassName();
+    method public final androidx.navigation.fragment.FragmentNavigator.Destination setClassName(String);
+  }
+
+  public static final class FragmentNavigator.Extras implements androidx.navigation.Navigator.Extras {
+    method public java.util.Map<android.view.View!,java.lang.String!> getSharedElements();
+  }
+
+  public static final class FragmentNavigator.Extras.Builder {
+    ctor public FragmentNavigator.Extras.Builder();
+    method public androidx.navigation.fragment.FragmentNavigator.Extras.Builder addSharedElement(android.view.View, String);
+    method public androidx.navigation.fragment.FragmentNavigator.Extras.Builder addSharedElements(java.util.Map<android.view.View!,java.lang.String!>);
+    method public androidx.navigation.fragment.FragmentNavigator.Extras build();
+  }
+
+  public class NavHostFragment extends androidx.fragment.app.Fragment implements androidx.navigation.NavHost {
+    ctor public NavHostFragment();
+    method public static androidx.navigation.fragment.NavHostFragment create(@NavigationRes int);
+    method public static androidx.navigation.fragment.NavHostFragment create(@NavigationRes int, android.os.Bundle?);
+    method @Deprecated protected androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination> createFragmentNavigator();
+    method public static androidx.navigation.NavController findNavController(androidx.fragment.app.Fragment);
+    method public final androidx.navigation.NavController getNavController();
+    method @CallSuper protected void onCreateNavController(androidx.navigation.NavController);
+  }
+
+}
+
diff --git a/navigation/navigation-runtime-ktx/api/2.3.0-alpha06.txt b/navigation/navigation-runtime-ktx/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..09505f5
--- /dev/null
+++ b/navigation/navigation-runtime-ktx/api/2.3.0-alpha06.txt
@@ -0,0 +1,53 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  public final class ActivityKt {
+    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int viewId);
+  }
+
+  public final class ActivityNavArgsLazyKt {
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args> navArgs(android.app.Activity);
+  }
+
+  public final class ActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
+    ctor public ActivityNavigatorDestinationBuilder(androidx.navigation.ActivityNavigator navigator, @IdRes int id);
+    method public androidx.navigation.ActivityNavigator.Destination build();
+    method public String? getAction();
+    method public kotlin.reflect.KClass<? extends android.app.Activity>? getActivityClass();
+    method public android.net.Uri? getData();
+    method public String? getDataPattern();
+    method public String? getTargetPackage();
+    method public void setAction(String? p);
+    method public void setActivityClass(kotlin.reflect.KClass<? extends android.app.Activity>? p);
+    method public void setData(android.net.Uri? p);
+    method public void setDataPattern(String? p);
+    method public void setTargetPackage(String? p);
+    property public final String? action;
+    property public final kotlin.reflect.KClass<? extends android.app.Activity>? activityClass;
+    property public final android.net.Uri? data;
+    property public final String? dataPattern;
+    property public final String? targetPackage;
+  }
+
+  public final class ActivityNavigatorDestinationBuilderKt {
+    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class ActivityNavigatorExtrasKt {
+    method public static androidx.navigation.ActivityNavigator.Extras ActivityNavigatorExtras(androidx.core.app.ActivityOptionsCompat? activityOptions = null, int flags = 0);
+  }
+
+  public final class NavControllerKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavHostKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class ViewKt {
+    method public static androidx.navigation.NavController findNavController(android.view.View);
+  }
+
+}
+
diff --git a/navigation/navigation-runtime-ktx/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-runtime-ktx/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..09505f5
--- /dev/null
+++ b/navigation/navigation-runtime-ktx/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,53 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  public final class ActivityKt {
+    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int viewId);
+  }
+
+  public final class ActivityNavArgsLazyKt {
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args> navArgs(android.app.Activity);
+  }
+
+  public final class ActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
+    ctor public ActivityNavigatorDestinationBuilder(androidx.navigation.ActivityNavigator navigator, @IdRes int id);
+    method public androidx.navigation.ActivityNavigator.Destination build();
+    method public String? getAction();
+    method public kotlin.reflect.KClass<? extends android.app.Activity>? getActivityClass();
+    method public android.net.Uri? getData();
+    method public String? getDataPattern();
+    method public String? getTargetPackage();
+    method public void setAction(String? p);
+    method public void setActivityClass(kotlin.reflect.KClass<? extends android.app.Activity>? p);
+    method public void setData(android.net.Uri? p);
+    method public void setDataPattern(String? p);
+    method public void setTargetPackage(String? p);
+    property public final String? action;
+    property public final kotlin.reflect.KClass<? extends android.app.Activity>? activityClass;
+    property public final android.net.Uri? data;
+    property public final String? dataPattern;
+    property public final String? targetPackage;
+  }
+
+  public final class ActivityNavigatorDestinationBuilderKt {
+    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class ActivityNavigatorExtrasKt {
+    method public static androidx.navigation.ActivityNavigator.Extras ActivityNavigatorExtras(androidx.core.app.ActivityOptionsCompat? activityOptions = null, int flags = 0);
+  }
+
+  public final class NavControllerKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavHostKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class ViewKt {
+    method public static androidx.navigation.NavController findNavController(android.view.View);
+  }
+
+}
+
diff --git a/navigation/navigation-runtime-ktx/api/res-2.3.0-alpha06.txt b/navigation/navigation-runtime-ktx/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-runtime-ktx/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-runtime-ktx/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-runtime-ktx/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..09505f5
--- /dev/null
+++ b/navigation/navigation-runtime-ktx/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,53 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  public final class ActivityKt {
+    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int viewId);
+  }
+
+  public final class ActivityNavArgsLazyKt {
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args> navArgs(android.app.Activity);
+  }
+
+  public final class ActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
+    ctor public ActivityNavigatorDestinationBuilder(androidx.navigation.ActivityNavigator navigator, @IdRes int id);
+    method public androidx.navigation.ActivityNavigator.Destination build();
+    method public String? getAction();
+    method public kotlin.reflect.KClass<? extends android.app.Activity>? getActivityClass();
+    method public android.net.Uri? getData();
+    method public String? getDataPattern();
+    method public String? getTargetPackage();
+    method public void setAction(String? p);
+    method public void setActivityClass(kotlin.reflect.KClass<? extends android.app.Activity>? p);
+    method public void setData(android.net.Uri? p);
+    method public void setDataPattern(String? p);
+    method public void setTargetPackage(String? p);
+    property public final String? action;
+    property public final kotlin.reflect.KClass<? extends android.app.Activity>? activityClass;
+    property public final android.net.Uri? data;
+    property public final String? dataPattern;
+    property public final String? targetPackage;
+  }
+
+  public final class ActivityNavigatorDestinationBuilderKt {
+    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class ActivityNavigatorExtrasKt {
+    method public static androidx.navigation.ActivityNavigator.Extras ActivityNavigatorExtras(androidx.core.app.ActivityOptionsCompat? activityOptions = null, int flags = 0);
+  }
+
+  public final class NavControllerKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class NavHostKt {
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+  }
+
+  public final class ViewKt {
+    method public static androidx.navigation.NavController findNavController(android.view.View);
+  }
+
+}
+
diff --git a/navigation/navigation-runtime/api/2.3.0-alpha06.txt b/navigation/navigation-runtime/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..c816b05
--- /dev/null
+++ b/navigation/navigation-runtime/api/2.3.0-alpha06.txt
@@ -0,0 +1,133 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
+    ctor public ActivityNavigator(android.content.Context);
+    method public static void applyPopAnimationsToPendingTransition(android.app.Activity);
+    method public androidx.navigation.ActivityNavigator.Destination createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.ActivityNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  @androidx.navigation.NavDestination.ClassType(Activity.class) public static class ActivityNavigator.Destination extends androidx.navigation.NavDestination {
+    ctor public ActivityNavigator.Destination(androidx.navigation.NavigatorProvider);
+    ctor public ActivityNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.ActivityNavigator.Destination>);
+    method public final String? getAction();
+    method public final android.content.ComponentName? getComponent();
+    method public final android.net.Uri? getData();
+    method public final String? getDataPattern();
+    method public final android.content.Intent? getIntent();
+    method public final String? getTargetPackage();
+    method public final androidx.navigation.ActivityNavigator.Destination setAction(String?);
+    method public final androidx.navigation.ActivityNavigator.Destination setComponentName(android.content.ComponentName?);
+    method public final androidx.navigation.ActivityNavigator.Destination setData(android.net.Uri?);
+    method public final androidx.navigation.ActivityNavigator.Destination setDataPattern(String?);
+    method public final androidx.navigation.ActivityNavigator.Destination setIntent(android.content.Intent?);
+    method public final androidx.navigation.ActivityNavigator.Destination setTargetPackage(String?);
+  }
+
+  public static final class ActivityNavigator.Extras implements androidx.navigation.Navigator.Extras {
+    method public androidx.core.app.ActivityOptionsCompat? getActivityOptions();
+    method public int getFlags();
+  }
+
+  public static final class ActivityNavigator.Extras.Builder {
+    ctor public ActivityNavigator.Extras.Builder();
+    method public androidx.navigation.ActivityNavigator.Extras.Builder addFlags(int);
+    method public androidx.navigation.ActivityNavigator.Extras build();
+    method public androidx.navigation.ActivityNavigator.Extras.Builder setActivityOptions(androidx.core.app.ActivityOptionsCompat);
+  }
+
+  public final class NavBackStackEntry implements androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+    method public android.os.Bundle? getArguments();
+    method public androidx.lifecycle.ViewModelProvider.Factory getDefaultViewModelProviderFactory();
+    method public androidx.navigation.NavDestination getDestination();
+    method public androidx.lifecycle.Lifecycle getLifecycle();
+    method public androidx.lifecycle.SavedStateHandle getSavedStateHandle();
+    method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
+    method public androidx.lifecycle.ViewModelStore getViewModelStore();
+  }
+
+  public class NavController {
+    ctor public NavController(android.content.Context);
+    method public void addOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener);
+    method public androidx.navigation.NavDeepLinkBuilder createDeepLink();
+    method public androidx.navigation.NavBackStackEntry getBackStackEntry(@IdRes int);
+    method public androidx.navigation.NavBackStackEntry? getCurrentBackStackEntry();
+    method public androidx.navigation.NavDestination? getCurrentDestination();
+    method public androidx.navigation.NavGraph getGraph();
+    method public androidx.navigation.NavInflater getNavInflater();
+    method public androidx.navigation.NavigatorProvider getNavigatorProvider();
+    method public androidx.navigation.NavBackStackEntry? getPreviousBackStackEntry();
+    method public androidx.lifecycle.ViewModelStoreOwner getViewModelStoreOwner(@IdRes int);
+    method public boolean handleDeepLink(android.content.Intent?);
+    method public void navigate(@IdRes int);
+    method public void navigate(@IdRes int, android.os.Bundle?);
+    method public void navigate(@IdRes int, android.os.Bundle?, androidx.navigation.NavOptions?);
+    method public void navigate(@IdRes int, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void navigate(android.net.Uri);
+    method public void navigate(android.net.Uri, androidx.navigation.NavOptions?);
+    method public void navigate(android.net.Uri, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void navigate(androidx.navigation.NavDeepLinkRequest);
+    method public void navigate(androidx.navigation.NavDeepLinkRequest, androidx.navigation.NavOptions?);
+    method public void navigate(androidx.navigation.NavDeepLinkRequest, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void navigate(androidx.navigation.NavDirections);
+    method public void navigate(androidx.navigation.NavDirections, androidx.navigation.NavOptions?);
+    method public void navigate(androidx.navigation.NavDirections, androidx.navigation.Navigator.Extras);
+    method public boolean navigateUp();
+    method public boolean popBackStack();
+    method public boolean popBackStack(@IdRes int, boolean);
+    method public void removeOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener);
+    method @CallSuper public void restoreState(android.os.Bundle?);
+    method @CallSuper public android.os.Bundle? saveState();
+    method @CallSuper public void setGraph(@NavigationRes int);
+    method @CallSuper public void setGraph(@NavigationRes int, android.os.Bundle?);
+    method @CallSuper public void setGraph(androidx.navigation.NavGraph);
+    method @CallSuper public void setGraph(androidx.navigation.NavGraph, android.os.Bundle?);
+    field public static final String KEY_DEEP_LINK_INTENT = "android-support-nav:controller:deepLinkIntent";
+  }
+
+  public static interface NavController.OnDestinationChangedListener {
+    method public void onDestinationChanged(androidx.navigation.NavController, androidx.navigation.NavDestination, android.os.Bundle?);
+  }
+
+  public final class NavDeepLinkBuilder {
+    ctor public NavDeepLinkBuilder(android.content.Context);
+    method public android.app.PendingIntent createPendingIntent();
+    method public androidx.core.app.TaskStackBuilder createTaskStackBuilder();
+    method public androidx.navigation.NavDeepLinkBuilder setArguments(android.os.Bundle?);
+    method public androidx.navigation.NavDeepLinkBuilder setComponentName(Class<? extends android.app.Activity>);
+    method public androidx.navigation.NavDeepLinkBuilder setComponentName(android.content.ComponentName);
+    method public androidx.navigation.NavDeepLinkBuilder setDestination(@IdRes int);
+    method public androidx.navigation.NavDeepLinkBuilder setGraph(@NavigationRes int);
+    method public androidx.navigation.NavDeepLinkBuilder setGraph(androidx.navigation.NavGraph);
+  }
+
+  public interface NavHost {
+    method public androidx.navigation.NavController getNavController();
+  }
+
+  public class NavHostController extends androidx.navigation.NavController {
+    ctor public NavHostController(android.content.Context);
+    method public final void enableOnBackPressed(boolean);
+    method public final void setLifecycleOwner(androidx.lifecycle.LifecycleOwner);
+    method public final void setOnBackPressedDispatcher(androidx.activity.OnBackPressedDispatcher);
+    method public final void setViewModelStore(androidx.lifecycle.ViewModelStore);
+  }
+
+  public final class NavInflater {
+    ctor public NavInflater(android.content.Context, androidx.navigation.NavigatorProvider);
+    method public androidx.navigation.NavGraph inflate(@NavigationRes int);
+  }
+
+  public final class Navigation {
+    method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int);
+    method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int, android.os.Bundle?);
+    method public static android.view.View.OnClickListener createNavigateOnClickListener(androidx.navigation.NavDirections);
+    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int);
+    method public static androidx.navigation.NavController findNavController(android.view.View);
+    method public static void setViewNavController(android.view.View, androidx.navigation.NavController?);
+  }
+
+}
+
diff --git a/navigation/navigation-runtime/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-runtime/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..c816b05
--- /dev/null
+++ b/navigation/navigation-runtime/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,133 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
+    ctor public ActivityNavigator(android.content.Context);
+    method public static void applyPopAnimationsToPendingTransition(android.app.Activity);
+    method public androidx.navigation.ActivityNavigator.Destination createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.ActivityNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  @androidx.navigation.NavDestination.ClassType(Activity.class) public static class ActivityNavigator.Destination extends androidx.navigation.NavDestination {
+    ctor public ActivityNavigator.Destination(androidx.navigation.NavigatorProvider);
+    ctor public ActivityNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.ActivityNavigator.Destination>);
+    method public final String? getAction();
+    method public final android.content.ComponentName? getComponent();
+    method public final android.net.Uri? getData();
+    method public final String? getDataPattern();
+    method public final android.content.Intent? getIntent();
+    method public final String? getTargetPackage();
+    method public final androidx.navigation.ActivityNavigator.Destination setAction(String?);
+    method public final androidx.navigation.ActivityNavigator.Destination setComponentName(android.content.ComponentName?);
+    method public final androidx.navigation.ActivityNavigator.Destination setData(android.net.Uri?);
+    method public final androidx.navigation.ActivityNavigator.Destination setDataPattern(String?);
+    method public final androidx.navigation.ActivityNavigator.Destination setIntent(android.content.Intent?);
+    method public final androidx.navigation.ActivityNavigator.Destination setTargetPackage(String?);
+  }
+
+  public static final class ActivityNavigator.Extras implements androidx.navigation.Navigator.Extras {
+    method public androidx.core.app.ActivityOptionsCompat? getActivityOptions();
+    method public int getFlags();
+  }
+
+  public static final class ActivityNavigator.Extras.Builder {
+    ctor public ActivityNavigator.Extras.Builder();
+    method public androidx.navigation.ActivityNavigator.Extras.Builder addFlags(int);
+    method public androidx.navigation.ActivityNavigator.Extras build();
+    method public androidx.navigation.ActivityNavigator.Extras.Builder setActivityOptions(androidx.core.app.ActivityOptionsCompat);
+  }
+
+  public final class NavBackStackEntry implements androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+    method public android.os.Bundle? getArguments();
+    method public androidx.lifecycle.ViewModelProvider.Factory getDefaultViewModelProviderFactory();
+    method public androidx.navigation.NavDestination getDestination();
+    method public androidx.lifecycle.Lifecycle getLifecycle();
+    method public androidx.lifecycle.SavedStateHandle getSavedStateHandle();
+    method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
+    method public androidx.lifecycle.ViewModelStore getViewModelStore();
+  }
+
+  public class NavController {
+    ctor public NavController(android.content.Context);
+    method public void addOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener);
+    method public androidx.navigation.NavDeepLinkBuilder createDeepLink();
+    method public androidx.navigation.NavBackStackEntry getBackStackEntry(@IdRes int);
+    method public androidx.navigation.NavBackStackEntry? getCurrentBackStackEntry();
+    method public androidx.navigation.NavDestination? getCurrentDestination();
+    method public androidx.navigation.NavGraph getGraph();
+    method public androidx.navigation.NavInflater getNavInflater();
+    method public androidx.navigation.NavigatorProvider getNavigatorProvider();
+    method public androidx.navigation.NavBackStackEntry? getPreviousBackStackEntry();
+    method public androidx.lifecycle.ViewModelStoreOwner getViewModelStoreOwner(@IdRes int);
+    method public boolean handleDeepLink(android.content.Intent?);
+    method public void navigate(@IdRes int);
+    method public void navigate(@IdRes int, android.os.Bundle?);
+    method public void navigate(@IdRes int, android.os.Bundle?, androidx.navigation.NavOptions?);
+    method public void navigate(@IdRes int, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void navigate(android.net.Uri);
+    method public void navigate(android.net.Uri, androidx.navigation.NavOptions?);
+    method public void navigate(android.net.Uri, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void navigate(androidx.navigation.NavDeepLinkRequest);
+    method public void navigate(androidx.navigation.NavDeepLinkRequest, androidx.navigation.NavOptions?);
+    method public void navigate(androidx.navigation.NavDeepLinkRequest, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void navigate(androidx.navigation.NavDirections);
+    method public void navigate(androidx.navigation.NavDirections, androidx.navigation.NavOptions?);
+    method public void navigate(androidx.navigation.NavDirections, androidx.navigation.Navigator.Extras);
+    method public boolean navigateUp();
+    method public boolean popBackStack();
+    method public boolean popBackStack(@IdRes int, boolean);
+    method public void removeOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener);
+    method @CallSuper public void restoreState(android.os.Bundle?);
+    method @CallSuper public android.os.Bundle? saveState();
+    method @CallSuper public void setGraph(@NavigationRes int);
+    method @CallSuper public void setGraph(@NavigationRes int, android.os.Bundle?);
+    method @CallSuper public void setGraph(androidx.navigation.NavGraph);
+    method @CallSuper public void setGraph(androidx.navigation.NavGraph, android.os.Bundle?);
+    field public static final String KEY_DEEP_LINK_INTENT = "android-support-nav:controller:deepLinkIntent";
+  }
+
+  public static interface NavController.OnDestinationChangedListener {
+    method public void onDestinationChanged(androidx.navigation.NavController, androidx.navigation.NavDestination, android.os.Bundle?);
+  }
+
+  public final class NavDeepLinkBuilder {
+    ctor public NavDeepLinkBuilder(android.content.Context);
+    method public android.app.PendingIntent createPendingIntent();
+    method public androidx.core.app.TaskStackBuilder createTaskStackBuilder();
+    method public androidx.navigation.NavDeepLinkBuilder setArguments(android.os.Bundle?);
+    method public androidx.navigation.NavDeepLinkBuilder setComponentName(Class<? extends android.app.Activity>);
+    method public androidx.navigation.NavDeepLinkBuilder setComponentName(android.content.ComponentName);
+    method public androidx.navigation.NavDeepLinkBuilder setDestination(@IdRes int);
+    method public androidx.navigation.NavDeepLinkBuilder setGraph(@NavigationRes int);
+    method public androidx.navigation.NavDeepLinkBuilder setGraph(androidx.navigation.NavGraph);
+  }
+
+  public interface NavHost {
+    method public androidx.navigation.NavController getNavController();
+  }
+
+  public class NavHostController extends androidx.navigation.NavController {
+    ctor public NavHostController(android.content.Context);
+    method public final void enableOnBackPressed(boolean);
+    method public final void setLifecycleOwner(androidx.lifecycle.LifecycleOwner);
+    method public final void setOnBackPressedDispatcher(androidx.activity.OnBackPressedDispatcher);
+    method public final void setViewModelStore(androidx.lifecycle.ViewModelStore);
+  }
+
+  public final class NavInflater {
+    ctor public NavInflater(android.content.Context, androidx.navigation.NavigatorProvider);
+    method public androidx.navigation.NavGraph inflate(@NavigationRes int);
+  }
+
+  public final class Navigation {
+    method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int);
+    method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int, android.os.Bundle?);
+    method public static android.view.View.OnClickListener createNavigateOnClickListener(androidx.navigation.NavDirections);
+    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int);
+    method public static androidx.navigation.NavController findNavController(android.view.View);
+    method public static void setViewNavController(android.view.View, androidx.navigation.NavController?);
+  }
+
+}
+
diff --git a/navigation/navigation-runtime/api/res-2.3.0-alpha06.txt b/navigation/navigation-runtime/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-runtime/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-runtime/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-runtime/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..c816b05
--- /dev/null
+++ b/navigation/navigation-runtime/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,133 @@
+// Signature format: 3.0
+package androidx.navigation {
+
+  @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
+    ctor public ActivityNavigator(android.content.Context);
+    method public static void applyPopAnimationsToPendingTransition(android.app.Activity);
+    method public androidx.navigation.ActivityNavigator.Destination createDestination();
+    method public androidx.navigation.NavDestination? navigate(androidx.navigation.ActivityNavigator.Destination, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public boolean popBackStack();
+  }
+
+  @androidx.navigation.NavDestination.ClassType(Activity.class) public static class ActivityNavigator.Destination extends androidx.navigation.NavDestination {
+    ctor public ActivityNavigator.Destination(androidx.navigation.NavigatorProvider);
+    ctor public ActivityNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.ActivityNavigator.Destination>);
+    method public final String? getAction();
+    method public final android.content.ComponentName? getComponent();
+    method public final android.net.Uri? getData();
+    method public final String? getDataPattern();
+    method public final android.content.Intent? getIntent();
+    method public final String? getTargetPackage();
+    method public final androidx.navigation.ActivityNavigator.Destination setAction(String?);
+    method public final androidx.navigation.ActivityNavigator.Destination setComponentName(android.content.ComponentName?);
+    method public final androidx.navigation.ActivityNavigator.Destination setData(android.net.Uri?);
+    method public final androidx.navigation.ActivityNavigator.Destination setDataPattern(String?);
+    method public final androidx.navigation.ActivityNavigator.Destination setIntent(android.content.Intent?);
+    method public final androidx.navigation.ActivityNavigator.Destination setTargetPackage(String?);
+  }
+
+  public static final class ActivityNavigator.Extras implements androidx.navigation.Navigator.Extras {
+    method public androidx.core.app.ActivityOptionsCompat? getActivityOptions();
+    method public int getFlags();
+  }
+
+  public static final class ActivityNavigator.Extras.Builder {
+    ctor public ActivityNavigator.Extras.Builder();
+    method public androidx.navigation.ActivityNavigator.Extras.Builder addFlags(int);
+    method public androidx.navigation.ActivityNavigator.Extras build();
+    method public androidx.navigation.ActivityNavigator.Extras.Builder setActivityOptions(androidx.core.app.ActivityOptionsCompat);
+  }
+
+  public final class NavBackStackEntry implements androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
+    method public android.os.Bundle? getArguments();
+    method public androidx.lifecycle.ViewModelProvider.Factory getDefaultViewModelProviderFactory();
+    method public androidx.navigation.NavDestination getDestination();
+    method public androidx.lifecycle.Lifecycle getLifecycle();
+    method public androidx.lifecycle.SavedStateHandle getSavedStateHandle();
+    method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
+    method public androidx.lifecycle.ViewModelStore getViewModelStore();
+  }
+
+  public class NavController {
+    ctor public NavController(android.content.Context);
+    method public void addOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener);
+    method public androidx.navigation.NavDeepLinkBuilder createDeepLink();
+    method public androidx.navigation.NavBackStackEntry getBackStackEntry(@IdRes int);
+    method public androidx.navigation.NavBackStackEntry? getCurrentBackStackEntry();
+    method public androidx.navigation.NavDestination? getCurrentDestination();
+    method public androidx.navigation.NavGraph getGraph();
+    method public androidx.navigation.NavInflater getNavInflater();
+    method public androidx.navigation.NavigatorProvider getNavigatorProvider();
+    method public androidx.navigation.NavBackStackEntry? getPreviousBackStackEntry();
+    method public androidx.lifecycle.ViewModelStoreOwner getViewModelStoreOwner(@IdRes int);
+    method public boolean handleDeepLink(android.content.Intent?);
+    method public void navigate(@IdRes int);
+    method public void navigate(@IdRes int, android.os.Bundle?);
+    method public void navigate(@IdRes int, android.os.Bundle?, androidx.navigation.NavOptions?);
+    method public void navigate(@IdRes int, android.os.Bundle?, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void navigate(android.net.Uri);
+    method public void navigate(android.net.Uri, androidx.navigation.NavOptions?);
+    method public void navigate(android.net.Uri, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void navigate(androidx.navigation.NavDeepLinkRequest);
+    method public void navigate(androidx.navigation.NavDeepLinkRequest, androidx.navigation.NavOptions?);
+    method public void navigate(androidx.navigation.NavDeepLinkRequest, androidx.navigation.NavOptions?, androidx.navigation.Navigator.Extras?);
+    method public void navigate(androidx.navigation.NavDirections);
+    method public void navigate(androidx.navigation.NavDirections, androidx.navigation.NavOptions?);
+    method public void navigate(androidx.navigation.NavDirections, androidx.navigation.Navigator.Extras);
+    method public boolean navigateUp();
+    method public boolean popBackStack();
+    method public boolean popBackStack(@IdRes int, boolean);
+    method public void removeOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener);
+    method @CallSuper public void restoreState(android.os.Bundle?);
+    method @CallSuper public android.os.Bundle? saveState();
+    method @CallSuper public void setGraph(@NavigationRes int);
+    method @CallSuper public void setGraph(@NavigationRes int, android.os.Bundle?);
+    method @CallSuper public void setGraph(androidx.navigation.NavGraph);
+    method @CallSuper public void setGraph(androidx.navigation.NavGraph, android.os.Bundle?);
+    field public static final String KEY_DEEP_LINK_INTENT = "android-support-nav:controller:deepLinkIntent";
+  }
+
+  public static interface NavController.OnDestinationChangedListener {
+    method public void onDestinationChanged(androidx.navigation.NavController, androidx.navigation.NavDestination, android.os.Bundle?);
+  }
+
+  public final class NavDeepLinkBuilder {
+    ctor public NavDeepLinkBuilder(android.content.Context);
+    method public android.app.PendingIntent createPendingIntent();
+    method public androidx.core.app.TaskStackBuilder createTaskStackBuilder();
+    method public androidx.navigation.NavDeepLinkBuilder setArguments(android.os.Bundle?);
+    method public androidx.navigation.NavDeepLinkBuilder setComponentName(Class<? extends android.app.Activity>);
+    method public androidx.navigation.NavDeepLinkBuilder setComponentName(android.content.ComponentName);
+    method public androidx.navigation.NavDeepLinkBuilder setDestination(@IdRes int);
+    method public androidx.navigation.NavDeepLinkBuilder setGraph(@NavigationRes int);
+    method public androidx.navigation.NavDeepLinkBuilder setGraph(androidx.navigation.NavGraph);
+  }
+
+  public interface NavHost {
+    method public androidx.navigation.NavController getNavController();
+  }
+
+  public class NavHostController extends androidx.navigation.NavController {
+    ctor public NavHostController(android.content.Context);
+    method public final void enableOnBackPressed(boolean);
+    method public final void setLifecycleOwner(androidx.lifecycle.LifecycleOwner);
+    method public final void setOnBackPressedDispatcher(androidx.activity.OnBackPressedDispatcher);
+    method public final void setViewModelStore(androidx.lifecycle.ViewModelStore);
+  }
+
+  public final class NavInflater {
+    ctor public NavInflater(android.content.Context, androidx.navigation.NavigatorProvider);
+    method public androidx.navigation.NavGraph inflate(@NavigationRes int);
+  }
+
+  public final class Navigation {
+    method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int);
+    method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int, android.os.Bundle?);
+    method public static android.view.View.OnClickListener createNavigateOnClickListener(androidx.navigation.NavDirections);
+    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int);
+    method public static androidx.navigation.NavController findNavController(android.view.View);
+    method public static void setViewNavController(android.view.View, androidx.navigation.NavController?);
+  }
+
+}
+
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 f7dd01a..de448ce 100644
--- a/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerTest.kt
+++ b/navigation/navigation-runtime/src/androidTest/java/androidx/navigation/NavControllerTest.kt
@@ -1045,6 +1045,41 @@
     }
 
     @Test
+    fun testHandleDeepLinkNestedStartDestination() {
+        val navController = createNavController()
+        navController.setGraph(R.navigation.nav_nested_start_destination)
+        val onDestinationChangedListener =
+            mock(NavController.OnDestinationChangedListener::class.java)
+        navController.addOnDestinationChangedListener(onDestinationChangedListener)
+        val startDestination = navController.findDestination(R.id.nested_test)
+        verify(onDestinationChangedListener).onDestinationChanged(
+            eq(navController),
+            eq(startDestination),
+            any())
+
+        val taskStackBuilder = navController.createDeepLink()
+            .setDestination(R.id.second_test)
+            .createTaskStackBuilder()
+
+        val intent = taskStackBuilder.editIntentAt(0)
+        assertNotNull(intent)
+        assertWithMessage("NavController should handle deep links to its own graph")
+            .that(navController.handleDeepLink(intent))
+            .isTrue()
+
+        // Verify that we navigated down to the deep link
+        verify(onDestinationChangedListener, times(2)).onDestinationChanged(
+            eq(navController),
+            eq(startDestination),
+            any())
+        verify(onDestinationChangedListener).onDestinationChanged(
+            eq(navController),
+            eq(navController.findDestination(R.id.second_test)),
+            any())
+        verifyNoMoreInteractions(onDestinationChangedListener)
+    }
+
+    @Test
     fun testHandleDeepLinkInvalid() {
         val navController = createNavController()
         navController.setGraph(R.navigation.nav_simple)
diff --git a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.java b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.java
index 96b0b0f..ec324d2 100644
--- a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.java
+++ b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavController.java
@@ -758,7 +758,7 @@
             int destinationId = deepLink[i];
             NavDestination node = i == 0
                     ? (mGraph.getId() == destinationId ? mGraph : null)
-                    : graph.findNode(destinationId, false);
+                    : graph.findNode(destinationId);
             if (node == null) {
                 return NavDestination.getDisplayName(mContext, destinationId);
             }
diff --git a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavInflater.java b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavInflater.java
index 7dd823e..f55cf55 100644
--- a/navigation/navigation-runtime/src/main/java/androidx/navigation/NavInflater.java
+++ b/navigation/navigation-runtime/src/main/java/androidx/navigation/NavInflater.java
@@ -286,7 +286,7 @@
         }
         NavDeepLink.Builder builder = new NavDeepLink.Builder();
         if (uri != null) {
-            builder.setUri(uri.replace(APPLICATION_ID_PLACEHOLDER,
+            builder.setUriPattern(uri.replace(APPLICATION_ID_PLACEHOLDER,
                     mContext.getPackageName()));
         }
         if (!TextUtils.isEmpty(action)) {
diff --git a/navigation/navigation-testing/api/2.3.0-alpha06.txt b/navigation/navigation-testing/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..be673f0
--- /dev/null
+++ b/navigation/navigation-testing/api/2.3.0-alpha06.txt
@@ -0,0 +1,13 @@
+// Signature format: 3.0
+package androidx.navigation.testing {
+
+  public final class TestNavHostController extends androidx.navigation.NavHostController {
+    ctor public TestNavHostController(android.content.Context context);
+    method public java.util.List<androidx.navigation.NavBackStackEntry> getBackStack();
+    method public void setCurrentDestination(@IdRes int destId, android.os.Bundle args = android.os.Bundle());
+    method public void setCurrentDestination(@IdRes int destId);
+    property public final java.util.List<androidx.navigation.NavBackStackEntry> backStack;
+  }
+
+}
+
diff --git a/navigation/navigation-testing/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-testing/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..be673f0
--- /dev/null
+++ b/navigation/navigation-testing/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,13 @@
+// Signature format: 3.0
+package androidx.navigation.testing {
+
+  public final class TestNavHostController extends androidx.navigation.NavHostController {
+    ctor public TestNavHostController(android.content.Context context);
+    method public java.util.List<androidx.navigation.NavBackStackEntry> getBackStack();
+    method public void setCurrentDestination(@IdRes int destId, android.os.Bundle args = android.os.Bundle());
+    method public void setCurrentDestination(@IdRes int destId);
+    property public final java.util.List<androidx.navigation.NavBackStackEntry> backStack;
+  }
+
+}
+
diff --git a/navigation/navigation-testing/api/res-2.3.0-alpha06.txt b/navigation/navigation-testing/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-testing/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-testing/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-testing/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..be673f0
--- /dev/null
+++ b/navigation/navigation-testing/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,13 @@
+// Signature format: 3.0
+package androidx.navigation.testing {
+
+  public final class TestNavHostController extends androidx.navigation.NavHostController {
+    ctor public TestNavHostController(android.content.Context context);
+    method public java.util.List<androidx.navigation.NavBackStackEntry> getBackStack();
+    method public void setCurrentDestination(@IdRes int destId, android.os.Bundle args = android.os.Bundle());
+    method public void setCurrentDestination(@IdRes int destId);
+    property public final java.util.List<androidx.navigation.NavBackStackEntry> backStack;
+  }
+
+}
+
diff --git a/navigation/navigation-ui-ktx/api/2.3.0-alpha06.ignore b/navigation/navigation-ui-ktx/api/2.3.0-alpha06.ignore
new file mode 100644
index 0000000..657afee
--- /dev/null
+++ b/navigation/navigation-ui-ktx/api/2.3.0-alpha06.ignore
@@ -0,0 +1,9 @@
+// Baseline format: 1.0
+RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
+    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
+RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
+    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
+RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
+    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
+RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
+    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/2.3.0-alpha06.txt b/navigation/navigation-ui-ktx/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..168f63e
--- /dev/null
+++ b/navigation/navigation-ui-ktx/api/2.3.0-alpha06.txt
@@ -0,0 +1,43 @@
+// Signature format: 3.0
+package androidx.navigation.ui {
+
+  public final class ActivityKt {
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController navController, androidx.drawerlayout.widget.DrawerLayout? drawerLayout);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController navController, androidx.navigation.ui.AppBarConfiguration configuration = AppBarConfiguration(navController.graph));
+  }
+
+  public final class AppBarConfigurationKt {
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(androidx.navigation.NavGraph navGraph, androidx.customview.widget.Openable? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(android.view.Menu topLevelMenu, androidx.customview.widget.Openable? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(java.util.Set<java.lang.Integer> topLevelDestinationIds, androidx.customview.widget.Openable? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+  }
+
+  public final class BottomNavigationViewKt {
+    method public static void setupWithNavController(com.google.android.material.bottomnavigation.BottomNavigationView, androidx.navigation.NavController navController);
+  }
+
+  public final class CollapsingToolbarLayoutKt {
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar toolbar, androidx.navigation.NavController navController, androidx.drawerlayout.widget.DrawerLayout? drawerLayout);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar toolbar, androidx.navigation.NavController navController, androidx.navigation.ui.AppBarConfiguration configuration = AppBarConfiguration(navController.graph));
+  }
+
+  public final class MenuItemKt {
+    method public static boolean onNavDestinationSelected(android.view.MenuItem, androidx.navigation.NavController navController);
+  }
+
+  public final class NavControllerKt {
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.customview.widget.Openable? drawerLayout);
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration appBarConfiguration);
+  }
+
+  public final class NavigationViewKt {
+    method public static void setupWithNavController(com.google.android.material.navigation.NavigationView, androidx.navigation.NavController navController);
+  }
+
+  public final class ToolbarKt {
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController navController, androidx.drawerlayout.widget.DrawerLayout? drawerLayout);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController navController, androidx.navigation.ui.AppBarConfiguration configuration = AppBarConfiguration(navController.graph));
+  }
+
+}
+
diff --git a/navigation/navigation-ui-ktx/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-ui-ktx/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..168f63e
--- /dev/null
+++ b/navigation/navigation-ui-ktx/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,43 @@
+// Signature format: 3.0
+package androidx.navigation.ui {
+
+  public final class ActivityKt {
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController navController, androidx.drawerlayout.widget.DrawerLayout? drawerLayout);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController navController, androidx.navigation.ui.AppBarConfiguration configuration = AppBarConfiguration(navController.graph));
+  }
+
+  public final class AppBarConfigurationKt {
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(androidx.navigation.NavGraph navGraph, androidx.customview.widget.Openable? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(android.view.Menu topLevelMenu, androidx.customview.widget.Openable? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(java.util.Set<java.lang.Integer> topLevelDestinationIds, androidx.customview.widget.Openable? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+  }
+
+  public final class BottomNavigationViewKt {
+    method public static void setupWithNavController(com.google.android.material.bottomnavigation.BottomNavigationView, androidx.navigation.NavController navController);
+  }
+
+  public final class CollapsingToolbarLayoutKt {
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar toolbar, androidx.navigation.NavController navController, androidx.drawerlayout.widget.DrawerLayout? drawerLayout);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar toolbar, androidx.navigation.NavController navController, androidx.navigation.ui.AppBarConfiguration configuration = AppBarConfiguration(navController.graph));
+  }
+
+  public final class MenuItemKt {
+    method public static boolean onNavDestinationSelected(android.view.MenuItem, androidx.navigation.NavController navController);
+  }
+
+  public final class NavControllerKt {
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.customview.widget.Openable? drawerLayout);
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration appBarConfiguration);
+  }
+
+  public final class NavigationViewKt {
+    method public static void setupWithNavController(com.google.android.material.navigation.NavigationView, androidx.navigation.NavController navController);
+  }
+
+  public final class ToolbarKt {
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController navController, androidx.drawerlayout.widget.DrawerLayout? drawerLayout);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController navController, androidx.navigation.ui.AppBarConfiguration configuration = AppBarConfiguration(navController.graph));
+  }
+
+}
+
diff --git a/navigation/navigation-ui-ktx/api/res-2.3.0-alpha06.txt b/navigation/navigation-ui-ktx/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-ui-ktx/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha06.ignore b/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha06.ignore
new file mode 100644
index 0000000..657afee
--- /dev/null
+++ b/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha06.ignore
@@ -0,0 +1,9 @@
+// Baseline format: 1.0
+RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(android.view.Menu, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
+    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(android.view.Menu,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
+RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(androidx.navigation.NavGraph, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
+    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(androidx.navigation.NavGraph,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
+RemovedMethod: androidx.navigation.ui.AppBarConfigurationKt#AppBarConfiguration(java.util.Set<java.lang.Integer>, androidx.drawerlayout.widget.DrawerLayout, kotlin.jvm.functions.Function0<java.lang.Boolean>):
+    Removed method androidx.navigation.ui.AppBarConfigurationKt.AppBarConfiguration(java.util.Set<java.lang.Integer>,androidx.drawerlayout.widget.DrawerLayout,kotlin.jvm.functions.Function0<java.lang.Boolean>)
+RemovedMethod: androidx.navigation.ui.NavControllerKt#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
+    Removed method androidx.navigation.ui.NavControllerKt.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..168f63e
--- /dev/null
+++ b/navigation/navigation-ui-ktx/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,43 @@
+// Signature format: 3.0
+package androidx.navigation.ui {
+
+  public final class ActivityKt {
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController navController, androidx.drawerlayout.widget.DrawerLayout? drawerLayout);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController navController, androidx.navigation.ui.AppBarConfiguration configuration = AppBarConfiguration(navController.graph));
+  }
+
+  public final class AppBarConfigurationKt {
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(androidx.navigation.NavGraph navGraph, androidx.customview.widget.Openable? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(android.view.Menu topLevelMenu, androidx.customview.widget.Openable? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(java.util.Set<java.lang.Integer> topLevelDestinationIds, androidx.customview.widget.Openable? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+  }
+
+  public final class BottomNavigationViewKt {
+    method public static void setupWithNavController(com.google.android.material.bottomnavigation.BottomNavigationView, androidx.navigation.NavController navController);
+  }
+
+  public final class CollapsingToolbarLayoutKt {
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar toolbar, androidx.navigation.NavController navController, androidx.drawerlayout.widget.DrawerLayout? drawerLayout);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar toolbar, androidx.navigation.NavController navController, androidx.navigation.ui.AppBarConfiguration configuration = AppBarConfiguration(navController.graph));
+  }
+
+  public final class MenuItemKt {
+    method public static boolean onNavDestinationSelected(android.view.MenuItem, androidx.navigation.NavController navController);
+  }
+
+  public final class NavControllerKt {
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.customview.widget.Openable? drawerLayout);
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration appBarConfiguration);
+  }
+
+  public final class NavigationViewKt {
+    method public static void setupWithNavController(com.google.android.material.navigation.NavigationView, androidx.navigation.NavController navController);
+  }
+
+  public final class ToolbarKt {
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController navController, androidx.drawerlayout.widget.DrawerLayout? drawerLayout);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController navController, androidx.navigation.ui.AppBarConfiguration configuration = AppBarConfiguration(navController.graph));
+  }
+
+}
+
diff --git a/navigation/navigation-ui/api/2.3.0-alpha06.ignore b/navigation/navigation-ui/api/2.3.0-alpha06.ignore
new file mode 100644
index 0000000..9e9e553
--- /dev/null
+++ b/navigation/navigation-ui/api/2.3.0-alpha06.ignore
@@ -0,0 +1,9 @@
+// Baseline format: 1.0
+RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
+    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
+RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
+    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
+RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
+    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
+RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
+    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/2.3.0-alpha06.txt b/navigation/navigation-ui/api/2.3.0-alpha06.txt
new file mode 100644
index 0000000..694afbd
--- /dev/null
+++ b/navigation/navigation-ui/api/2.3.0-alpha06.txt
@@ -0,0 +1,44 @@
+// Signature format: 3.0
+package androidx.navigation.ui {
+
+  public final class AppBarConfiguration {
+    method @Deprecated public androidx.drawerlayout.widget.DrawerLayout? getDrawerLayout();
+    method public androidx.navigation.ui.AppBarConfiguration.OnNavigateUpListener? getFallbackOnNavigateUpListener();
+    method public androidx.customview.widget.Openable? getOpenableLayout();
+    method public java.util.Set<java.lang.Integer!> getTopLevelDestinations();
+  }
+
+  public static final class AppBarConfiguration.Builder {
+    ctor public AppBarConfiguration.Builder(androidx.navigation.NavGraph);
+    ctor public AppBarConfiguration.Builder(android.view.Menu);
+    ctor public AppBarConfiguration.Builder(int...);
+    ctor public AppBarConfiguration.Builder(java.util.Set<java.lang.Integer!>);
+    method public androidx.navigation.ui.AppBarConfiguration build();
+    method @Deprecated public androidx.navigation.ui.AppBarConfiguration.Builder setDrawerLayout(androidx.drawerlayout.widget.DrawerLayout?);
+    method public androidx.navigation.ui.AppBarConfiguration.Builder setFallbackOnNavigateUpListener(androidx.navigation.ui.AppBarConfiguration.OnNavigateUpListener?);
+    method public androidx.navigation.ui.AppBarConfiguration.Builder setOpenableLayout(androidx.customview.widget.Openable?);
+  }
+
+  public static interface AppBarConfiguration.OnNavigateUpListener {
+    method public boolean onNavigateUp();
+  }
+
+  public final class NavigationUI {
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static boolean onNavDestinationSelected(android.view.MenuItem, androidx.navigation.NavController);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static void setupWithNavController(com.google.android.material.navigation.NavigationView, androidx.navigation.NavController);
+    method public static void setupWithNavController(com.google.android.material.bottomnavigation.BottomNavigationView, androidx.navigation.NavController);
+  }
+
+}
+
diff --git a/navigation/navigation-ui/api/public_plus_experimental_2.3.0-alpha06.txt b/navigation/navigation-ui/api/public_plus_experimental_2.3.0-alpha06.txt
new file mode 100644
index 0000000..694afbd
--- /dev/null
+++ b/navigation/navigation-ui/api/public_plus_experimental_2.3.0-alpha06.txt
@@ -0,0 +1,44 @@
+// Signature format: 3.0
+package androidx.navigation.ui {
+
+  public final class AppBarConfiguration {
+    method @Deprecated public androidx.drawerlayout.widget.DrawerLayout? getDrawerLayout();
+    method public androidx.navigation.ui.AppBarConfiguration.OnNavigateUpListener? getFallbackOnNavigateUpListener();
+    method public androidx.customview.widget.Openable? getOpenableLayout();
+    method public java.util.Set<java.lang.Integer!> getTopLevelDestinations();
+  }
+
+  public static final class AppBarConfiguration.Builder {
+    ctor public AppBarConfiguration.Builder(androidx.navigation.NavGraph);
+    ctor public AppBarConfiguration.Builder(android.view.Menu);
+    ctor public AppBarConfiguration.Builder(int...);
+    ctor public AppBarConfiguration.Builder(java.util.Set<java.lang.Integer!>);
+    method public androidx.navigation.ui.AppBarConfiguration build();
+    method @Deprecated public androidx.navigation.ui.AppBarConfiguration.Builder setDrawerLayout(androidx.drawerlayout.widget.DrawerLayout?);
+    method public androidx.navigation.ui.AppBarConfiguration.Builder setFallbackOnNavigateUpListener(androidx.navigation.ui.AppBarConfiguration.OnNavigateUpListener?);
+    method public androidx.navigation.ui.AppBarConfiguration.Builder setOpenableLayout(androidx.customview.widget.Openable?);
+  }
+
+  public static interface AppBarConfiguration.OnNavigateUpListener {
+    method public boolean onNavigateUp();
+  }
+
+  public final class NavigationUI {
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static boolean onNavDestinationSelected(android.view.MenuItem, androidx.navigation.NavController);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static void setupWithNavController(com.google.android.material.navigation.NavigationView, androidx.navigation.NavController);
+    method public static void setupWithNavController(com.google.android.material.bottomnavigation.BottomNavigationView, androidx.navigation.NavController);
+  }
+
+}
+
diff --git a/navigation/navigation-ui/api/res-2.3.0-alpha06.txt b/navigation/navigation-ui/api/res-2.3.0-alpha06.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/navigation/navigation-ui/api/res-2.3.0-alpha06.txt
diff --git a/navigation/navigation-ui/api/restricted_2.3.0-alpha06.ignore b/navigation/navigation-ui/api/restricted_2.3.0-alpha06.ignore
new file mode 100644
index 0000000..9e9e553
--- /dev/null
+++ b/navigation/navigation-ui/api/restricted_2.3.0-alpha06.ignore
@@ -0,0 +1,9 @@
+// Baseline format: 1.0
+RemovedMethod: androidx.navigation.ui.NavigationUI#navigateUp(androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
+    Removed method androidx.navigation.ui.NavigationUI.navigateUp(androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
+RemovedMethod: androidx.navigation.ui.NavigationUI#setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
+    Removed method androidx.navigation.ui.NavigationUI.setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
+RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
+    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
+RemovedMethod: androidx.navigation.ui.NavigationUI#setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.drawerlayout.widget.DrawerLayout):
+    Removed method androidx.navigation.ui.NavigationUI.setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout,androidx.appcompat.widget.Toolbar,androidx.navigation.NavController,androidx.drawerlayout.widget.DrawerLayout)
diff --git a/navigation/navigation-ui/api/restricted_2.3.0-alpha06.txt b/navigation/navigation-ui/api/restricted_2.3.0-alpha06.txt
new file mode 100644
index 0000000..694afbd
--- /dev/null
+++ b/navigation/navigation-ui/api/restricted_2.3.0-alpha06.txt
@@ -0,0 +1,44 @@
+// Signature format: 3.0
+package androidx.navigation.ui {
+
+  public final class AppBarConfiguration {
+    method @Deprecated public androidx.drawerlayout.widget.DrawerLayout? getDrawerLayout();
+    method public androidx.navigation.ui.AppBarConfiguration.OnNavigateUpListener? getFallbackOnNavigateUpListener();
+    method public androidx.customview.widget.Openable? getOpenableLayout();
+    method public java.util.Set<java.lang.Integer!> getTopLevelDestinations();
+  }
+
+  public static final class AppBarConfiguration.Builder {
+    ctor public AppBarConfiguration.Builder(androidx.navigation.NavGraph);
+    ctor public AppBarConfiguration.Builder(android.view.Menu);
+    ctor public AppBarConfiguration.Builder(int...);
+    ctor public AppBarConfiguration.Builder(java.util.Set<java.lang.Integer!>);
+    method public androidx.navigation.ui.AppBarConfiguration build();
+    method @Deprecated public androidx.navigation.ui.AppBarConfiguration.Builder setDrawerLayout(androidx.drawerlayout.widget.DrawerLayout?);
+    method public androidx.navigation.ui.AppBarConfiguration.Builder setFallbackOnNavigateUpListener(androidx.navigation.ui.AppBarConfiguration.OnNavigateUpListener?);
+    method public androidx.navigation.ui.AppBarConfiguration.Builder setOpenableLayout(androidx.customview.widget.Openable?);
+  }
+
+  public static interface AppBarConfiguration.OnNavigateUpListener {
+    method public boolean onNavigateUp();
+  }
+
+  public final class NavigationUI {
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static boolean navigateUp(androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static boolean onNavDestinationSelected(android.view.MenuItem, androidx.navigation.NavController);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static void setupActionBarWithNavController(androidx.appcompat.app.AppCompatActivity, androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static void setupWithNavController(androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.customview.widget.Openable?);
+    method public static void setupWithNavController(com.google.android.material.appbar.CollapsingToolbarLayout, androidx.appcompat.widget.Toolbar, androidx.navigation.NavController, androidx.navigation.ui.AppBarConfiguration);
+    method public static void setupWithNavController(com.google.android.material.navigation.NavigationView, androidx.navigation.NavController);
+    method public static void setupWithNavController(com.google.android.material.bottomnavigation.BottomNavigationView, androidx.navigation.NavController);
+  }
+
+}
+
diff --git a/paging/common/src/main/kotlin/androidx/paging/PageFetcher.kt b/paging/common/src/main/kotlin/androidx/paging/PageFetcher.kt
index 535fcb1..939bd19 100644
--- a/paging/common/src/main/kotlin/androidx/paging/PageFetcher.kt
+++ b/paging/common/src/main/kotlin/androidx/paging/PageFetcher.kt
@@ -19,8 +19,6 @@
 import androidx.paging.LoadType.END
 import androidx.paging.LoadType.REFRESH
 import androidx.paging.LoadType.START
-import androidx.paging.PagingSource.LoadResult.Page
-import androidx.paging.PagingSource.LoadResult.Page.Companion.COUNT_UNDEFINED
 import androidx.paging.RemoteMediator.InitializeAction
 import androidx.paging.RemoteMediator.InitializeAction.LAUNCH_INITIAL_REFRESH
 import androidx.paging.RemoteMediator.MediatorResult
@@ -68,38 +66,9 @@
     val flow: Flow<PagingData<Value>> = channelFlow {
         refreshChannel.asFlow()
             .onStart {
-                val shouldLaunch = remoteMediatorAccessor?.onInitialize()
-                if (shouldLaunch == LAUNCH_INITIAL_REFRESH) {
-                    remoteMediatorAccessor?.load(
-                        scope = this@channelFlow,
-                        loadType = REFRESH,
-                        state = PagingState(
-                            pages = emptyList<Page<Key, Value>>(),
-                            anchorPosition = null,
-                            config = config,
-                            placeholdersStart = COUNT_UNDEFINED
-                        )
-                    )
-                }
-
-                emit(false)
+                emit(remoteMediatorAccessor?.onInitialize() == LAUNCH_INITIAL_REFRESH)
             }
             .scan(null) { previousGeneration: Pager<Key, Value>?, triggerRemoteRefresh ->
-                // Only trigger remote refresh on refresh signals that do not originate from
-                // initialization or PagingSource invalidation.
-                if (triggerRemoteRefresh) {
-                    remoteMediatorAccessor?.load(
-                        scope = this@channelFlow,
-                        loadType = REFRESH,
-                        state = PagingState(
-                            pages = emptyList<Page<Key, Value>>(),
-                            anchorPosition = null,
-                            config = config,
-                            placeholdersStart = COUNT_UNDEFINED
-                        )
-                    )
-                }
-
                 val pagingSource = pagingSourceFactory()
                 val initialKey = previousGeneration?.refreshKeyInfo()
                     ?.let { pagingSource.getRefreshKey(it) }
@@ -116,6 +85,9 @@
                     pagingSource = pagingSource,
                     config = config,
                     retryFlow = retryChannel.asFlow(),
+                    // Only trigger remote refresh on refresh signals that do not originate from
+                    // initialization or PagingSource invalidation.
+                    triggerRemoteRefresh = triggerRemoteRefresh,
                     remoteMediatorAccessor = remoteMediatorAccessor,
                     invalidate = this@PageFetcher::refresh
                 )
diff --git a/paging/common/src/main/kotlin/androidx/paging/Pager.kt b/paging/common/src/main/kotlin/androidx/paging/Pager.kt
index ab73c18..a9415a4 100644
--- a/paging/common/src/main/kotlin/androidx/paging/Pager.kt
+++ b/paging/common/src/main/kotlin/androidx/paging/Pager.kt
@@ -64,6 +64,7 @@
     internal val pagingSource: PagingSource<Key, Value>,
     private val config: PagingConfig,
     private val retryFlow: Flow<Unit>,
+    private val triggerRemoteRefresh: Boolean = false,
     private val remoteMediatorAccessor: RemoteMediatorAccessor<Key, Value>? = null,
     private val invalidate: () -> Unit = {}
 ) {
@@ -104,39 +105,43 @@
         launch {
             retryChannel.consumeAsFlow()
                 .collect {
-                    // Handle refresh failure. Re-attempt doInitialLoad if the last attempt failed,
-                    val refreshFailure = stateLock.withLock {
-                        state.failedHintsByLoadType.remove(REFRESH)
-                    }
-                    refreshFailure?.let {
-                        doInitialLoad(this, state)
+                    // Handle refresh failure.
+                    stateLock.withLock { state.failedHintsByLoadType.remove(REFRESH) }
+                        ?.let { refreshFailure ->
+                            retryLoadError(refreshFailure)
 
-                        val newRefreshFailure = stateLock.withLock {
-                            state.failedHintsByLoadType[REFRESH]
+                            val newRefreshFailure = stateLock.withLock {
+                                state.failedHintsByLoadType[REFRESH]
+                            }
+                            if (newRefreshFailure == null) {
+                                startConsumingHints()
+                            }
                         }
-                        if (newRefreshFailure == null) {
-                            startConsumingHints()
-                        }
-                    }
 
                     // Handle prepend / append failures.
-                    stateLock.withLock {
-                        state.failedHintsByLoadType[START]?.also { loadError ->
-                            // Reset load state to allow loads in this direction.
-                            state.failedHintsByLoadType.remove(START)
-                            handleLoadError(loadError)
-                        }
-                        state.failedHintsByLoadType[END]?.also { loadError ->
-                            // Reset load state to allow loads in this direction.
-                            state.failedHintsByLoadType.remove(END)
-                            handleLoadError(loadError)
-                        }
-                    }
+
+                    // Reset load state to allow loads in this direction.
+                    stateLock.withLock { state.failedHintsByLoadType.remove(START) }
+                        ?.also { loadError -> retryLoadError(loadError) }
+
+                    // Reset load state to allow loads in this direction.
+                    stateLock.withLock { state.failedHintsByLoadType.remove(END) }
+                        ?.also { loadError -> retryLoadError(loadError) }
                 }
         }
 
-        // Setup finished, we can now start the initial load.
-        doInitialLoad(this, state)
+        // Trigger RemoteMediator initialization blockingly.
+        if (triggerRemoteRefresh) {
+            remoteMediatorAccessor?.run {
+                val pagingState = stateLock.withLock { state.currentPagingState(null) }
+                doBoundaryCall(this@cancelableChannelFlow, REFRESH, pagingState)
+            }
+        }
+
+        // Setup finished, we can start the initial load if RemoteMediator didn't throw an error.
+        if (stateLock.withLock { state.failedHintsByLoadType[REFRESH] } == null) {
+            doInitialLoad(this, state)
+        }
 
         // Only start collection on ViewportHints if the initial load succeeded.
         if (stateLock.withLock { state.failedHintsByLoadType[REFRESH] } == null) {
@@ -144,13 +149,25 @@
         }
     }
 
-    private suspend fun CoroutineScope.handleLoadError(failure: LoadError<Key, Value>) {
-        when (failure) {
-            is LoadError.Hint<Key, Value> -> {
+    @Suppress("SuspendFunctionOnCoroutineScope")
+    private suspend fun CoroutineScope.retryLoadError(failure: LoadError<Key, Value>) {
+        when {
+            failure is LoadError.Hint<Key, Value> && failure.loadType == REFRESH -> {
+                doInitialLoad(this, state)
+            }
+            failure is LoadError.Hint<Key, Value> -> {
                 @OptIn(ExperimentalCoroutinesApi::class)
                 hintChannel.offer(failure.viewportHint)
             }
-            is LoadError.Mediator<Key, Value> -> {
+            failure is LoadError.Mediator<Key, Value> && failure.loadType == REFRESH -> {
+                remoteMediatorAccessor?.run {
+                    val pagingState = stateLock.withLock { state.currentPagingState(lastHint) }
+                    launch {
+                        doBoundaryCall(this@retryLoadError, REFRESH, pagingState)
+                    }
+                }
+            }
+            failure is LoadError.Mediator<Key, Value> -> {
                 remoteMediatorAccessor?.load(this, failure.loadType, failure.state)
             }
         }
@@ -276,48 +293,48 @@
         stateLock.withLock { state.setLoading(REFRESH) }
 
         val params = loadParams(REFRESH, initialKey)
-        val result = pagingSource.load(params)
+        when (val result = pagingSource.load(params)) {
+            is Page<Key, Value> -> {
+                val insertApplied = stateLock.withLock { state.insert(0, REFRESH, result) }
 
-        stateLock.withLock {
-            when (result) {
-                is Page<Key, Value> -> {
-                    val insertApplied = state.insert(0, REFRESH, result)
-
-                    // If remoteMediator is set, we allow its result to dictate LoadState, otherwise
-                    // we simply rely on the load result.
-                    if (remoteMediatorAccessor == null) {
+                // If remoteMediator is set, we allow its result to dictate LoadState, otherwise
+                // we simply rely on the load result.
+                if (remoteMediatorAccessor == null) {
+                    stateLock.withLock {
                         // Update loadStates which are sent along with this load's Insert PageEvent.
                         state.loadStates[REFRESH] = Idle
                         if (result.prevKey == null) state.loadStates[START] = Done
                         if (result.nextKey == null) state.loadStates[END] = Done
-                    } else {
-                        state.loadStates[REFRESH] = Idle
-                        if (result.prevKey == null || result.nextKey == null) {
-                            val pagingState = state.currentPagingState(lastHint)
+                    }
+                } else {
+                    stateLock.withLock { state.loadStates[REFRESH] = Idle }
+                    if (result.prevKey == null || result.nextKey == null) {
+                        val pagingState = stateLock.withLock { state.currentPagingState(lastHint) }
 
-                            if (result.prevKey == null) {
-                                state.setLoading(START)
-                                remoteMediatorAccessor.launchBoundaryCall(scope, START, pagingState)
-                            }
+                        if (result.prevKey == null) {
+                            remoteMediatorAccessor.doBoundaryCall(scope, START, pagingState)
+                        }
 
-                            if (result.nextKey == null) {
-                                state.setLoading(END)
-                                remoteMediatorAccessor.launchBoundaryCall(scope, END, pagingState)
-                            }
+                        if (result.nextKey == null) {
+                            remoteMediatorAccessor.doBoundaryCall(scope, END, pagingState)
                         }
                     }
+                }
 
-                    // Send insert event after load state updates, so that Done / Idle is
-                    // correctly reflected in the insert event. Note that we only send the event
-                    // if the insert was successfully applied in the case of cancellation due to
-                    // page dropping.
-                    if (insertApplied) {
+                // Send insert event after load state updates, so that Done / Idle is
+                // correctly reflected in the insert event. Note that we only send the event
+                // if the insert was successfully applied in the case of cancellation due to
+                // page dropping.
+                if (insertApplied) {
+                    stateLock.withLock {
                         with(state) {
                             pageEventCh.send(result.toPageEvent(REFRESH, config.enablePlaceholders))
                         }
                     }
                 }
-                is LoadResult.Error -> state.setHintError(
+            }
+            is LoadResult.Error -> stateLock.withLock {
+                state.setHintError(
                     REFRESH,
                     Error(result.throwable),
                     ViewportHint.DUMMY_VALUE
@@ -379,12 +396,12 @@
                 }
             }
 
-            stateLock.withLock {
-                val dropType = when (loadType) {
-                    START -> END
-                    else -> START
-                }
+            val dropType = when (loadType) {
+                START -> END
+                else -> START
+            }
 
+            stateLock.withLock {
                 state.dropInfo(dropType, generationalHint.hint, config.prefetchDistance)
                     ?.let { info ->
                         state.drop(dropType, info.pageCount, info.placeholdersRemaining)
@@ -403,28 +420,30 @@
                             )
                         }
                 }
+            }
 
-                if (remoteMediatorAccessor == null) {
+            if (remoteMediatorAccessor == null) {
+                stateLock.withLock {
                     // Update load state to success if this is the final load result for this
                     // load hint, and only if we didn't error out.
                     if (loadKey == null && state.failedHintsByLoadType[loadType] == null) {
                         state.loadStates[loadType] = if (updateLoadStateToDone) Done else Idle
                     }
-                } else {
-                    val pagingState = state.currentPagingState(lastHint)
+                }
+            } else {
+                val pagingState = stateLock.withLock { state.currentPagingState(lastHint) }
 
-                    if (params.loadType == START && result.prevKey == null) {
-                        state.setLoading(START)
-                        remoteMediatorAccessor.launchBoundaryCall(scope, START, pagingState)
-                    }
-
-                    if (params.loadType == END && result.nextKey == null) {
-                        state.setLoading(END)
-                        remoteMediatorAccessor.launchBoundaryCall(scope, END, pagingState)
-                    }
+                if (params.loadType == START && result.prevKey == null) {
+                    remoteMediatorAccessor.doBoundaryCall(scope, START, pagingState)
                 }
 
-                // Send page event for successful insert, now that PagerState has been updated.
+                if (params.loadType == END && result.nextKey == null) {
+                    remoteMediatorAccessor.doBoundaryCall(scope, END, pagingState)
+                }
+            }
+
+            // Send page event for successful insert, now that PagerState has been updated.
+            stateLock.withLock {
                 val pageEvent = with(state) {
                     result.toPageEvent(loadType, config.enablePlaceholders)
                 }
@@ -433,25 +452,29 @@
         }
     }
 
-    private fun RemoteMediatorAccessor<Key, Value>.launchBoundaryCall(
+    private suspend fun RemoteMediatorAccessor<Key, Value>.doBoundaryCall(
         coroutineScope: CoroutineScope,
         loadType: LoadType,
         pagingState: PagingState<Key, Value>
     ) {
-        coroutineScope.launch {
-            when (val boundaryResult = load(coroutineScope, loadType, pagingState)) {
-                is RemoteMediator.MediatorResult.Error -> {
+        stateLock.withLock { state.setLoading(loadType) }
+        when (val boundaryResult = load(coroutineScope, loadType, pagingState)) {
+            is RemoteMediator.MediatorResult.Error -> {
+                stateLock.withLock {
                     this@Pager.state.setBoundaryError(
                         loadType,
                         Error(boundaryResult.throwable),
                         this@Pager.lastHint
                     )
                 }
-                is RemoteMediator.MediatorResult.Success -> {
-                    this@Pager.state.loadStates[loadType] = if (boundaryResult.canRequestMoreData) {
-                        Idle
-                    } else {
-                        Done
+            }
+            is RemoteMediator.MediatorResult.Success -> {
+                if (loadType != REFRESH) {
+                    stateLock.withLock {
+                        this@Pager.state.loadStates[loadType] = when {
+                            boundaryResult.canRequestMoreData -> Idle
+                            else -> Done
+                        }
                     }
                 }
             }
@@ -476,7 +499,7 @@
         }
 
         // Save the hint for retry on incoming retry signal, typically sent from user interaction.
-        failedHintsByLoadType[loadType] = LoadError.Hint(hint)
+        failedHintsByLoadType[loadType] = LoadError.Hint(loadType, hint)
     }
 
     // TODO: We need a map of desired behaviors:
diff --git a/paging/common/src/main/kotlin/androidx/paging/PagerState.kt b/paging/common/src/main/kotlin/androidx/paging/PagerState.kt
index 385af04..40db547c 100644
--- a/paging/common/src/main/kotlin/androidx/paging/PagerState.kt
+++ b/paging/common/src/main/kotlin/androidx/paging/PagerState.kt
@@ -346,13 +346,14 @@
  *  * [PagingSource.LoadResult.Error] returned from [PagingSource.load]
  *  * [RemoteMediator.MediatorResult.Error] returned from [RemoteMediator.load]
  */
-internal sealed class LoadError<Key : Any, Value : Any> {
+internal sealed class LoadError<Key : Any, Value : Any>(val loadType: LoadType) {
     internal class Hint<Key : Any, Value : Any>(
+        loadType: LoadType,
         val viewportHint: ViewportHint
-    ) : LoadError<Key, Value>()
+    ) : LoadError<Key, Value>(loadType)
 
     internal class Mediator<Key : Any, Value : Any>(
-        val loadType: LoadType,
+        loadType: LoadType,
         val state: PagingState<Key, Value>
-    ) : LoadError<Key, Value>()
+    ) : LoadError<Key, Value>(loadType)
 }
diff --git a/paging/common/src/test/kotlin/androidx/paging/PagerTest.kt b/paging/common/src/test/kotlin/androidx/paging/PagerTest.kt
index 827e40c..6cd2d69 100644
--- a/paging/common/src/test/kotlin/androidx/paging/PagerTest.kt
+++ b/paging/common/src/test/kotlin/androidx/paging/PagerTest.kt
@@ -16,6 +16,7 @@
 
 package androidx.paging
 
+import androidx.paging.ContiguousPagedListTest.Companion.EXCEPTION
 import androidx.paging.LoadState.Done
 import androidx.paging.LoadState.Error
 import androidx.paging.LoadState.Idle
@@ -995,6 +996,39 @@
     }
 
     @Test
+    fun remoteMediator_initialLoadLoadStateError() = testScope.runBlockingTest {
+        val remoteMediator = object : RemoteMediatorMock() {
+            override suspend fun load(
+                loadType: LoadType,
+                state: PagingState<Int, Int>
+            ): MediatorResult {
+                return MediatorResult.Error(EXCEPTION)
+            }
+        }
+
+        val pager = Pager(
+            initialKey = 0,
+            pagingSource = pagingSourceFactory(),
+            config = PagingConfig(1),
+            retryFlow = retryCh.asFlow(),
+            triggerRemoteRefresh = true,
+            remoteMediatorAccessor = RemoteMediatorAccessor(remoteMediator)
+        )
+
+        collectPagerData(pager) { pageEvents, _ ->
+            advanceUntilIdle()
+
+            assertEvents(
+                listOf(
+                    LoadStateUpdate(REFRESH, Loading),
+                    LoadStateUpdate(REFRESH, Error(EXCEPTION))
+                ),
+                pageEvents
+            )
+        }
+    }
+
+    @Test
     fun remoteMediator_initialLoadTriggersPrepend() = testScope.runBlockingTest {
         val remoteMediator = RemoteMediatorMock()
         val config = PagingConfig(
diff --git a/paging/runtime/api/3.0.0-alpha01.txt b/paging/runtime/api/3.0.0-alpha01.txt
index 40f9fd1..f12fb7f 100644
--- a/paging/runtime/api/3.0.0-alpha01.txt
+++ b/paging/runtime/api/3.0.0-alpha01.txt
@@ -104,6 +104,7 @@
     method public void addLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
     method protected T? getItem(int position);
     method public int getItemCount();
+    method public final long getItemId(int position);
     method public final suspend Object! presentData(androidx.paging.PagingData<T> pagingData, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public final void refresh();
     method public void removeLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
diff --git a/paging/runtime/api/current.txt b/paging/runtime/api/current.txt
index 40f9fd1..f12fb7f 100644
--- a/paging/runtime/api/current.txt
+++ b/paging/runtime/api/current.txt
@@ -104,6 +104,7 @@
     method public void addLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
     method protected T? getItem(int position);
     method public int getItemCount();
+    method public final long getItemId(int position);
     method public final suspend Object! presentData(androidx.paging.PagingData<T> pagingData, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public final void refresh();
     method public void removeLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
diff --git a/paging/runtime/api/public_plus_experimental_3.0.0-alpha01.txt b/paging/runtime/api/public_plus_experimental_3.0.0-alpha01.txt
index 40f9fd1..f12fb7f 100644
--- a/paging/runtime/api/public_plus_experimental_3.0.0-alpha01.txt
+++ b/paging/runtime/api/public_plus_experimental_3.0.0-alpha01.txt
@@ -104,6 +104,7 @@
     method public void addLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
     method protected T? getItem(int position);
     method public int getItemCount();
+    method public final long getItemId(int position);
     method public final suspend Object! presentData(androidx.paging.PagingData<T> pagingData, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public final void refresh();
     method public void removeLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
diff --git a/paging/runtime/api/public_plus_experimental_current.txt b/paging/runtime/api/public_plus_experimental_current.txt
index 40f9fd1..f12fb7f 100644
--- a/paging/runtime/api/public_plus_experimental_current.txt
+++ b/paging/runtime/api/public_plus_experimental_current.txt
@@ -104,6 +104,7 @@
     method public void addLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
     method protected T? getItem(int position);
     method public int getItemCount();
+    method public final long getItemId(int position);
     method public final suspend Object! presentData(androidx.paging.PagingData<T> pagingData, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public final void refresh();
     method public void removeLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
diff --git a/paging/runtime/api/restricted_3.0.0-alpha01.txt b/paging/runtime/api/restricted_3.0.0-alpha01.txt
index 40f9fd1..f12fb7f 100644
--- a/paging/runtime/api/restricted_3.0.0-alpha01.txt
+++ b/paging/runtime/api/restricted_3.0.0-alpha01.txt
@@ -104,6 +104,7 @@
     method public void addLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
     method protected T? getItem(int position);
     method public int getItemCount();
+    method public final long getItemId(int position);
     method public final suspend Object! presentData(androidx.paging.PagingData<T> pagingData, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public final void refresh();
     method public void removeLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
diff --git a/paging/runtime/api/restricted_current.txt b/paging/runtime/api/restricted_current.txt
index 40f9fd1..f12fb7f 100644
--- a/paging/runtime/api/restricted_current.txt
+++ b/paging/runtime/api/restricted_current.txt
@@ -104,6 +104,7 @@
     method public void addLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
     method protected T? getItem(int position);
     method public int getItemCount();
+    method public final long getItemId(int position);
     method public final suspend Object! presentData(androidx.paging.PagingData<T> pagingData, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public final void refresh();
     method public void removeLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
diff --git a/paging/runtime/build.gradle b/paging/runtime/build.gradle
index c6e58c3..7c076f7 100644
--- a/paging/runtime/build.gradle
+++ b/paging/runtime/build.gradle
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-
-import androidx.build.AndroidXExtension
 import androidx.build.LibraryGroups
 import androidx.build.Publish
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -51,12 +49,6 @@
     androidTestImplementation(KOTLIN_TEST)
     androidTestImplementation(KOTLIN_COROUTINES_TEST)
     androidTestImplementation(JUNIT)
-    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(MOCKITO_KOTLIN, {
-        exclude group: "org.mockito" // to keep control on the mockito version
-        exclude group: "net.bytebuddy"
-    })
 }
 
 androidx {
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
index 01a27f2..b41d1a3 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
@@ -17,16 +17,15 @@
 package androidx.paging
 
 import androidx.arch.core.executor.ArchTaskExecutor
+import androidx.paging.ListUpdateCallbackFake.OnChangedEvent
+import androidx.paging.ListUpdateCallbackFake.OnInsertedEvent
+import androidx.paging.ListUpdateCallbackFake.OnRemovedEvent
+import androidx.paging.PagedListListenerFake.OnCurrentListChangedEvent
 import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListUpdateCallback
 import androidx.test.filters.SmallTest
 import androidx.testutils.TestExecutor
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.reset
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
-import com.nhaarman.mockitokotlin2.verifyZeroInteractions
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
@@ -75,16 +74,16 @@
 
     @Test
     fun initialState() {
-        val callback = mock<ListUpdateCallback>()
+        val callback = ListUpdateCallbackFake()
         val differ = createDiffer(callback)
         assertEquals(null, differ.currentList)
         assertEquals(0, differ.itemCount)
-        verifyZeroInteractions(callback)
+        assertEquals(0, callback.interactions)
     }
 
     @Test
     fun setFullList() {
-        val callback = mock<ListUpdateCallback>()
+        val callback = ListUpdateCallbackFake()
         val differ = createDiffer(callback)
         differ.submitList(StringPagedList(0, 0, "a", "b"))
 
@@ -92,10 +91,10 @@
         assertEquals("a", differ.getItem(0))
         assertEquals("b", differ.getItem(1))
 
-        verify(callback).onInserted(0, 2)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnInsertedEvent(0, 2), callback.onInsertedEvents[0])
+        assertEquals(1, callback.interactions)
         drain()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
     }
 
     @Test(expected = IndexOutOfBoundsException::class)
@@ -120,15 +119,15 @@
 
     @Test
     fun simpleStatic() {
-        val callback = mock<ListUpdateCallback>()
+        val callback = ListUpdateCallbackFake()
         val differ = createDiffer(callback)
 
         assertEquals(0, differ.itemCount)
 
         differ.submitList(StringPagedList(2, 2, "a", "b"))
 
-        verify(callback).onInserted(0, 6)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnInsertedEvent(0, 6), callback.onInsertedEvents[0])
+        assertEquals(1, callback.interactions)
         assertEquals(6, differ.itemCount)
 
         assertNull(differ.getItem(0))
@@ -141,21 +140,21 @@
 
     @Test
     fun submitListReuse() {
-        val callback = mock<ListUpdateCallback>()
+        val callback = ListUpdateCallbackFake()
         val differ = createDiffer(callback)
         val origList = StringPagedList(2, 2, "a", "b")
 
         // set up original list
         differ.submitList(origList)
-        verify(callback).onInserted(0, 6)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnInsertedEvent(0, 6), callback.onInsertedEvents[0])
+        assertEquals(1, callback.interactions)
         drain()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
 
         // submit new list, but don't let it finish
         differ.submitList(StringPagedList(0, 0, "c", "d"))
         drainExceptDiffThread()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
 
         // resubmit original list, which should be final observable state
         differ.submitList(origList)
@@ -172,44 +171,44 @@
             .setPrefetchDistance(2)
             .build()
 
-        val callback = mock<ListUpdateCallback>()
+        val callback = ListUpdateCallbackFake()
         val differ = createDiffer(callback)
 
         differ.submitList(createPagedListFromListAndPos(config, ALPHABET_LIST, 2))
-        verify(callback).onInserted(0, ALPHABET_LIST.size)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnInsertedEvent(0, ALPHABET_LIST.size), callback.onInsertedEvents[0])
+        assertEquals(1, callback.interactions)
         drain()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
 
         // get without triggering prefetch...
         differ.getItem(1)
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
         drain()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
 
         // get triggering prefetch...
         differ.getItem(2)
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
         drain()
-        verify(callback).onChanged(4, 2, null)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnChangedEvent(4, 2, null), callback.onChangedEvents[0])
+        assertEquals(2, callback.interactions)
 
         // get with no data loaded nearby...
         differ.getItem(12)
-        verifyNoMoreInteractions(callback)
+        assertEquals(2, callback.interactions)
         drain()
 
         // NOTE: tiling is currently disabled, so tiles at 6 and 8 are required to load around 12
         for (pos in 6..14 step 2) {
-            verify(callback).onChanged(pos, 2, null)
+            assertEquals(OnChangedEvent(pos, 2, null), callback.onChangedEvents[(pos - 6) / 2 + 1])
         }
-        verifyNoMoreInteractions(callback)
+        assertEquals(7, callback.interactions)
 
         // finally, clear
         differ.submitList(null)
-        verify(callback).onRemoved(0, 26)
+        assertEquals(OnRemovedEvent(0, 26), callback.onRemovedEvents[0])
         drain()
-        verifyNoMoreInteractions(callback)
+        assertEquals(8, callback.interactions)
     }
 
     @Test
@@ -220,31 +219,31 @@
             .setPageSize(50)
             .build()
 
-        val callback = mock<ListUpdateCallback>()
+        val callback = ListUpdateCallbackFake()
         val differ = createDiffer(callback)
 
         // initial list missing one item (immediate)
         differ.submitList(createPagedListFromListAndPos(config, ALPHABET_LIST.subList(0, 25), 0))
-        verify(callback).onInserted(0, 25)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnInsertedEvent(0, 25), callback.onInsertedEvents[0])
+        assertEquals(1, callback.interactions)
         assertEquals(differ.itemCount, 25)
         drain()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
 
         // pass second list with full data
         differ.submitList(createPagedListFromListAndPos(config, ALPHABET_LIST, 0))
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
         drain()
-        verify(callback).onInserted(25, 1)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnInsertedEvent(25, 1), callback.onInsertedEvents[1])
+        assertEquals(2, callback.interactions)
         assertEquals(differ.itemCount, 26)
 
         // finally, clear (immediate)
         differ.submitList(null)
-        verify(callback).onRemoved(0, 26)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnRemovedEvent(0, 26), callback.onRemovedEvents[0])
+        assertEquals(3, callback.interactions)
         drain()
-        verifyNoMoreInteractions(callback)
+        assertEquals(3, callback.interactions)
     }
 
     @Test
@@ -256,38 +255,38 @@
             .setPrefetchDistance(2)
             .build()
 
-        val callback = mock<ListUpdateCallback>()
+        val callback = ListUpdateCallbackFake()
         val differ = createDiffer(callback)
 
         differ.submitList(createPagedListFromListAndPos(config, ALPHABET_LIST, 4))
-        verify(callback).onInserted(0, ALPHABET_LIST.size)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnInsertedEvent(0, ALPHABET_LIST.size), callback.onInsertedEvents[0])
+        assertEquals(1, callback.interactions)
         drain()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
         assertNotNull(differ.currentList)
         assertFalse(differ.currentList!!.isImmutable)
 
         // trigger page loading
         differ.getItem(10)
         differ.submitList(createPagedListFromListAndPos(config, ALPHABET_LIST, 4))
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
 
         // drain page fetching, but list became immutable, page will be ignored
         drainExceptDiffThread()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
         assertNotNull(differ.currentList)
         assertTrue(differ.currentList!!.isImmutable)
 
         // flush diff, which signals nothing, since 1st pagedlist == 2nd pagedlist
         diffThread.executeAll()
         mainThread.executeAll()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
         assertNotNull(differ.currentList)
         assertFalse(differ.currentList!!.isImmutable)
 
         // finally, a full flush will complete the swap-triggered load within the new list
         drain()
-        verify(callback).onChanged(6, 2, null)
+        assertEquals(OnChangedEvent(6, 2, null), callback.onChangedEvents[0])
     }
 
     @Test
@@ -298,14 +297,14 @@
             prefetchDistance = 2
         )
 
-        val callback = mock<ListUpdateCallback>()
+        val callback = ListUpdateCallbackFake()
         val differ = createDiffer(callback)
 
         differ.submitList(createPagedListFromListAndPos(config, ALPHABET_LIST, 2))
-        verify(callback).onInserted(0, ALPHABET_LIST.size)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnInsertedEvent(0, ALPHABET_LIST.size), callback.onInsertedEvents[0])
+        assertEquals(1, callback.interactions)
         drain()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
         assertNotNull(differ.currentList)
         assertFalse(differ.currentList!!.isImmutable)
 
@@ -313,20 +312,20 @@
         val newList = createPagedListFromListAndPos(config, ALPHABET_LIST, 2)
         differ.submitList(newList)
         newList.loadAround(4)
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
 
         // drain page fetching, but list became immutable, page changes aren't dispatched yet
         drainExceptDiffThread()
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, callback.interactions)
         assertNotNull(differ.currentList)
         assertTrue(differ.currentList!!.isImmutable)
 
         // flush diff, which signals nothing, since 1st pagedlist == 2nd pagedlist
         diffThread.executeAll()
         mainThread.executeAll()
-        verify(callback).onChanged(4, 2, null)
-        verify(callback).onChanged(6, 2, null)
-        verifyNoMoreInteractions(callback)
+        assertEquals(OnChangedEvent(4, 2, null), callback.onChangedEvents[0])
+        assertEquals(OnChangedEvent(6, 2, null), callback.onChangedEvents[1])
+        assertEquals(3, callback.interactions)
         assertNotNull(differ.currentList)
         assertFalse(differ.currentList!!.isImmutable)
     }
@@ -471,63 +470,61 @@
     fun pagedListListener() {
         val differ = createDiffer()
 
-        @Suppress("UNCHECKED_CAST", "DEPRECATION")
-        val listener = mock<AsyncPagedListDiffer.PagedListListener<String>>()
+        val listener = PagedListListenerFake<String>()
         differ.addPagedListListener(listener)
 
-        val callback = mock<Runnable>()
+        val callback = RunnableFake()
 
         // first - simple insert
         val first = StringPagedList(2, 2, "a", "b")
-        verifyZeroInteractions(listener)
+        assertEquals(0, listener.onCurrentListChangedEvents.size)
         differ.submitList(first, callback)
-        verify(listener).onCurrentListChanged(null, first)
-        verifyNoMoreInteractions(listener)
-        verify(callback).run()
-        verifyNoMoreInteractions(callback)
-        reset(callback)
+        assertEquals(OnCurrentListChangedEvent(null, first), listener.onCurrentListChangedEvents[0])
+        assertEquals(1, listener.onCurrentListChangedEvents.size)
+        assertEquals(1, callback.runEvents.size)
 
         // second - async update
         val second = StringPagedList(2, 2, "c", "d")
         differ.submitList(second, callback)
-        verifyNoMoreInteractions(listener)
-        verifyNoMoreInteractions(callback)
+        assertEquals(1, listener.onCurrentListChangedEvents.size)
+        assertEquals(1, callback.runEvents.size)
         drain()
-        verify(listener).onCurrentListChanged(first, second)
-        verifyNoMoreInteractions(listener)
-        verify(callback).run()
-        verifyNoMoreInteractions(callback)
-        reset(callback)
+        assertEquals(
+            OnCurrentListChangedEvent(first, second),
+            listener.onCurrentListChangedEvents[1]
+        )
+        assertEquals(2, listener.onCurrentListChangedEvents.size)
+        assertEquals(2, callback.runEvents.size)
 
         // third - same list - only triggers callback
         differ.submitList(second, callback)
-        verifyNoMoreInteractions(listener)
-        verify(callback).run()
-        verifyNoMoreInteractions(callback)
+        assertEquals(2, listener.onCurrentListChangedEvents.size)
+        assertEquals(3, callback.runEvents.size)
         drain()
-        verifyNoMoreInteractions(listener)
-        verifyNoMoreInteractions(callback)
-        reset(callback)
+        assertEquals(2, listener.onCurrentListChangedEvents.size)
+        assertEquals(3, callback.runEvents.size)
 
         // fourth - null
         differ.submitList(null, callback)
-        verify(listener).onCurrentListChanged(second, null)
-        verifyNoMoreInteractions(listener)
-        verify(callback).run()
-        verifyNoMoreInteractions(callback)
-        reset(callback)
+        assertEquals(
+            OnCurrentListChangedEvent(second, null),
+            listener.onCurrentListChangedEvents[2]
+        )
+        assertEquals(3, listener.onCurrentListChangedEvents.size)
+        assertEquals(4, callback.runEvents.size)
 
         // remove listener, see nothing
         differ.removePagedListListener(listener)
         differ.submitList(first)
         drain()
-        verifyNoMoreInteractions(listener)
-        verifyNoMoreInteractions(callback)
+        assertEquals(3, listener.onCurrentListChangedEvents.size)
+        assertEquals(4, callback.runEvents.size)
     }
 
     @Test
     fun addRemovePagedListCallback() {
         val differ = createDiffer()
+
         @Suppress("DEPRECATION")
         val noopCallback = { _: PagedList<String>?, _: PagedList<String>? -> }
         differ.addPagedListListener(noopCallback)
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/ListUpdateCallbackFake.kt b/paging/runtime/src/androidTest/java/androidx/paging/ListUpdateCallbackFake.kt
new file mode 100644
index 0000000..55c4914
--- /dev/null
+++ b/paging/runtime/src/androidTest/java/androidx/paging/ListUpdateCallbackFake.kt
@@ -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.
+ */
+
+package androidx.paging
+
+import androidx.recyclerview.widget.ListUpdateCallback
+
+class ListUpdateCallbackFake : ListUpdateCallback {
+    var interactions = 0
+    val onInsertedEvents = mutableListOf<OnInsertedEvent>()
+    val onRemovedEvents = mutableListOf<OnRemovedEvent>()
+    val onMovedEvents = mutableListOf<OnMovedEvent>()
+    val onChangedEvents = mutableListOf<OnChangedEvent>()
+
+    override fun onInserted(position: Int, count: Int) {
+        interactions++
+        onInsertedEvents.add(OnInsertedEvent(position, count))
+    }
+
+    override fun onRemoved(position: Int, count: Int) {
+        interactions++
+        onRemovedEvents.add(OnRemovedEvent(position, count))
+    }
+
+    override fun onMoved(fromPosition: Int, toPosition: Int) {
+        interactions++
+        onMovedEvents.add(OnMovedEvent(fromPosition, toPosition))
+    }
+
+    override fun onChanged(position: Int, count: Int, payload: Any?) {
+        interactions++
+        onChangedEvents.add(OnChangedEvent(position, count, payload))
+    }
+
+    data class OnInsertedEvent(val position: Int, val count: Int)
+    data class OnRemovedEvent(val position: Int, val count: Int)
+    data class OnMovedEvent(val fromPosition: Int, val toPosition: Int)
+    data class OnChangedEvent(val position: Int, val count: Int, val payload: Any?)
+}
\ No newline at end of file
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/NullPaddedListDiffHelperTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/NullPaddedListDiffHelperTest.kt
index 8f15e9c..551065f 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/NullPaddedListDiffHelperTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/NullPaddedListDiffHelperTest.kt
@@ -16,17 +16,16 @@
 
 package androidx.paging
 
-import androidx.test.filters.SmallTest
+import androidx.paging.ListUpdateCallbackFake.OnChangedEvent
+import androidx.paging.ListUpdateCallbackFake.OnInsertedEvent
+import androidx.paging.ListUpdateCallbackFake.OnMovedEvent
+import androidx.paging.ListUpdateCallbackFake.OnRemovedEvent
 import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListUpdateCallback
+import androidx.test.filters.SmallTest
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import org.mockito.Mockito.mock
-import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
 
 @SmallTest
 @RunWith(JUnit4::class)
@@ -46,63 +45,69 @@
     @Test
     fun sameListNoUpdates() {
         validateTwoListDiff(
-                Storage(5, listOf("a", "b", "c"), 5),
-                Storage(5, listOf("a", "b", "c"), 5)) {
-            verifyZeroInteractions(it)
+            Storage(5, listOf("a", "b", "c"), 5),
+            Storage(5, listOf("a", "b", "c"), 5)
+        ) {
+            assertEquals(0, it.interactions)
         }
     }
 
     @Test
     fun appendFill() {
         validateTwoListDiff(
-                Storage(5, listOf("a", "b"), 5),
-                Storage(5, listOf("a", "b", "c"), 4)) {
-            verify(it).onRemoved(11, 1)
-            verify(it).onInserted(7, 1)
+            Storage(5, listOf("a", "b"), 5),
+            Storage(5, listOf("a", "b", "c"), 4)
+        ) {
+            assertEquals(OnRemovedEvent(11, 1), it.onRemovedEvents[0])
+            assertEquals(OnInsertedEvent(7, 1), it.onInsertedEvents[0])
             // NOTE: ideally would be onChanged(7, 1, null)
-            verifyNoMoreInteractions(it)
+            assertEquals(2, it.interactions)
         }
     }
 
     @Test
     fun prependFill() {
         validateTwoListDiff(
-                Storage(5, listOf("b", "c"), 5),
-                Storage(4, listOf("a", "b", "c"), 5)) {
-            verify(it).onRemoved(0, 1)
-            verify(it).onInserted(4, 1)
+            Storage(5, listOf("b", "c"), 5),
+            Storage(4, listOf("a", "b", "c"), 5)
+        ) {
+            assertEquals(OnRemovedEvent(0, 1), it.onRemovedEvents[0])
+            assertEquals(OnInsertedEvent(4, 1), it.onInsertedEvents[0])
             // NOTE: ideally would be onChanged(4, 1, null);
-            verifyNoMoreInteractions(it)
+            assertEquals(2, it.interactions)
         }
     }
 
     @Test
     fun change() {
         validateTwoListDiff(
-                Storage(5, listOf("a1", "b1", "c1"), 5),
-                Storage(5, listOf("a2", "b1", "c2"), 5)) {
-            verify(it).onChanged(5, 1, null)
-            verify(it).onChanged(7, 1, null)
-            verifyNoMoreInteractions(it)
+            Storage(5, listOf("a1", "b1", "c1"), 5),
+            Storage(5, listOf("a2", "b1", "c2"), 5)
+        ) {
+            assertEquals(OnChangedEvent(5, 1, null), it.onChangedEvents[0])
+            assertEquals(OnChangedEvent(7, 1, null), it.onChangedEvents[1])
+            assertEquals(2, it.interactions)
         }
     }
 
     @Test
     fun move() {
         validateTwoListDiff(
-                Storage(5, listOf("a", "b", "c", "d"), 5),
-                Storage(5, listOf("a", "b", "d", "c"), 5)) {
+            Storage(5, listOf("a", "b", "c", "d"), 5),
+            Storage(5, listOf("a", "b", "d", "c"), 5)
+        ) {
             // 8, 7 would also be valid, but below is what DiffUtil outputs
-            verify(it).onMoved(7, 8)
-            verifyNoMoreInteractions(it)
+            assertEquals(OnMovedEvent(7, 8), it.onMovedEvents[0])
+            assertEquals(1, it.interactions)
         }
     }
 
     @Test
     fun transformAnchorIndex_removal() {
         validateTwoListDiffTransform(
-                Storage(5, listOf("a", "b", "c", "d", "e"), 5),
-                Storage(5, listOf("a", "d", "e"), 5)) { transformAnchorIndex ->
+            Storage(5, listOf("a", "b", "c", "d", "e"), 5),
+            Storage(5, listOf("a", "d", "e"), 5)
+        ) { transformAnchorIndex ->
             // a doesn't move
             assertEquals(5, transformAnchorIndex(5))
 
@@ -119,8 +124,9 @@
     @Test
     fun transformAnchorIndex_insert() {
         validateTwoListDiffTransform(
-                Storage(5, listOf("a", "d", "e"), 5),
-                Storage(5, listOf("a", "b", "c", "d", "e"), 5)) { transformAnchorIndex ->
+            Storage(5, listOf("a", "d", "e"), 5),
+            Storage(5, listOf("a", "b", "c", "d", "e"), 5)
+        ) { transformAnchorIndex ->
             // a doesn't move
             assertEquals(5, transformAnchorIndex(5))
 
@@ -133,8 +139,9 @@
     @Test
     fun transformAnchorIndex_move() {
         validateTwoListDiffTransform(
-                Storage(5, listOf("a", "d", "e", "b", "c"), 5),
-                Storage(5, listOf("a", "b", "c", "d", "e"), 5)) { transformAnchorIndex ->
+            Storage(5, listOf("a", "d", "e", "b", "c"), 5),
+            Storage(5, listOf("a", "b", "c", "d", "e"), 5)
+        ) { transformAnchorIndex ->
             assertEquals(5, transformAnchorIndex(5))
             assertEquals(8, transformAnchorIndex(6))
             assertEquals(9, transformAnchorIndex(7))
@@ -146,8 +153,9 @@
     @Test
     fun transformAnchorIndex_allMissing() {
         validateTwoListDiffTransform(
-                Storage(5, listOf("a", "d", "e", "b", "c"), 5),
-                Storage(5, listOf("f", "g", "h", "i", "j"), 5)) { transformAnchorIndex ->
+            Storage(5, listOf("a", "d", "e", "b", "c"), 5),
+            Storage(5, listOf("f", "g", "h", "i", "j"), 5)
+        ) { transformAnchorIndex ->
             assertEquals(5, transformAnchorIndex(5))
             assertEquals(6, transformAnchorIndex(6))
             assertEquals(7, transformAnchorIndex(7))
@@ -159,8 +167,9 @@
     @Test
     fun transformAnchorIndex_offset() {
         validateTwoListDiffTransform(
-                Storage(5, listOf("a"), 6),
-                Storage(7, listOf("a"), 8)) { transformAnchorIndex ->
+            Storage(5, listOf("a"), 6),
+            Storage(7, listOf("a"), 8)
+        ) { transformAnchorIndex ->
             assertEquals(7, transformAnchorIndex(5))
         }
     }
@@ -168,8 +177,9 @@
     @Test
     fun transformAnchorIndex_nullBehavior() {
         validateTwoListDiffTransform(
-                Storage(3, listOf("a"), 4),
-                Storage(1, listOf("a"), 2)) { transformAnchorIndex ->
+            Storage(3, listOf("a"), 4),
+            Storage(1, listOf("a"), 2)
+        ) { transformAnchorIndex ->
             // null, so map to same position in new list
             assertEquals(0, transformAnchorIndex(0))
             assertEquals(1, transformAnchorIndex(1))
@@ -188,8 +198,9 @@
     @Test
     fun transformAnchorIndex_boundaryBehavior() {
         validateTwoListDiffTransform(
-                Storage(3, listOf("a"), 4),
-                Storage(1, listOf("a"), 2)) { transformAnchorIndex ->
+            Storage(3, listOf("a"), 4),
+            Storage(1, listOf("a"), 2)
+        ) { transformAnchorIndex ->
             // shouldn't happen, but to be safe, indices are clamped
             assertEquals(0, transformAnchorIndex(-1))
             assertEquals(3, transformAnchorIndex(100))
@@ -211,14 +222,15 @@
         private fun validateTwoListDiff(
             oldList: Storage,
             newList: Storage,
-            validator: (callback: ListUpdateCallback) -> Unit
+            validator: (callback: ListUpdateCallbackFake) -> Unit
         ) {
             val diffResult = oldList.computeDiff(newList, DIFF_CALLBACK)
-            val listUpdateCallback = mock(ListUpdateCallback::class.java)
+            val listUpdateCallback = ListUpdateCallbackFake()
             oldList.dispatchDiff(listUpdateCallback, newList, diffResult)
 
             validator(listUpdateCallback)
         }
+
         private fun validateTwoListDiffTransform(
             oldList: Storage,
             newList: Storage,
@@ -226,9 +238,10 @@
         ) {
             validator {
                 oldList.transformAnchorIndex(
-                        oldList.computeDiff(newList, DIFF_CALLBACK),
-                        newList,
-                        it)
+                    oldList.computeDiff(newList, DIFF_CALLBACK),
+                    newList,
+                    it
+                )
             }
         }
     }
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/PagedListAdapterTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/PagedListAdapterTest.kt
index 2480c96..28d9957 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/PagedListAdapterTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/PagedListAdapterTest.kt
@@ -27,11 +27,6 @@
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import org.mockito.Mockito.mock
-import org.mockito.Mockito.reset
-import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
 
 @MediumTest
 @RunWith(JUnit4::class)
@@ -77,18 +72,15 @@
 
     @Test
     fun initialState() {
-        @Suppress("UNCHECKED_CAST", "DEPRECATION")
-        val listenerLegacy = mock(AsyncPagedListDiffer.PagedListListener::class.java)
-                as AsyncPagedListDiffer.PagedListListener<String>
-        @Suppress("UNCHECKED_CAST", "DEPRECATION")
-        val listener = mock(AsyncPagedListDiffer.PagedListListener::class.java)
-                as AsyncPagedListDiffer.PagedListListener<String>
+        val listenerLegacy = PagedListListenerFake<String>()
+        val listener = PagedListListenerFake<String>()
 
         val adapter = Adapter(listenerLegacy, listener)
         assertEquals(0, adapter.itemCount)
         assertEquals(null, adapter.currentList)
-        verifyZeroInteractions(listenerLegacy)
-        verifyZeroInteractions(listener)
+
+        assertEquals(0, listenerLegacy.onCurrentListChangedEvents.size)
+        assertEquals(0, listener.onCurrentListChangedEvents.size)
     }
 
     @Test
@@ -117,88 +109,99 @@
         assertSame(list, adapter.currentList)
     }
 
-    private fun verifyZeroInteractions(
-        @Suppress("DEPRECATION")
-        legacyListener: AsyncPagedListDiffer.PagedListListener<String>,
-        @Suppress("DEPRECATION")
-        listener: AsyncPagedListDiffer.PagedListListener<String>
-    ) {
-        verifyZeroInteractions(legacyListener)
-        verifyZeroInteractions(listener)
-    }
-
-    private fun verifyNoMoreInteractions(
-        @Suppress("DEPRECATION")
-        legacyListener: AsyncPagedListDiffer.PagedListListener<String>,
-        @Suppress("DEPRECATION")
-        listener: AsyncPagedListDiffer.PagedListListener<String>
-    ) {
-        verifyNoMoreInteractions(legacyListener)
-        verifyNoMoreInteractions(listener)
-    }
-
-    private fun verifyOnCurrentListChanged(
-        @Suppress("DEPRECATION") legacyListener: AsyncPagedListDiffer.PagedListListener<String>,
-        @Suppress("DEPRECATION") listener: AsyncPagedListDiffer.PagedListListener<String>,
-        @Suppress("DEPRECATION") previousList: PagedList<String>?,
-        @Suppress("DEPRECATION") currentList: PagedList<String>?
-    ) {
-        verify(legacyListener).onCurrentListChanged(null, currentList)
-        verify(listener).onCurrentListChanged(previousList, currentList)
-    }
-
     @Test
     fun callbacks() {
-        val callback = mock(Runnable::class.java)
-
-        @Suppress("UNCHECKED_CAST", "DEPRECATION")
-        val legacyListener = mock(AsyncPagedListDiffer.PagedListListener::class.java)
-                as AsyncPagedListDiffer.PagedListListener<String>
-        @Suppress("UNCHECKED_CAST", "DEPRECATION")
-        val listener = mock(AsyncPagedListDiffer.PagedListListener::class.java)
-                as AsyncPagedListDiffer.PagedListListener<String>
+        val callback = RunnableFake()
+        val legacyListener = PagedListListenerFake<String>()
+        val listener = PagedListListenerFake<String>()
 
         val adapter = Adapter(legacyListener, listener)
 
         // first - simple insert
         val first = StringPagedList(2, 2, "a", "b")
-        verifyZeroInteractions(legacyListener, listener)
+
+        // Assert no interactions with listeners
+        assertEquals(0, legacyListener.onCurrentListChangedEvents.size)
+        assertEquals(0, listener.onCurrentListChangedEvents.size)
+
         adapter.submitList(first, callback)
-        verifyOnCurrentListChanged(legacyListener, listener, null, first)
-        verifyNoMoreInteractions(legacyListener, listener)
-        verify(callback).run()
-        verifyNoMoreInteractions(callback)
-        reset(callback)
+
+        // Assert exactly 1 call to onCurrentListChanged with previousList = null,
+        // currentList = first.
+        assertEquals(1, legacyListener.onCurrentListChangedEvents.size)
+        assertEquals(
+            PagedListListenerFake.OnCurrentListChangedEvent(null, first),
+            legacyListener.onCurrentListChangedEvents[0]
+        )
+        assertEquals(1, listener.onCurrentListChangedEvents.size)
+        assertEquals(
+            PagedListListenerFake.OnCurrentListChangedEvent(null, first),
+            listener.onCurrentListChangedEvents[0]
+        )
+        // Assert exactly 1 call to callback.run().
+        assertEquals(1, callback.runEvents.size)
 
         // second - async update
         val second = StringPagedList(2, 2, "c", "d")
         adapter.submitList(second, callback)
-        verifyNoMoreInteractions(legacyListener, listener)
-        verifyNoMoreInteractions(callback)
-        drain()
-        verifyOnCurrentListChanged(legacyListener, listener, first, second)
 
-        verifyNoMoreInteractions(legacyListener, listener)
-        verify(callback).run()
-        verifyNoMoreInteractions(callback)
-        reset(callback)
+        // Assert no calls to onCurrentListChanged until async work is triggered by drain().
+        assertEquals(1, legacyListener.onCurrentListChangedEvents.size)
+        assertEquals(1, listener.onCurrentListChangedEvents.size)
+        // Assert no calls to callback.run() until async work is triggered by drain().
+        assertEquals(1, callback.runEvents.size)
+
+        drain()
+
+        // Assert exactly 1 call to onCurrentListChanged with previousList = first,
+        // currentList = second.
+        assertEquals(2, legacyListener.onCurrentListChangedEvents.size)
+        assertEquals(
+            PagedListListenerFake.OnCurrentListChangedEvent(null, second),
+            legacyListener.onCurrentListChangedEvents[1]
+        )
+        assertEquals(2, listener.onCurrentListChangedEvents.size)
+        assertEquals(
+            PagedListListenerFake.OnCurrentListChangedEvent(first, second),
+            listener.onCurrentListChangedEvents[1]
+        )
+        // Assert exactly 1 call to callback.run().
+        assertEquals(2, callback.runEvents.size)
 
         // third - same list - only triggers callback
         adapter.submitList(second, callback)
-        verifyNoMoreInteractions(legacyListener, listener)
-        verify(callback).run()
-        verifyNoMoreInteractions(callback)
+
+        // Assert no calls to onCurrentListChanged.
+        assertEquals(2, legacyListener.onCurrentListChangedEvents.size)
+        assertEquals(2, listener.onCurrentListChangedEvents.size)
+        // Assert exactly 1 call to callback.run().
+        assertEquals(3, callback.runEvents.size)
+
         drain()
-        verifyNoMoreInteractions(legacyListener, listener)
-        verifyNoMoreInteractions(callback)
-        reset(callback)
+
+        // Assert no calls to onCurrentListChanged.
+        assertEquals(2, legacyListener.onCurrentListChangedEvents.size)
+        assertEquals(2, listener.onCurrentListChangedEvents.size)
+        // Assert no calls to callback.run().
+        assertEquals(3, callback.runEvents.size)
 
         // fourth - null
         adapter.submitList(null, callback)
-        verifyOnCurrentListChanged(legacyListener, listener, second, null)
-        verifyNoMoreInteractions(legacyListener, listener)
-        verify(callback).run()
-        verifyNoMoreInteractions(callback)
+
+        // Assert exactly 1 call to onCurrentListChanged with previousList = second,
+        // currentList = null.
+        assertEquals(3, legacyListener.onCurrentListChangedEvents.size)
+        assertEquals(
+            PagedListListenerFake.OnCurrentListChangedEvent<String>(null, null),
+            legacyListener.onCurrentListChangedEvents[2]
+        )
+        assertEquals(3, listener.onCurrentListChangedEvents.size)
+        assertEquals(
+            PagedListListenerFake.OnCurrentListChangedEvent(second, null),
+            listener.onCurrentListChangedEvents[2]
+        )
+        // Assert exactly 1 call to callback.run().
+        assertEquals(4, callback.runEvents.size)
     }
 
     private fun drain() {
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/PagedListListenerFake.kt b/paging/runtime/src/androidTest/java/androidx/paging/PagedListListenerFake.kt
new file mode 100644
index 0000000..82ec3d3
--- /dev/null
+++ b/paging/runtime/src/androidTest/java/androidx/paging/PagedListListenerFake.kt
@@ -0,0 +1,36 @@
+/*
+ * 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.paging
+
+@Suppress("DEPRECATION")
+class PagedListListenerFake<T : Any> : AsyncPagedListDiffer.PagedListListener<T> {
+    val onCurrentListChangedEvents = mutableListOf<OnCurrentListChangedEvent<T>>()
+
+    override fun onCurrentListChanged(previousList: PagedList<T>?, currentList: PagedList<T>?) {
+        onCurrentListChangedEvents.add(
+            OnCurrentListChangedEvent(
+                previousList,
+                currentList
+            )
+        )
+    }
+
+    data class OnCurrentListChangedEvent<T : Any>(
+        val previousList: PagedList<T>?,
+        val currentList: PagedList<T>?
+    )
+}
\ No newline at end of file
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/RunnableFake.kt b/paging/runtime/src/androidTest/java/androidx/paging/RunnableFake.kt
new file mode 100644
index 0000000..7378d36
--- /dev/null
+++ b/paging/runtime/src/androidTest/java/androidx/paging/RunnableFake.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.paging
+
+class RunnableFake : Runnable {
+    val runEvents = mutableListOf<Unit>()
+
+    override fun run() {
+        runEvents.add(Unit)
+    }
+}
\ No newline at end of file
diff --git a/paging/runtime/src/main/java/androidx/paging/PagingDataAdapter.kt b/paging/runtime/src/main/java/androidx/paging/PagingDataAdapter.kt
index 87dc94a..0c32a94 100644
--- a/paging/runtime/src/main/java/androidx/paging/PagingDataAdapter.kt
+++ b/paging/runtime/src/main/java/androidx/paging/PagingDataAdapter.kt
@@ -59,6 +59,18 @@
     )
 
     /**
+     * Note: [getItemId] is final, because stable IDs are unnecessary and therefore unsupported.
+     *
+     * [PagingDataAdapter]'s async diffing means that efficient change animations are handled for
+     * you, without the performance drawbacks of [RecyclerView.Adapter.notifyDataSetChanged].
+     * Instead, the diffCallback parameter of the [PagingDataAdapter] serves the same
+     * functionality - informing the adapter and [RecyclerView] how items are changed and moved.
+     */
+    final override fun getItemId(position: Int): Long {
+        return super.getItemId(position)
+    }
+
+    /**
      * Present the new [PagingData], and suspend as long as it is not invalidated.
      *
      * This method should be called on the same [CoroutineDispatcher] where updates will be
diff --git a/playground/.gitignore b/playground/.gitignore
new file mode 100644
index 0000000..603b140
--- /dev/null
+++ b/playground/.gitignore
@@ -0,0 +1,14 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
diff --git a/playground/.idea/codeStyles b/playground/.idea/codeStyles
new file mode 100644
index 0000000..e2e415d
--- /dev/null
+++ b/playground/.idea/codeStyles
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleConfiguration">
+    <code_scheme name="Project" version="173">
+      <codeStyleSettings language="XML">
+        <indentOptions>
+          <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        </indentOptions>
+        <arrangement>
+          <rules>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>xmlns:android</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>xmlns:.*</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:id</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*:name</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>name</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>style</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>^$</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>ANDROID_ATTRIBUTE_ORDER</order>
+              </rule>
+            </section>
+            <section>
+              <rule>
+                <match>
+                  <AND>
+                    <NAME>.*</NAME>
+                    <XML_ATTRIBUTE />
+                    <XML_NAMESPACE>.*</XML_NAMESPACE>
+                  </AND>
+                </match>
+                <order>BY_NAME</order>
+              </rule>
+            </section>
+          </rules>
+        </arrangement>
+      </codeStyleSettings>
+    </code_scheme>
+  </component>
+</project>
\ No newline at end of file
diff --git a/playground/benchmark b/playground/benchmark
new file mode 120000
index 0000000..2fd5942
--- /dev/null
+++ b/playground/benchmark
@@ -0,0 +1 @@
+../benchmark
\ No newline at end of file
diff --git a/playground/build.gradle b/playground/build.gradle
new file mode 100644
index 0000000..2098142
--- /dev/null
+++ b/playground/build.gradle
@@ -0,0 +1,78 @@
+/*
+ * 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 org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import androidx.build.AndroidXRootPlugin
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+        jcenter()
+        maven {
+            url 'https://androidx.dev/metalava/builds/6401339/artifacts/repo/m2repository'
+            metadataSources {
+                mavenPom()
+                artifact()
+            }
+        }
+        maven {
+            url 'https://androidx.dev/dokka/builds/6402791/artifacts/repository'
+            metadataSources {
+                mavenPom()
+                artifact()
+            }
+        }
+    }
+
+    ext.supportRootFolder = project.projectDir.getParentFile()
+    // The docs-* tasks expect a property `repos` to be defined so we
+    // are just initializing it to an empty Map.
+    ext.repos = [:]
+    apply from: '../buildSrc/build_dependencies.gradle'
+    dependencies {
+        classpath build_libs.agp
+        classpath build_libs.kotlin.gradle_plugin
+        classpath 'androidx.build:gradle-plugin:0.1.0'
+    }
+}
+
+apply from: "../buildSrc/out.gradle"
+init.chooseOutDir("/playground")
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        jcenter()
+        maven {
+            url 'https://androidx.dev/metalava/builds/6401339/artifacts/repo/m2repository'
+            metadataSources {
+                mavenPom()
+                artifact()
+            }
+        }
+        maven {
+            url 'https://androidx.dev/dokka/builds/6402791/artifacts/repository'
+            metadataSources {
+                mavenPom()
+                artifact()
+            }
+        }
+    }
+}
+
+apply plugin: AndroidXRootPlugin
diff --git a/playground/gradle.properties b/playground/gradle.properties
new file mode 100644
index 0000000..1735152
--- /dev/null
+++ b/playground/gradle.properties
@@ -0,0 +1,37 @@
+#
+# 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.
+#
+
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
\ No newline at end of file
diff --git a/playground/gradle/wrapper/gradle-wrapper.jar b/playground/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..f6b961f
--- /dev/null
+++ b/playground/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/playground/gradle/wrapper/gradle-wrapper.properties b/playground/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..a0bcfbe
--- /dev/null
+++ b/playground/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Apr 04 20:07:27 PDT 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
diff --git a/playground/gradlew b/playground/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/playground/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/playground/gradlew.bat b/playground/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/playground/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off

+@rem ##########################################################################

+@rem

+@rem  Gradle startup script for Windows

+@rem

+@rem ##########################################################################

+

+@rem Set local scope for the variables with windows NT shell

+if "%OS%"=="Windows_NT" setlocal

+

+set DIRNAME=%~dp0

+if "%DIRNAME%" == "" set DIRNAME=.

+set APP_BASE_NAME=%~n0

+set APP_HOME=%DIRNAME%

+

+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

+set DEFAULT_JVM_OPTS=

+

+@rem Find java.exe

+if defined JAVA_HOME goto findJavaFromJavaHome

+

+set JAVA_EXE=java.exe

+%JAVA_EXE% -version >NUL 2>&1

+if "%ERRORLEVEL%" == "0" goto init

+

+echo.

+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

+echo.

+echo Please set the JAVA_HOME variable in your environment to match the

+echo location of your Java installation.

+

+goto fail

+

+:findJavaFromJavaHome

+set JAVA_HOME=%JAVA_HOME:"=%

+set JAVA_EXE=%JAVA_HOME%/bin/java.exe

+

+if exist "%JAVA_EXE%" goto init

+

+echo.

+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

+echo.

+echo Please set the JAVA_HOME variable in your environment to match the

+echo location of your Java installation.

+

+goto fail

+

+:init

+@rem Get command-line arguments, handling Windows variants

+

+if not "%OS%" == "Windows_NT" goto win9xME_args

+

+:win9xME_args

+@rem Slurp the command line arguments.

+set CMD_LINE_ARGS=

+set _SKIP=2

+

+:win9xME_args_slurp

+if "x%~1" == "x" goto execute

+

+set CMD_LINE_ARGS=%*

+

+:execute

+@rem Setup the command line

+

+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+

+@rem Execute Gradle

+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

+

+:end

+@rem End local scope for the variables with windows NT shell

+if "%ERRORLEVEL%"=="0" goto mainEnd

+

+:fail

+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

+rem the _cmd.exe /c_ return code!

+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

+exit /b 1

+

+:mainEnd

+if "%OS%"=="Windows_NT" endlocal

+

+:omega

diff --git a/playground/settings.gradle b/playground/settings.gradle
new file mode 100644
index 0000000..6a2472b
--- /dev/null
+++ b/playground/settings.gradle
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        jcenter()
+    }
+}
+
+rootProject.name = "playground"
+
+def includeProject(name, filePath) {
+    settings.include(name)
+
+    def file
+    if (filePath instanceof String) {
+        file = new File(rootDir, filePath)
+    } else {
+        file = filePath
+    }
+    if (!file.exists()) {
+        // This option is supported so that development/simplify_build_failure.sh can try
+        // deleting entire projects at once to identify the cause of a build failure
+        if (System.getenv("ALLOW_MISSING_PROJECTS") == null) {
+            throw new Exception("Path " + file + " does not exist; cannot include project " + name)
+        }
+    }
+    project(name).projectDir = file
+}
+
+includeBuild("../androidx-plugin")
+
+includeProject(":benchmark:benchmark-common", "benchmark/common")
+includeProject(":fakeannotations", "../fakeannotations")
+includeProject(":lint-checks", "../lint-checks")
+includeProject(":lint-checks:tests", "../lint-checks/tests")
+includeProject(":mppsample:mppsample-library", "../mppsample/mppsample-library")
+includeProject(":mppsample:mppsample-executable", "../mppsample/mppsample-executable")
+includeProject(":tracing:tracing", "../tracing/tracing")
+includeProject(":tracing:tracing-ktx", "../tracing/tracing-ktx")
+
+if (!startParameter.projectProperties.containsKey('android.injected.invoked.from.ide')) {
+    // we don't need it in ide, so we don't configure it there
+    includeProject(":docs-fake", "../docs-fake")
+    includeProject(":docs-runner", "../docs-runner")
+}
diff --git a/preference/preference/res/values-af/strings.xml b/preference/preference/res/values-af/strings.xml
index 362b1a1..0e34cd7 100644
--- a/preference/preference/res/values-af/strings.xml
+++ b/preference/preference/res/values-af/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"AAN"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"AF"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Gevorderd"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopieer"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" is na knipbord gekopieer."</string>
-    <string name="not_set" msgid="478774118347071097">"Nie gestel nie"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"AAN"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"AF"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Gevorderd"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopieer"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" is na knipbord gekopieer."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nie gestel nie"</string>
 </resources>
diff --git a/preference/preference/res/values-am/strings.xml b/preference/preference/res/values-am/strings.xml
index 017ce48..817891c 100644
--- a/preference/preference/res/values-am/strings.xml
+++ b/preference/preference/res/values-am/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"በርቷል"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ጠፍቷል"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"የላቀ"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>፣ <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"ቅዳ"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"«<xliff:g id="SUMMARY">%1$s</xliff:g>» ወደ የቅንጥብ ሰሌዳ ተቀድቷል።"</string>
-    <string name="not_set" msgid="478774118347071097">"አልተዘጋጀም"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"በርቷል"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ጠፍቷል"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"የላቀ"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>፣ <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"ቅዳ"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"«<xliff:g id="SUMMARY">%1$s</xliff:g>» ወደ የቅንጥብ ሰሌዳ ተቀድቷል።"</string>
+    <string name="not_set" msgid="6573031135582639649">"አልተዘጋጀም"</string>
 </resources>
diff --git a/preference/preference/res/values-ar/strings.xml b/preference/preference/res/values-ar/strings.xml
index 5303ed5..65864a0 100644
--- a/preference/preference/res/values-ar/strings.xml
+++ b/preference/preference/res/values-ar/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"تفعيل"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"إيقاف"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"إعدادات متقدمة"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>، <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"نسخ"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"تم نسخ \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" إلى الحافظة."</string>
-    <string name="not_set" msgid="478774118347071097">"لم يتمّ تحديد قيمة."</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"تفعيل"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"إيقاف"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"إعدادات متقدمة"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>، <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"نسخ"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"تم نسخ \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" إلى الحافظة."</string>
+    <string name="not_set" msgid="6573031135582639649">"لم يتمّ تحديد قيمة."</string>
 </resources>
diff --git a/preference/preference/res/values-as/strings.xml b/preference/preference/res/values-as/strings.xml
index 9c57615..4f68af3 100644
--- a/preference/preference/res/values-as/strings.xml
+++ b/preference/preference/res/values-as/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"অন কৰক"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"অফ অৱস্থাত আছে"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"উন্নত"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"প্ৰতিলিপি কৰক"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ক্লিপব’ৰ্ডত প্ৰতিলিপি কৰা হ’ল"</string>
-    <string name="not_set" msgid="478774118347071097">"ছেট কৰা হোৱা নাই"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"অন কৰক"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"অফ অৱস্থাত আছে"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"উন্নত"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"প্ৰতিলিপি কৰক"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ক্লিপব’ৰ্ডত প্ৰতিলিপি কৰা হ’ল"</string>
+    <string name="not_set" msgid="6573031135582639649">"ছেট কৰা হোৱা নাই"</string>
 </resources>
diff --git a/preference/preference/res/values-az/strings.xml b/preference/preference/res/values-az/strings.xml
index f6b48bb..f0a7068 100644
--- a/preference/preference/res/values-az/strings.xml
+++ b/preference/preference/res/values-az/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"AKTİV"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DEAKTİV"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Qabaqcıl ayarlar"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopyalayın"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" buferə kopyalandı."</string>
-    <string name="not_set" msgid="478774118347071097">"Ayarlanmayıb"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"AKTİV"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DEAKTİV"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Qabaqcıl ayarlar"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopyalayın"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" buferə kopyalandı."</string>
+    <string name="not_set" msgid="6573031135582639649">"Ayarlanmayıb"</string>
 </resources>
diff --git a/preference/preference/res/values-b+sr+Latn/strings.xml b/preference/preference/res/values-b+sr+Latn/strings.xml
index 4cd842f..e9995aa 100644
--- a/preference/preference/res/values-b+sr+Latn/strings.xml
+++ b/preference/preference/res/values-b+sr+Latn/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"UKLJUČENO"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ISKLJUČENO"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Napredno"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopiraj"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Rezime „<xliff:g id="SUMMARY">%1$s</xliff:g>“ je kopiran u privremenu memoriju."</string>
-    <string name="not_set" msgid="478774118347071097">"Nije podešeno"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"UKLJUČENO"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ISKLJUČENO"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Napredno"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopiraj"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Rezime „<xliff:g id="SUMMARY">%1$s</xliff:g>“ je kopiran u privremenu memoriju."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nije podešeno"</string>
 </resources>
diff --git a/preference/preference/res/values-be/strings.xml b/preference/preference/res/values-be/strings.xml
index 0dd40c7..cd33eb7 100644
--- a/preference/preference/res/values-be/strings.xml
+++ b/preference/preference/res/values-be/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"УКЛ."</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ВЫКЛ."</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Пашыраныя налады"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Капіраваць"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\": скапіравана ў буфер абмену."</string>
-    <string name="not_set" msgid="478774118347071097">"Не зададзена"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"УКЛ."</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ВЫКЛ."</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Пашыраныя налады"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Капіраваць"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\": скапіравана ў буфер абмену."</string>
+    <string name="not_set" msgid="6573031135582639649">"Не зададзена"</string>
 </resources>
diff --git a/preference/preference/res/values-bg/strings.xml b/preference/preference/res/values-bg/strings.xml
index 70c15e2..4949353 100644
--- a/preference/preference/res/values-bg/strings.xml
+++ b/preference/preference/res/values-bg/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ВКЛ."</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ИЗКЛ."</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Разширени"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Копиране"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Копирахте „<xliff:g id="SUMMARY">%1$s</xliff:g>“ в буферната памет."</string>
-    <string name="not_set" msgid="478774118347071097">"Не е зададено"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ВКЛ."</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ИЗКЛ."</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Разширени"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Копиране"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Копирахте „<xliff:g id="SUMMARY">%1$s</xliff:g>“ в буферната памет."</string>
+    <string name="not_set" msgid="6573031135582639649">"Не е зададено"</string>
 </resources>
diff --git a/preference/preference/res/values-bn/strings.xml b/preference/preference/res/values-bn/strings.xml
index 1632abc..6b516ce 100644
--- a/preference/preference/res/values-bn/strings.xml
+++ b/preference/preference/res/values-bn/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"চালু"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"বন্ধ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"উন্নত"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"কপি করুন"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ক্লিপবোর্ডে লিঙ্কটি কপি করা হয়েছে।"</string>
-    <string name="not_set" msgid="478774118347071097">"সেট করা হয়নি"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"চালু"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"বন্ধ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"উন্নত"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"কপি করুন"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ক্লিপবোর্ডে লিঙ্কটি কপি করা হয়েছে।"</string>
+    <string name="not_set" msgid="6573031135582639649">"সেট করা হয়নি"</string>
 </resources>
diff --git a/preference/preference/res/values-bs/strings.xml b/preference/preference/res/values-bs/strings.xml
index c510249..9c72782 100644
--- a/preference/preference/res/values-bs/strings.xml
+++ b/preference/preference/res/values-bs/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"UKLJUČENO"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ISKLJUČENO"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Napredno"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopiraj"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" kopirano u međuspremnik."</string>
-    <string name="not_set" msgid="478774118347071097">"Nije postavljeno"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"UKLJUČENO"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ISKLJUČENO"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Napredno"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopiraj"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" kopirano u međuspremnik."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nije postavljeno"</string>
 </resources>
diff --git a/preference/preference/res/values-ca/strings.xml b/preference/preference/res/values-ca/strings.xml
index 84be4f3..560d486 100644
--- a/preference/preference/res/values-ca/strings.xml
+++ b/preference/preference/res/values-ca/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ACTIVAT"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DESACTIVAT"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Opcions avançades"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copia"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" s\'ha copiat al porta-retalls"</string>
-    <string name="not_set" msgid="478774118347071097">"Sense definir"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ACTIVAT"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DESACTIVAT"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Opcions avançades"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copia"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" s\'ha copiat al porta-retalls"</string>
+    <string name="not_set" msgid="6573031135582639649">"No definit"</string>
 </resources>
diff --git a/preference/preference/res/values-cs/strings.xml b/preference/preference/res/values-cs/strings.xml
index e0f41e4..050678d 100644
--- a/preference/preference/res/values-cs/strings.xml
+++ b/preference/preference/res/values-cs/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ZAP"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"Vypnutí"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Rozšířená nastavení"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopírovat"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Položka <xliff:g id="SUMMARY">%1$s</xliff:g> byla zkopírována do schránky."</string>
-    <string name="not_set" msgid="478774118347071097">"Nenastaveno"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ZAP"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"Vypnutí"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Rozšířená nastavení"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopírovat"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Položka <xliff:g id="SUMMARY">%1$s</xliff:g> byla zkopírována do schránky."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nenastaveno"</string>
 </resources>
diff --git a/preference/preference/res/values-da/strings.xml b/preference/preference/res/values-da/strings.xml
index a9e0dc4..4ac0b20 100644
--- a/preference/preference/res/values-da/strings.xml
+++ b/preference/preference/res/values-da/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"TIL"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"FRA"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Avanceret"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopiér"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" blev kopieret til udklipsholderen."</string>
-    <string name="not_set" msgid="478774118347071097">"Ikke angivet"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"TIL"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"FRA"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Avanceret"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopiér"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" blev kopieret til udklipsholderen."</string>
+    <string name="not_set" msgid="6573031135582639649">"Ikke angivet"</string>
 </resources>
diff --git a/preference/preference/res/values-de/strings.xml b/preference/preference/res/values-de/strings.xml
index c11be1c..eaab979 100644
--- a/preference/preference/res/values-de/strings.xml
+++ b/preference/preference/res/values-de/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"AN"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"AUS"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Erweitert"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopieren"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" in Zwischenablage kopiert."</string>
-    <string name="not_set" msgid="478774118347071097">"Nicht festgelegt"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"AN"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"AUS"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Erweitert"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopieren"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" in Zwischenablage kopiert."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nicht festgelegt"</string>
 </resources>
diff --git a/preference/preference/res/values-el/strings.xml b/preference/preference/res/values-el/strings.xml
index 2830b9f..55c2e54 100644
--- a/preference/preference/res/values-el/strings.xml
+++ b/preference/preference/res/values-el/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ΕΝΕΡΓΗ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ΑΝΕΝΕΡΓΗ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Σύνθετες"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Αντιγραφή"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Το \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" αντιγράφηκε στο πρόχειρο."</string>
-    <string name="not_set" msgid="478774118347071097">"Δεν έχει οριστεί"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ΕΝΕΡΓΗ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ΑΝΕΝΕΡΓΗ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Σύνθετες"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Αντιγραφή"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Το \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" αντιγράφηκε στο πρόχειρο."</string>
+    <string name="not_set" msgid="6573031135582639649">"Δεν έχει οριστεί"</string>
 </resources>
diff --git a/preference/preference/res/values-en-rAU/strings.xml b/preference/preference/res/values-en-rAU/strings.xml
index b65023b..a16f7bf 100644
--- a/preference/preference/res/values-en-rAU/strings.xml
+++ b/preference/preference/res/values-en-rAU/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ON"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"OFF"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Advanced"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copy"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\' copied to clipboard."</string>
-    <string name="not_set" msgid="478774118347071097">"Not set"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ON"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"OFF"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Advanced"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copy"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\' copied to clipboard."</string>
+    <string name="not_set" msgid="6573031135582639649">"Not set"</string>
 </resources>
diff --git a/preference/preference/res/values-en-rCA/strings.xml b/preference/preference/res/values-en-rCA/strings.xml
index c8d1681..a16f7bf 100644
--- a/preference/preference/res/values-en-rCA/strings.xml
+++ b/preference/preference/res/values-en-rCA/strings.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ON"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"OFF"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Advanced"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ON"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"OFF"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Advanced"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copy"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\' copied to clipboard."</string>
+    <string name="not_set" msgid="6573031135582639649">"Not set"</string>
 </resources>
diff --git a/preference/preference/res/values-en-rGB/strings.xml b/preference/preference/res/values-en-rGB/strings.xml
index b65023b..a16f7bf 100644
--- a/preference/preference/res/values-en-rGB/strings.xml
+++ b/preference/preference/res/values-en-rGB/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ON"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"OFF"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Advanced"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copy"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\' copied to clipboard."</string>
-    <string name="not_set" msgid="478774118347071097">"Not set"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ON"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"OFF"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Advanced"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copy"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\' copied to clipboard."</string>
+    <string name="not_set" msgid="6573031135582639649">"Not set"</string>
 </resources>
diff --git a/preference/preference/res/values-en-rIN/strings.xml b/preference/preference/res/values-en-rIN/strings.xml
index b65023b..a16f7bf 100644
--- a/preference/preference/res/values-en-rIN/strings.xml
+++ b/preference/preference/res/values-en-rIN/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ON"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"OFF"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Advanced"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copy"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\' copied to clipboard."</string>
-    <string name="not_set" msgid="478774118347071097">"Not set"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ON"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"OFF"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Advanced"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copy"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\' copied to clipboard."</string>
+    <string name="not_set" msgid="6573031135582639649">"Not set"</string>
 </resources>
diff --git a/preference/preference/res/values-en-rXC/strings.xml b/preference/preference/res/values-en-rXC/strings.xml
index 96219e7..46210cd 100644
--- a/preference/preference/res/values-en-rXC/strings.xml
+++ b/preference/preference/res/values-en-rXC/strings.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎ON‎‏‎‎‏‎"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎OFF‎‏‎‎‏‎"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎Advanced‎‏‎‎‏‎"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎ON‎‏‎‎‏‎"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎OFF‎‏‎‎‏‎"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‏‎‎Advanced‎‏‎‎‏‎"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="copy" msgid="6083905920877235314">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎Copy‎‏‎‎‏‎"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎\"‎‏‎‎‏‏‎<xliff:g id="SUMMARY">%1$s</xliff:g>‎‏‎‎‏‏‏‎\" copied to clipboard.‎‏‎‎‏‎"</string>
+    <string name="not_set" msgid="6573031135582639649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎Not set‎‏‎‎‏‎"</string>
 </resources>
diff --git a/preference/preference/res/values-es-rUS/strings.xml b/preference/preference/res/values-es-rUS/strings.xml
index 12dba5a..1285185 100644
--- a/preference/preference/res/values-es-rUS/strings.xml
+++ b/preference/preference/res/values-es-rUS/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ACTIVADA"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DESACTIVADA"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Opciones avanzadas"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copiar"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Se copió \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" en el portapapeles."</string>
-    <string name="not_set" msgid="478774118347071097">"Sin definir"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ACTIVADA"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DESACTIVADA"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Opciones avanzadas"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copiar"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Se copió \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" en el portapapeles."</string>
+    <string name="not_set" msgid="6573031135582639649">"Sin definir"</string>
 </resources>
diff --git a/preference/preference/res/values-es/strings.xml b/preference/preference/res/values-es/strings.xml
index e57c287..34c3002 100644
--- a/preference/preference/res/values-es/strings.xml
+++ b/preference/preference/res/values-es/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ACTIVADO"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DESACTIVADA"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Avanzado"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copiar"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" se ha copiado en el portapapeles."</string>
-    <string name="not_set" msgid="478774118347071097">"Sin definir"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ACTIVADO"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DESACTIVADA"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Avanzado"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copiar"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" se ha copiado en el portapapeles."</string>
+    <string name="not_set" msgid="6573031135582639649">"Sin definir"</string>
 </resources>
diff --git a/preference/preference/res/values-et/strings.xml b/preference/preference/res/values-et/strings.xml
index 5976d46..e9b9176 100644
--- a/preference/preference/res/values-et/strings.xml
+++ b/preference/preference/res/values-et/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"SEES"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"VÄLJAS"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Täpsemad"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopeerimine"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"„<xliff:g id="SUMMARY">%1$s</xliff:g>” on lõikelauale kopeeritud."</string>
-    <string name="not_set" msgid="478774118347071097">"Määramata"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"SEES"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"VÄLJAS"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Täpsemad"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopeerimine"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"„<xliff:g id="SUMMARY">%1$s</xliff:g>” on lõikelauale kopeeritud."</string>
+    <string name="not_set" msgid="6573031135582639649">"Määramata"</string>
 </resources>
diff --git a/preference/preference/res/values-eu/strings.xml b/preference/preference/res/values-eu/strings.xml
index a8f3a27..73939c8 100644
--- a/preference/preference/res/values-eu/strings.xml
+++ b/preference/preference/res/values-eu/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"AKTIBATUTA"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DESAKTIBATUTA"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Hobespen aurreratuak"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopiatu"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Arbelean kopiatu da \"<xliff:g id="SUMMARY">%1$s</xliff:g>\"."</string>
-    <string name="not_set" msgid="478774118347071097">"Ez da ezarri"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"AKTIBATUTA"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DESAKTIBATUTA"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Hobespen aurreratuak"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopiatu"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Arbelean kopiatu da \"<xliff:g id="SUMMARY">%1$s</xliff:g>\"."</string>
+    <string name="not_set" msgid="6573031135582639649">"Ez da ezarri"</string>
 </resources>
diff --git a/preference/preference/res/values-fa/strings.xml b/preference/preference/res/values-fa/strings.xml
index 2c6d65b..540d00c 100644
--- a/preference/preference/res/values-fa/strings.xml
+++ b/preference/preference/res/values-fa/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"روشن"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"خاموش"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"پیشرفته"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>، <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"کپی"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"«<xliff:g id="SUMMARY">%1$s</xliff:g>» در بریده‌دان کپی شد."</string>
-    <string name="not_set" msgid="478774118347071097">"تنظیم نشده است"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"روشن"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"خاموش"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"پیشرفته"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>، <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"کپی"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"«<xliff:g id="SUMMARY">%1$s</xliff:g>» در بریده‌دان کپی شد."</string>
+    <string name="not_set" msgid="6573031135582639649">"تنظیم نشده است"</string>
 </resources>
diff --git a/preference/preference/res/values-fi/strings.xml b/preference/preference/res/values-fi/strings.xml
index 2fea435..a925765 100644
--- a/preference/preference/res/values-fi/strings.xml
+++ b/preference/preference/res/values-fi/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"KÄYTÖSSÄ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"POIS KÄYTÖSTÄ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Lisäasetukset"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopioi"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"<xliff:g id="SUMMARY">%1$s</xliff:g> kopioitiin leikepöydälle."</string>
-    <string name="not_set" msgid="478774118347071097">"Ei asetettu"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"KÄYTÖSSÄ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"POIS KÄYTÖSTÄ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Lisäasetukset"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopioi"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"<xliff:g id="SUMMARY">%1$s</xliff:g> kopioitiin leikepöydälle."</string>
+    <string name="not_set" msgid="6573031135582639649">"Ei asetettu"</string>
 </resources>
diff --git a/preference/preference/res/values-fr-rCA/strings.xml b/preference/preference/res/values-fr-rCA/strings.xml
index 1ba3fab..e92d40a 100644
--- a/preference/preference/res/values-fr-rCA/strings.xml
+++ b/preference/preference/res/values-fr-rCA/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ACTIVÉ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DÉSACTIVÉ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Avancé"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copier"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"« <xliff:g id="SUMMARY">%1$s</xliff:g> » copié dans le presse-papiers."</string>
-    <string name="not_set" msgid="478774118347071097">"Non défini"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ACTIVÉ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DÉSACTIVÉ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Avancé"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copier"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"« <xliff:g id="SUMMARY">%1$s</xliff:g> » copié dans le presse-papiers."</string>
+    <string name="not_set" msgid="6573031135582639649">"Non défini"</string>
 </resources>
diff --git a/preference/preference/res/values-fr/strings.xml b/preference/preference/res/values-fr/strings.xml
index 97fedcc..2b8a26a 100644
--- a/preference/preference/res/values-fr/strings.xml
+++ b/preference/preference/res/values-fr/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ACTIVÉ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DÉSACTIVÉ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Paramètres avancés"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copier"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" copié dans le presse-papier."</string>
-    <string name="not_set" msgid="478774118347071097">"Non définie"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ACTIVÉ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DÉSACTIVÉ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Paramètres avancés"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copier"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" copié dans le presse-papier."</string>
+    <string name="not_set" msgid="6573031135582639649">"Non définie"</string>
 </resources>
diff --git a/preference/preference/res/values-gl/strings.xml b/preference/preference/res/values-gl/strings.xml
index 51bb64d..5f3bdc3 100644
--- a/preference/preference/res/values-gl/strings.xml
+++ b/preference/preference/res/values-gl/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ACTIVADO"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DESACTIVADO"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Configuración avanzada"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copiar"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Copiouse \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" no portapapeis."</string>
-    <string name="not_set" msgid="478774118347071097">"Sen configurar"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ACTIVADO"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DESACTIVADO"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Configuración avanzada"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copiar"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Copiouse \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" no portapapeis."</string>
+    <string name="not_set" msgid="6573031135582639649">"Sen configurar"</string>
 </resources>
diff --git a/preference/preference/res/values-gu/strings.xml b/preference/preference/res/values-gu/strings.xml
index 7ea4dc8..9f50201 100644
--- a/preference/preference/res/values-gu/strings.xml
+++ b/preference/preference/res/values-gu/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ચાલુ કરો"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"બંધ કરો"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"વિગતવાર"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"કૉપિ કરો"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\"ને ક્લિપ બોર્ડ પર કૉપિ કર્યો."</string>
-    <string name="not_set" msgid="478774118347071097">"સેટ કર્યું નથી"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ચાલુ કરો"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"બંધ કરો"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"વિગતવાર"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"કૉપિ કરો"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\"ને ક્લિપ બોર્ડ પર કૉપિ કર્યો."</string>
+    <string name="not_set" msgid="6573031135582639649">"સેટ કર્યું નથી"</string>
 </resources>
diff --git a/preference/preference/res/values-hi/strings.xml b/preference/preference/res/values-hi/strings.xml
index 7b709b6..e7180f0 100644
--- a/preference/preference/res/values-hi/strings.xml
+++ b/preference/preference/res/values-hi/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"चालू"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"बंद"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"बेहतर सेटिंग"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"कॉपी करें"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" क्लिपबोर्ड पर कॉपी किया गया."</string>
-    <string name="not_set" msgid="478774118347071097">"सेट नहीं है"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"चालू"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"बंद"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"बेहतर सेटिंग"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"कॉपी करें"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" क्लिपबोर्ड पर कॉपी किया गया."</string>
+    <string name="not_set" msgid="6573031135582639649">"सेट नहीं है"</string>
 </resources>
diff --git a/preference/preference/res/values-hr/strings.xml b/preference/preference/res/values-hr/strings.xml
index a58823f..fd9e29c 100644
--- a/preference/preference/res/values-hr/strings.xml
+++ b/preference/preference/res/values-hr/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"UKLJUČENO"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ISKLJUČENO"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Napredno"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopiraj"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Sažetak \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" kopiran je u međuspremnik."</string>
-    <string name="not_set" msgid="478774118347071097">"Nije postavljeno"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"UKLJUČENO"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ISKLJUČENO"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Napredno"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopiraj"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Sažetak \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" kopiran je u međuspremnik."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nije postavljeno"</string>
 </resources>
diff --git a/preference/preference/res/values-hu/strings.xml b/preference/preference/res/values-hu/strings.xml
index 301655f..86aa99b 100644
--- a/preference/preference/res/values-hu/strings.xml
+++ b/preference/preference/res/values-hu/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"BE"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"KI"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Speciális"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Másolás"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"„<xliff:g id="SUMMARY">%1$s</xliff:g>” a vágólapra lett másolva."</string>
-    <string name="not_set" msgid="478774118347071097">"Nincs beállítva"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"BE"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"KI"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Speciális"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Másolás"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"„<xliff:g id="SUMMARY">%1$s</xliff:g>” a vágólapra lett másolva."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nincs beállítva"</string>
 </resources>
diff --git a/preference/preference/res/values-hy/strings.xml b/preference/preference/res/values-hy/strings.xml
index fbef98a..f5df86b 100644
--- a/preference/preference/res/values-hy/strings.xml
+++ b/preference/preference/res/values-hy/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ՄԻԱՑՎԱԾ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ԱՆՋԱՏԱԾ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Լրացուցիչ"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Պատճենել"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"«<xliff:g id="SUMMARY">%1$s</xliff:g>». պատճենվեց սեղմատախտակին:"</string>
-    <string name="not_set" msgid="478774118347071097">"Կարգավորված չէ"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ՄԻԱՑՎԱԾ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ԱՆՋԱՏԱԾ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Լրացուցիչ"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Պատճենել"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"«<xliff:g id="SUMMARY">%1$s</xliff:g>». պատճենվեց սեղմատախտակին:"</string>
+    <string name="not_set" msgid="6573031135582639649">"Կարգավորված չէ"</string>
 </resources>
diff --git a/preference/preference/res/values-in/strings.xml b/preference/preference/res/values-in/strings.xml
index 5853135..f9da4ed 100644
--- a/preference/preference/res/values-in/strings.xml
+++ b/preference/preference/res/values-in/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"AKTIF"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"NONAKTIF"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Lanjutan"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Salin"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" disalin ke papan klip."</string>
-    <string name="not_set" msgid="478774118347071097">"Belum disetel"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"AKTIF"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"NONAKTIF"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Lanjutan"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Salin"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" disalin ke papan klip."</string>
+    <string name="not_set" msgid="6573031135582639649">"Belum disetel"</string>
 </resources>
diff --git a/preference/preference/res/values-is/strings.xml b/preference/preference/res/values-is/strings.xml
index 4c131c0..6f18154 100644
--- a/preference/preference/res/values-is/strings.xml
+++ b/preference/preference/res/values-is/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"KVEIKT"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"SLÖKKT"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Ítarlegt"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Afrita"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"„<xliff:g id="SUMMARY">%1$s</xliff:g>“ afritað á klippiborðið."</string>
-    <string name="not_set" msgid="478774118347071097">"Ekki stillt"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"KVEIKT"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"SLÖKKT"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Ítarlegt"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Afrita"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"„<xliff:g id="SUMMARY">%1$s</xliff:g>“ afritað á klippiborðið."</string>
+    <string name="not_set" msgid="6573031135582639649">"Ekki stillt"</string>
 </resources>
diff --git a/preference/preference/res/values-it/strings.xml b/preference/preference/res/values-it/strings.xml
index 61f836eab..70451a8 100644
--- a/preference/preference/res/values-it/strings.xml
+++ b/preference/preference/res/values-it/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ON"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"OFF"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Avanzate"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copia"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\"copiato negli appunti."</string>
-    <string name="not_set" msgid="478774118347071097">"Non impostato"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ON"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"OFF"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Avanzate"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copia"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\"copiato negli appunti."</string>
+    <string name="not_set" msgid="6573031135582639649">"Non impostato"</string>
 </resources>
diff --git a/preference/preference/res/values-iw/strings.xml b/preference/preference/res/values-iw/strings.xml
index e665ae6..3cbf203 100644
--- a/preference/preference/res/values-iw/strings.xml
+++ b/preference/preference/res/values-iw/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"מופעל"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"כבוי"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"מתקדם"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"העתקה"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" הועתק ללוח."</string>
-    <string name="not_set" msgid="478774118347071097">"לא מוגדרת"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"מופעל"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"כבוי"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"מתקדם"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"העתקה"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" הועתק ללוח."</string>
+    <string name="not_set" msgid="6573031135582639649">"לא מוגדרת"</string>
 </resources>
diff --git a/preference/preference/res/values-ja/strings.xml b/preference/preference/res/values-ja/strings.xml
index 7681446..80ec03a 100644
--- a/preference/preference/res/values-ja/strings.xml
+++ b/preference/preference/res/values-ja/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ON"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"OFF"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"詳細設定"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>、<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"コピー"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"「<xliff:g id="SUMMARY">%1$s</xliff:g>」をクリップボードにコピーしました。"</string>
-    <string name="not_set" msgid="478774118347071097">"未設定"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ON"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"OFF"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"詳細設定"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>、<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"コピー"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"「<xliff:g id="SUMMARY">%1$s</xliff:g>」をクリップボードにコピーしました。"</string>
+    <string name="not_set" msgid="6573031135582639649">"未設定"</string>
 </resources>
diff --git a/preference/preference/res/values-ka/strings.xml b/preference/preference/res/values-ka/strings.xml
index b4b1f4d..c232637 100644
--- a/preference/preference/res/values-ka/strings.xml
+++ b/preference/preference/res/values-ka/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ჩართული"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"გამორთული"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"დამატებით"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"კოპირება"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"„<xliff:g id="SUMMARY">%1$s</xliff:g>“ კოპირებულია გაცვლის ბუფერში."</string>
-    <string name="not_set" msgid="478774118347071097">"არ არის დაყენებული"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ჩართული"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"გამორთული"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"დამატებით"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"კოპირება"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"„<xliff:g id="SUMMARY">%1$s</xliff:g>“ კოპირებულია გაცვლის ბუფერში."</string>
+    <string name="not_set" msgid="6573031135582639649">"არ არის დაყენებული"</string>
 </resources>
diff --git a/preference/preference/res/values-kk/strings.xml b/preference/preference/res/values-kk/strings.xml
index 448c55d6..6d96df9 100644
--- a/preference/preference/res/values-kk/strings.xml
+++ b/preference/preference/res/values-kk/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ҚОСУЛЫ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ӨШІРУЛІ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Қосымша"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Көшіру"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" қорытындысы буферге көшірілді"</string>
-    <string name="not_set" msgid="478774118347071097">"Орнатылмаған"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ҚОСУЛЫ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ӨШІРУЛІ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Қосымша"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Көшіру"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" қорытындысы буферге көшірілді"</string>
+    <string name="not_set" msgid="6573031135582639649">"Орнатылмаған"</string>
 </resources>
diff --git a/preference/preference/res/values-km/strings.xml b/preference/preference/res/values-km/strings.xml
index b83c9c7..2eba4b4 100644
--- a/preference/preference/res/values-km/strings.xml
+++ b/preference/preference/res/values-km/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"បើក"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"បិទ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"កម្រិតខ្ពស់"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"ចម្លង"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" បានចម្លងទៅ​ឃ្លីបបត។"</string>
-    <string name="not_set" msgid="478774118347071097">"មិនបានកំណត់"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"បើក"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"បិទ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"កម្រិតខ្ពស់"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"ចម្លង"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" បានចម្លងទៅ​ឃ្លីបបត។"</string>
+    <string name="not_set" msgid="6573031135582639649">"មិនបានកំណត់"</string>
 </resources>
diff --git a/preference/preference/res/values-kn/strings.xml b/preference/preference/res/values-kn/strings.xml
index 0a13a6a..129c3d3 100644
--- a/preference/preference/res/values-kn/strings.xml
+++ b/preference/preference/res/values-kn/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ಆನ್"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ಆಫ್"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"ಸುಧಾರಿತ"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"ನಕಲಿಸಿ"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ಅನ್ನು ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲಿಸಲಾಗಿದೆ."</string>
-    <string name="not_set" msgid="478774118347071097">"ಹೊಂದಿಸಿಲ್ಲ"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ಆನ್"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ಆಫ್"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"ಸುಧಾರಿತ"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"ನಕಲಿಸಿ"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ಅನ್ನು ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲಿಸಲಾಗಿದೆ."</string>
+    <string name="not_set" msgid="6573031135582639649">"ಹೊಂದಿಸಿಲ್ಲ"</string>
 </resources>
diff --git a/preference/preference/res/values-ko/strings.xml b/preference/preference/res/values-ko/strings.xml
index ed1336e..0d0704a 100644
--- a/preference/preference/res/values-ko/strings.xml
+++ b/preference/preference/res/values-ko/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"사용"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"사용 안함"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"고급"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"복사"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\'이(가) 클립보드에 복사되었습니다."</string>
-    <string name="not_set" msgid="478774118347071097">"설정되지 않음"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"사용"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"사용 안함"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"고급"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"복사"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\'이(가) 클립보드에 복사되었습니다."</string>
+    <string name="not_set" msgid="6573031135582639649">"설정되지 않음"</string>
 </resources>
diff --git a/preference/preference/res/values-ky/strings.xml b/preference/preference/res/values-ky/strings.xml
index 4de461c..feccf10 100644
--- a/preference/preference/res/values-ky/strings.xml
+++ b/preference/preference/res/values-ky/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"КҮЙҮК"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ӨЧҮК"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Өркүндөтүлгөн"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Көчүрүү"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" алмашуу буферине көчүрүлдү."</string>
-    <string name="not_set" msgid="478774118347071097">"Коюлган эмес"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"КҮЙҮК"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ӨЧҮК"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Өркүндөтүлгөн"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Көчүрүү"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" алмашуу буферине көчүрүлдү."</string>
+    <string name="not_set" msgid="6573031135582639649">"Коюлган эмес"</string>
 </resources>
diff --git a/preference/preference/res/values-lo/strings.xml b/preference/preference/res/values-lo/strings.xml
index d44579e..4f20e98 100644
--- a/preference/preference/res/values-lo/strings.xml
+++ b/preference/preference/res/values-lo/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ເປີດ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ປິດ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"ຂັ້ນສູງ"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"ສຳເນົາ"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"ສຳເນົາ \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ໄປໃສ່ຄລິບບອດແລ້ວ."</string>
-    <string name="not_set" msgid="478774118347071097">"ບໍ່ໄດ້ຕັ້ງຄ່າ"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ເປີດ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ປິດ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"ຂັ້ນສູງ"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"ສຳເນົາ"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"ສຳເນົາ \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ໄປໃສ່ຄລິບບອດແລ້ວ."</string>
+    <string name="not_set" msgid="6573031135582639649">"ບໍ່ໄດ້ຕັ້ງຄ່າ"</string>
 </resources>
diff --git a/preference/preference/res/values-lt/strings.xml b/preference/preference/res/values-lt/strings.xml
index 0b161e0..682dd1c 100644
--- a/preference/preference/res/values-lt/strings.xml
+++ b/preference/preference/res/values-lt/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ĮJUNGTA"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"IŠJUNGTA"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Išplėstinė"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopijuoti"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Suvestinė „<xliff:g id="SUMMARY">%1$s</xliff:g>“ nukopijuota į iškarpinę."</string>
-    <string name="not_set" msgid="478774118347071097">"Nenustatyta"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ĮJUNGTA"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"IŠJUNGTA"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Išplėstinė"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopijuoti"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Suvestinė „<xliff:g id="SUMMARY">%1$s</xliff:g>“ nukopijuota į iškarpinę."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nenustatyta"</string>
 </resources>
diff --git a/preference/preference/res/values-lv/strings.xml b/preference/preference/res/values-lv/strings.xml
index 372ab2b..bf174e6 100644
--- a/preference/preference/res/values-lv/strings.xml
+++ b/preference/preference/res/values-lv/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"IESLĒGTS"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"IZSLĒGTS"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Papildu iestatījumi"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopēt"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Preference “<xliff:g id="SUMMARY">%1$s</xliff:g>” ir kopēta starpliktuvē."</string>
-    <string name="not_set" msgid="478774118347071097">"Nav iestatīts"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"IESLĒGTS"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"IZSLĒGTS"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Papildu iestatījumi"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopēt"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Preference “<xliff:g id="SUMMARY">%1$s</xliff:g>” ir kopēta starpliktuvē."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nav iestatīts"</string>
 </resources>
diff --git a/preference/preference/res/values-mk/strings.xml b/preference/preference/res/values-mk/strings.xml
index cc6f41f..091c39a 100644
--- a/preference/preference/res/values-mk/strings.xml
+++ b/preference/preference/res/values-mk/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ВКЛУЧЕНО"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ИСКЛУЧЕНО"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Напредни"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Копирај"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"„<xliff:g id="SUMMARY">%1$s</xliff:g>“ копирано во привремена меморија."</string>
-    <string name="not_set" msgid="478774118347071097">"Не е поставено"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ВКЛУЧЕНО"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ИСКЛУЧЕНО"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Напредни"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Копирај"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"„<xliff:g id="SUMMARY">%1$s</xliff:g>“ копирано во привремена меморија."</string>
+    <string name="not_set" msgid="6573031135582639649">"Не е поставено"</string>
 </resources>
diff --git a/preference/preference/res/values-ml/strings.xml b/preference/preference/res/values-ml/strings.xml
index e2aaf2a..68852db 100644
--- a/preference/preference/res/values-ml/strings.xml
+++ b/preference/preference/res/values-ml/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ഓൺ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ഓഫാണ്"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"വിപുലമായത്"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"പകർത്തുക"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ക്ലിപ്‌ബോർഡിലേക്ക് പകർത്തി."</string>
-    <string name="not_set" msgid="478774118347071097">"സജ്ജീകരിച്ചിട്ടില്ല"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ഓൺ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ഓഫാണ്"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"വിപുലമായത്"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"പകർത്തുക"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ക്ലിപ്‌ബോർഡിലേക്ക് പകർത്തി."</string>
+    <string name="not_set" msgid="6573031135582639649">"സജ്ജീകരിച്ചിട്ടില്ല"</string>
 </resources>
diff --git a/preference/preference/res/values-mn/strings.xml b/preference/preference/res/values-mn/strings.xml
index 00a7b0d..dfde992 100644
--- a/preference/preference/res/values-mn/strings.xml
+++ b/preference/preference/res/values-mn/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ИДЭВХТЭЙ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ИДЭВХГҮЙ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Дэлгэрэнгүй"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Хуулах"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\"-г түр санах ойд хуулсан."</string>
-    <string name="not_set" msgid="478774118347071097">"Тохируулаагүй"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ИДЭВХТЭЙ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ИДЭВХГҮЙ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Дэлгэрэнгүй"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Хуулах"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\"-г түр санах ойд хуулсан."</string>
+    <string name="not_set" msgid="6573031135582639649">"Тохируулаагүй"</string>
 </resources>
diff --git a/preference/preference/res/values-mr/strings.xml b/preference/preference/res/values-mr/strings.xml
index 626b4da..7684168 100644
--- a/preference/preference/res/values-mr/strings.xml
+++ b/preference/preference/res/values-mr/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"चालू"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"बंद"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"प्रगत"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"कॉपी करा"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" क्लिपबोर्डवर कॉपी केली."</string>
-    <string name="not_set" msgid="478774118347071097">"सेट केलेले नाही"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"चालू"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"बंद"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"प्रगत"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"कॉपी करा"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" क्लिपबोर्डवर कॉपी केली."</string>
+    <string name="not_set" msgid="6573031135582639649">"सेट केलेले नाही"</string>
 </resources>
diff --git a/preference/preference/res/values-ms/strings.xml b/preference/preference/res/values-ms/strings.xml
index 0415d7f0..cca4566 100644
--- a/preference/preference/res/values-ms/strings.xml
+++ b/preference/preference/res/values-ms/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"HIDUP"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"MATI"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Terperinci"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Salin"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" disalin ke papan keratan."</string>
-    <string name="not_set" msgid="478774118347071097">"Tidak ditetapkan"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"HIDUP"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"MATI"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Terperinci"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Salin"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" disalin ke papan keratan."</string>
+    <string name="not_set" msgid="6573031135582639649">"Tidak ditetapkan"</string>
 </resources>
diff --git a/preference/preference/res/values-my/strings.xml b/preference/preference/res/values-my/strings.xml
index 8977bf8..a840470 100644
--- a/preference/preference/res/values-my/strings.xml
+++ b/preference/preference/res/values-my/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ဖွင့်ရန်"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ပိတ်ရန်"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"အဆင့်မြင့်"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>၊ <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"မိတ္တူကူးရန်"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ကို ကလစ်ဘုတ်သို့ မိတ္တူကူးယူပြီးပါပြီ။"</string>
-    <string name="not_set" msgid="478774118347071097">"သတ်မှတ်မထားပါ"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ဖွင့်ရန်"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ပိတ်ရန်"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"အဆင့်မြင့်"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>၊ <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"မိတ္တူကူးရန်"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ကို ကလစ်ဘုတ်သို့ မိတ္တူကူးယူပြီးပါပြီ။"</string>
+    <string name="not_set" msgid="6573031135582639649">"သတ်မှတ်မထားပါ"</string>
 </resources>
diff --git a/preference/preference/res/values-nb/strings.xml b/preference/preference/res/values-nb/strings.xml
index 2eb8b11..b7bab05 100644
--- a/preference/preference/res/values-nb/strings.xml
+++ b/preference/preference/res/values-nb/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"PÅ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"AV"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Avansert"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopiér"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"«<xliff:g id="SUMMARY">%1$s</xliff:g>» er kopiert til utklippstavlen."</string>
-    <string name="not_set" msgid="478774118347071097">"Ikke angitt"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"PÅ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"AV"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Avansert"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopiér"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"«<xliff:g id="SUMMARY">%1$s</xliff:g>» er kopiert til utklippstavlen."</string>
+    <string name="not_set" msgid="6573031135582639649">"Ikke angitt"</string>
 </resources>
diff --git a/preference/preference/res/values-ne/strings.xml b/preference/preference/res/values-ne/strings.xml
index 5c20a37..6514c49 100644
--- a/preference/preference/res/values-ne/strings.xml
+++ b/preference/preference/res/values-ne/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"सक्रिय"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"निष्क्रिय पार्नुहोस्‌"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"उन्नत"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"प्रतिलिपि गर्नुहोस्"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" लाई क्लिपबोर्डमा प्रतिलिपि गरियो।"</string>
-    <string name="not_set" msgid="478774118347071097">"सेट गरिएको छैन"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"सक्रिय"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"निष्क्रिय पार्नुहोस्‌"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"उन्नत"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"प्रतिलिपि गर्नुहोस्"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" लाई क्लिपबोर्डमा प्रतिलिपि गरियो।"</string>
+    <string name="not_set" msgid="6573031135582639649">"सेट गरिएको छैन"</string>
 </resources>
diff --git a/preference/preference/res/values-nl/strings.xml b/preference/preference/res/values-nl/strings.xml
index 11810b4..11c51c0 100644
--- a/preference/preference/res/values-nl/strings.xml
+++ b/preference/preference/res/values-nl/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"AAN"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"UIT"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Geavanceerd"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopiëren"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\' is gekopieerd naar het klembord."</string>
-    <string name="not_set" msgid="478774118347071097">"Niet ingesteld"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"AAN"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"UIT"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Geavanceerd"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopiëren"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\'<xliff:g id="SUMMARY">%1$s</xliff:g>\' is gekopieerd naar het klembord."</string>
+    <string name="not_set" msgid="6573031135582639649">"Niet ingesteld"</string>
 </resources>
diff --git a/preference/preference/res/values-or/strings.xml b/preference/preference/res/values-or/strings.xml
index 730a8eaf..c9b56cc 100644
--- a/preference/preference/res/values-or/strings.xml
+++ b/preference/preference/res/values-or/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ଅନ୍ ଅଛି"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ଅଫ୍ ଅଛି"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"ଅଧିକ ଉନ୍ନତ"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"କପି କରନ୍ତୁ"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" କ୍ଲିପବୋର୍ଡକୁ କପି ହୋ‍ଇଗଲା।"</string>
-    <string name="not_set" msgid="478774118347071097">"ସେଟ୍ ହୋଇନାହିଁ"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ଅନ୍ ଅଛି"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ଅଫ୍ ଅଛି"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"ଅଧିକ ଉନ୍ନତ"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"କପି କରନ୍ତୁ"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" କ୍ଲିପବୋର୍ଡକୁ କପି ହୋ‍ଇଗଲା।"</string>
+    <string name="not_set" msgid="6573031135582639649">"ସେଟ୍ ହୋଇନାହିଁ"</string>
 </resources>
diff --git a/preference/preference/res/values-pa/strings.xml b/preference/preference/res/values-pa/strings.xml
index f38534e..966f9ba 100644
--- a/preference/preference/res/values-pa/strings.xml
+++ b/preference/preference/res/values-pa/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ਚਾਲੂ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ਬੰਦ"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"ਉੱਨਤ"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"ਕਾਪੀ ਕਰੋ"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ਨੂੰ ਕਲਿੱਪਬੋਰਡ \'ਤੇ ਕਾਪੀ ਕੀਤਾ ਗਿਆ।"</string>
-    <string name="not_set" msgid="478774118347071097">"ਸੈੱਟ ਨਹੀਂ"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ਚਾਲੂ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ਬੰਦ"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"ਉੱਨਤ"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"ਕਾਪੀ ਕਰੋ"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ਨੂੰ ਕਲਿੱਪਬੋਰਡ \'ਤੇ ਕਾਪੀ ਕੀਤਾ ਗਿਆ।"</string>
+    <string name="not_set" msgid="6573031135582639649">"ਸੈੱਟ ਨਹੀਂ"</string>
 </resources>
diff --git a/preference/preference/res/values-pl/strings.xml b/preference/preference/res/values-pl/strings.xml
index 08b29a2..cbf698c 100644
--- a/preference/preference/res/values-pl/strings.xml
+++ b/preference/preference/res/values-pl/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"WŁ."</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"WYŁ."</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Zaawansowane"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopiuj"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Skopiowano „<xliff:g id="SUMMARY">%1$s</xliff:g>” do schowka."</string>
-    <string name="not_set" msgid="478774118347071097">"Nie ustawiono"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"WŁ."</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"WYŁ."</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Zaawansowane"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopiuj"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Skopiowano „<xliff:g id="SUMMARY">%1$s</xliff:g>” do schowka."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nie ustawiono"</string>
 </resources>
diff --git a/preference/preference/res/values-pt-rBR/strings.xml b/preference/preference/res/values-pt-rBR/strings.xml
index f560eef..d79d582 100644
--- a/preference/preference/res/values-pt-rBR/strings.xml
+++ b/preference/preference/res/values-pt-rBR/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ATIVADO"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DESATIVADO"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Avançado"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copiar"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" copiado para a área de transferência."</string>
-    <string name="not_set" msgid="478774118347071097">"Não definido"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ATIVADO"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DESATIVADO"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Avançado"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copiar"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" copiado para a área de transferência."</string>
+    <string name="not_set" msgid="6573031135582639649">"Não definido"</string>
 </resources>
diff --git a/preference/preference/res/values-pt-rPT/strings.xml b/preference/preference/res/values-pt-rPT/strings.xml
index 34d3c2b..1761efc 100644
--- a/preference/preference/res/values-pt-rPT/strings.xml
+++ b/preference/preference/res/values-pt-rPT/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ATIVADO"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DESATIVADO"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Avançadas"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copiar"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" copiado para a área de transferência."</string>
-    <string name="not_set" msgid="478774118347071097">"Não definido"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ATIVADO"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DESATIVADO"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Avançadas"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copiar"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" copiado para a área de transferência."</string>
+    <string name="not_set" msgid="6573031135582639649">"Não definido"</string>
 </resources>
diff --git a/preference/preference/res/values-pt/strings.xml b/preference/preference/res/values-pt/strings.xml
index f560eef..d79d582 100644
--- a/preference/preference/res/values-pt/strings.xml
+++ b/preference/preference/res/values-pt/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ATIVADO"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DESATIVADO"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Avançado"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copiar"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" copiado para a área de transferência."</string>
-    <string name="not_set" msgid="478774118347071097">"Não definido"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ATIVADO"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DESATIVADO"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Avançado"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copiar"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" copiado para a área de transferência."</string>
+    <string name="not_set" msgid="6573031135582639649">"Não definido"</string>
 </resources>
diff --git a/preference/preference/res/values-ro/strings.xml b/preference/preference/res/values-ro/strings.xml
index e8a1512..3aaa42e 100644
--- a/preference/preference/res/values-ro/strings.xml
+++ b/preference/preference/res/values-ro/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ACTIVAT"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"DEZACTIVAT"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Avansat"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Copiați"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"„<xliff:g id="SUMMARY">%1$s</xliff:g>” a fost copiat în clipboard."</string>
-    <string name="not_set" msgid="478774118347071097">"Nesetată"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ACTIVAT"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"DEZACTIVAT"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Avansat"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Copiați"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"„<xliff:g id="SUMMARY">%1$s</xliff:g>” a fost copiat în clipboard."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nesetată"</string>
 </resources>
diff --git a/preference/preference/res/values-ru/strings.xml b/preference/preference/res/values-ru/strings.xml
index b222efb..ccef620 100644
--- a/preference/preference/res/values-ru/strings.xml
+++ b/preference/preference/res/values-ru/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ВКЛ."</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ВЫКЛ."</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Дополнительно"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Копировать"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Текст \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" скопирован в буфер обмена"</string>
-    <string name="not_set" msgid="478774118347071097">"Не указано"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ВКЛ."</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ВЫКЛ."</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Дополнительно"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Копировать"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Текст \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" скопирован в буфер обмена"</string>
+    <string name="not_set" msgid="6573031135582639649">"Не указано"</string>
 </resources>
diff --git a/preference/preference/res/values-si/strings.xml b/preference/preference/res/values-si/strings.xml
index 42d25d7..6c169fa 100644
--- a/preference/preference/res/values-si/strings.xml
+++ b/preference/preference/res/values-si/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ක්‍රියාත්මකයි"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ක්‍රියාවිරහිතයි"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"උසස්"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"පිටපත් කරන්න"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" පසුරු පුවරුවට පිටපත් කරන ලදී."</string>
-    <string name="not_set" msgid="478774118347071097">"සකසා නැත"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ක්‍රියාත්මකයි"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ක්‍රියාවිරහිතයි"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"උසස්"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"පිටපත් කරන්න"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" පසුරු පුවරුවට පිටපත් කරන ලදී."</string>
+    <string name="not_set" msgid="6573031135582639649">"සකසා නැත"</string>
 </resources>
diff --git a/preference/preference/res/values-sk/strings.xml b/preference/preference/res/values-sk/strings.xml
index 82bb2e5..5006dab 100644
--- a/preference/preference/res/values-sk/strings.xml
+++ b/preference/preference/res/values-sk/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ZAP."</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"VYP."</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Rozšírené"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopírovať"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Položka <xliff:g id="SUMMARY">%1$s</xliff:g> bola skopírovaná do schránky."</string>
-    <string name="not_set" msgid="478774118347071097">"Nenastavené"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ZAP."</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"VYP."</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Rozšírené"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopírovať"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Položka <xliff:g id="SUMMARY">%1$s</xliff:g> bola skopírovaná do schránky."</string>
+    <string name="not_set" msgid="6573031135582639649">"Nenastavené"</string>
 </resources>
diff --git a/preference/preference/res/values-sl/strings.xml b/preference/preference/res/values-sl/strings.xml
index 6f3ec1c..26b805f 100644
--- a/preference/preference/res/values-sl/strings.xml
+++ b/preference/preference/res/values-sl/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"VKLOPLJENO"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"IZKLOPLJENO"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Dodatno"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopiraj"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"»<xliff:g id="SUMMARY">%1$s</xliff:g>« je bilo kopirano v odložišče."</string>
-    <string name="not_set" msgid="478774118347071097">"Ni nastavljeno"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"VKLOPLJENO"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"IZKLOPLJENO"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Dodatno"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopiraj"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"»<xliff:g id="SUMMARY">%1$s</xliff:g>« je bilo kopirano v odložišče."</string>
+    <string name="not_set" msgid="6573031135582639649">"Ni nastavljeno"</string>
 </resources>
diff --git a/preference/preference/res/values-sq/strings.xml b/preference/preference/res/values-sq/strings.xml
index a400863..6a2a42e 100644
--- a/preference/preference/res/values-sq/strings.xml
+++ b/preference/preference/res/values-sq/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"AKTIV"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"JOAKTIV"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Të përparuara"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopjo"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" u kopjua në kujtesën e fragmenteve"</string>
-    <string name="not_set" msgid="478774118347071097">"Nuk është caktuar"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"AKTIV"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"JOAKTIV"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Të përparuara"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopjo"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" u kopjua në kujtesën e fragmenteve"</string>
+    <string name="not_set" msgid="6573031135582639649">"Nuk është caktuar"</string>
 </resources>
diff --git a/preference/preference/res/values-sr/strings.xml b/preference/preference/res/values-sr/strings.xml
index bece9a8..ee431b1 100644
--- a/preference/preference/res/values-sr/strings.xml
+++ b/preference/preference/res/values-sr/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"УКЉУЧЕНО"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ИСКЉУЧЕНО"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Напредно"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Копирај"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Резиме „<xliff:g id="SUMMARY">%1$s</xliff:g>“ је копиран у привремену меморију."</string>
-    <string name="not_set" msgid="478774118347071097">"Није подешено"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"УКЉУЧЕНО"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ИСКЉУЧЕНО"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Напредно"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Копирај"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Резиме „<xliff:g id="SUMMARY">%1$s</xliff:g>“ је копиран у привремену меморију."</string>
+    <string name="not_set" msgid="6573031135582639649">"Није подешено"</string>
 </resources>
diff --git a/preference/preference/res/values-sv/strings.xml b/preference/preference/res/values-sv/strings.xml
index e1ab72a..a7ef126 100644
--- a/preference/preference/res/values-sv/strings.xml
+++ b/preference/preference/res/values-sv/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"PÅ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"AV"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Avancerat"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopiera"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"<xliff:g id="SUMMARY">%1$s</xliff:g> har kopierats till Urklipp."</string>
-    <string name="not_set" msgid="478774118347071097">"Inte angett"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"PÅ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"AV"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Avancerat"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopiera"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"<xliff:g id="SUMMARY">%1$s</xliff:g> har kopierats till Urklipp."</string>
+    <string name="not_set" msgid="6573031135582639649">"Inte angett"</string>
 </resources>
diff --git a/preference/preference/res/values-sw/strings.xml b/preference/preference/res/values-sw/strings.xml
index 5c5f3e0..4219f3a 100644
--- a/preference/preference/res/values-sw/strings.xml
+++ b/preference/preference/res/values-sw/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"IMEWASHWA"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"IMEZIMWA"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Mipangilio ya Kina"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Nakili"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" imenakiliwa kwenye ubao wa kunakili."</string>
-    <string name="not_set" msgid="478774118347071097">"Haijawekwa"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"IMEWASHWA"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"IMEZIMWA"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Mipangilio ya Kina"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Nakili"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" imenakiliwa kwenye ubao wa kunakili."</string>
+    <string name="not_set" msgid="6573031135582639649">"Haijawekwa"</string>
 </resources>
diff --git a/preference/preference/res/values-ta/strings.xml b/preference/preference/res/values-ta/strings.xml
index e5801b9..ead4d01 100644
--- a/preference/preference/res/values-ta/strings.xml
+++ b/preference/preference/res/values-ta/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ஆன்"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ஆஃப்"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"மேம்பட்டவை"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"நகலெடு"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டது."</string>
-    <string name="not_set" msgid="478774118347071097">"அமைக்கப்படவில்லை"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ஆன்"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ஆஃப்"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"மேம்பட்டவை"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"நகலெடு"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டது."</string>
+    <string name="not_set" msgid="6573031135582639649">"அமைக்கப்படவில்லை"</string>
 </resources>
diff --git a/preference/preference/res/values-te/strings.xml b/preference/preference/res/values-te/strings.xml
index 34c3382..f7bbccf 100644
--- a/preference/preference/res/values-te/strings.xml
+++ b/preference/preference/res/values-te/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"ఆన్ చేయండి"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ఆఫ్ చేయండి"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"అధునాతనం"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"కాపీ చేయి"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" క్లిప్‌బోర్డ్‌కి కాపీ చేయబడింది."</string>
-    <string name="not_set" msgid="478774118347071097">"సెట్ చేయలేదు"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"ఆన్ చేయండి"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ఆఫ్ చేయండి"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"అధునాతనం"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"కాపీ చేయి"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" క్లిప్‌బోర్డ్‌కి కాపీ చేయబడింది."</string>
+    <string name="not_set" msgid="6573031135582639649">"సెట్ చేయలేదు"</string>
 </resources>
diff --git a/preference/preference/res/values-th/strings.xml b/preference/preference/res/values-th/strings.xml
index 1b5d255..86362ad 100644
--- a/preference/preference/res/values-th/strings.xml
+++ b/preference/preference/res/values-th/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"เปิด"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ปิด"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"ขั้นสูง"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g> <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"คัดลอก"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"คัดลอก \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ไปยังคลิปบอร์ดแล้ว"</string>
-    <string name="not_set" msgid="478774118347071097">"ไม่ได้ตั้งค่า"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"เปิด"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ปิด"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"ขั้นสูง"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g> <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"คัดลอก"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"คัดลอก \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" ไปยังคลิปบอร์ดแล้ว"</string>
+    <string name="not_set" msgid="6573031135582639649">"ไม่ได้ตั้งค่า"</string>
 </resources>
diff --git a/preference/preference/res/values-tl/strings.xml b/preference/preference/res/values-tl/strings.xml
index 026b220..380426d 100644
--- a/preference/preference/res/values-tl/strings.xml
+++ b/preference/preference/res/values-tl/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"NAKA-ON"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"NAKA-OFF"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Advanced"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopyahin"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Nakopya sa clipboard ang \"<xliff:g id="SUMMARY">%1$s</xliff:g>.\""</string>
-    <string name="not_set" msgid="478774118347071097">"Hindi nakatakda"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"NAKA-ON"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"NAKA-OFF"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Advanced"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopyahin"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Nakopya sa clipboard ang \"<xliff:g id="SUMMARY">%1$s</xliff:g>.\""</string>
+    <string name="not_set" msgid="6573031135582639649">"Hindi nakatakda"</string>
 </resources>
diff --git a/preference/preference/res/values-tr/strings.xml b/preference/preference/res/values-tr/strings.xml
index e540c2f..5def69c 100644
--- a/preference/preference/res/values-tr/strings.xml
+++ b/preference/preference/res/values-tr/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"AÇIK"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"KAPALI"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Gelişmiş"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopyala"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" panoya kopyalandı."</string>
-    <string name="not_set" msgid="478774118347071097">"Ayarlanmadı"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"AÇIK"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"KAPALI"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Gelişmiş"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopyala"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" panoya kopyalandı."</string>
+    <string name="not_set" msgid="6573031135582639649">"Ayarlanmadı"</string>
 </resources>
diff --git a/preference/preference/res/values-uk/strings.xml b/preference/preference/res/values-uk/strings.xml
index 46577fc..e5cc4b3 100644
--- a/preference/preference/res/values-uk/strings.xml
+++ b/preference/preference/res/values-uk/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"УВІМКНЕНО"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"ВИМКНЕНО"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Додатково"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Скопіювати"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\": скопійовано в буфер обміну."</string>
-    <string name="not_set" msgid="478774118347071097">"Не налаштовано"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"УВІМКНЕНО"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"ВИМКНЕНО"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Додатково"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Скопіювати"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\": скопійовано в буфер обміну."</string>
+    <string name="not_set" msgid="6573031135582639649">"Не налаштовано"</string>
 </resources>
diff --git a/preference/preference/res/values-ur/strings.xml b/preference/preference/res/values-ur/strings.xml
index 5ef2ade..64136ef 100644
--- a/preference/preference/res/values-ur/strings.xml
+++ b/preference/preference/res/values-ur/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"آن"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"آف ہے"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"جدید ترین"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>، <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"کاپی کریں"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" کلپ بورڈ میں کاپی ہو گیا۔"</string>
-    <string name="not_set" msgid="478774118347071097">"سیٹ نہیں ہے"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"آن"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"آف ہے"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"جدید ترین"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>، <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"کاپی کریں"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" کلپ بورڈ میں کاپی ہو گیا۔"</string>
+    <string name="not_set" msgid="6573031135582639649">"سیٹ نہیں ہے"</string>
 </resources>
diff --git a/preference/preference/res/values-uz/strings.xml b/preference/preference/res/values-uz/strings.xml
index b4d24b5..fe9bb5b 100644
--- a/preference/preference/res/values-uz/strings.xml
+++ b/preference/preference/res/values-uz/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"YONIQ"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"YOQILMAGAN"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Kengaytirilgan"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Nusxa olish"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"“<xliff:g id="SUMMARY">%1$s</xliff:g>” vaqtinchalik xotiraga nusxalandi."</string>
-    <string name="not_set" msgid="478774118347071097">"Tayinlanmagan"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"YONIQ"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"YOQILMAGAN"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Kengaytirilgan"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Nusxa olish"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"“<xliff:g id="SUMMARY">%1$s</xliff:g>” vaqtinchalik xotiraga nusxalandi."</string>
+    <string name="not_set" msgid="6573031135582639649">"Tayinlanmagan"</string>
 </resources>
diff --git a/preference/preference/res/values-vi/strings.xml b/preference/preference/res/values-vi/strings.xml
index e34f59e..a437be2 100644
--- a/preference/preference/res/values-vi/strings.xml
+++ b/preference/preference/res/values-vi/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"BẬT"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"TẮT"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Nâng cao"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Sao chép"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"Đã sao chép \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" vào khay nhớ tạm."</string>
-    <string name="not_set" msgid="478774118347071097">"Chưa đặt"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"BẬT"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"TẮT"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Nâng cao"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Sao chép"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"Đã sao chép \"<xliff:g id="SUMMARY">%1$s</xliff:g>\" vào khay nhớ tạm."</string>
+    <string name="not_set" msgid="6573031135582639649">"Chưa đặt"</string>
 </resources>
diff --git a/preference/preference/res/values-zh-rCN/strings.xml b/preference/preference/res/values-zh-rCN/strings.xml
index 7208276..3ee6ea5 100644
--- a/preference/preference/res/values-zh-rCN/strings.xml
+++ b/preference/preference/res/values-zh-rCN/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"开启"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"关闭"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"高级"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>、<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"复制"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"已将“<xliff:g id="SUMMARY">%1$s</xliff:g>”复制到剪贴板。"</string>
-    <string name="not_set" msgid="478774118347071097">"未设置"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"开启"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"关闭"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"高级"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>、<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"复制"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"已将“<xliff:g id="SUMMARY">%1$s</xliff:g>”复制到剪贴板。"</string>
+    <string name="not_set" msgid="6573031135582639649">"未设置"</string>
 </resources>
diff --git a/preference/preference/res/values-zh-rHK/strings.xml b/preference/preference/res/values-zh-rHK/strings.xml
index 487dc31..ce0e7b8 100644
--- a/preference/preference/res/values-zh-rHK/strings.xml
+++ b/preference/preference/res/values-zh-rHK/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"開啟"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"關閉"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"進階"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>、<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"複製"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"「<xliff:g id="SUMMARY">%1$s</xliff:g>」已複製到剪貼簿。"</string>
-    <string name="not_set" msgid="478774118347071097">"未設定"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"開啟"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"關閉"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"進階"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>、<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"複製"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"「<xliff:g id="SUMMARY">%1$s</xliff:g>」已複製到剪貼簿。"</string>
+    <string name="not_set" msgid="6573031135582639649">"未設定"</string>
 </resources>
diff --git a/preference/preference/res/values-zh-rTW/strings.xml b/preference/preference/res/values-zh-rTW/strings.xml
index 4628cf0..1373bd7 100644
--- a/preference/preference/res/values-zh-rTW/strings.xml
+++ b/preference/preference/res/values-zh-rTW/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"開啟"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"關閉"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"進階"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>、<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"複製"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"已將「<xliff:g id="SUMMARY">%1$s</xliff:g>」複製到剪貼簿。"</string>
-    <string name="not_set" msgid="478774118347071097">"未設定"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"開啟"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"關閉"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"進階"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>、<xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"複製"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"已將「<xliff:g id="SUMMARY">%1$s</xliff:g>」複製到剪貼簿。"</string>
+    <string name="not_set" msgid="6573031135582639649">"未設定"</string>
 </resources>
diff --git a/preference/preference/res/values-zu/strings.xml b/preference/preference/res/values-zu/strings.xml
index 2c8a6e9..a3b6c70 100644
--- a/preference/preference/res/values-zu/strings.xml
+++ b/preference/preference/res/values-zu/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="v7_preference_on" msgid="27351710992731591">"VULA"</string>
-    <string name="v7_preference_off" msgid="5138405918326871307">"VALA"</string>
-    <string name="expand_button_title" msgid="1234962710353108940">"Okuthuthukisiwe"</string>
-    <string name="summary_collapsed_preference_list" msgid="5190123168583152844">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
-    <string name="copy" msgid="3209159573327985035">"Kopisha"</string>
-    <string name="preference_copied" msgid="7961817945132860002">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" kukopishelwe kuklibhodi."</string>
-    <string name="not_set" msgid="478774118347071097">"Ayisethiwe"</string>
+    <string name="v7_preference_on" msgid="89551595707643515">"VULA"</string>
+    <string name="v7_preference_off" msgid="3140233346420563315">"VALA"</string>
+    <string name="expand_button_title" msgid="2427401033573778270">"Okuthuthukisiwe"</string>
+    <string name="summary_collapsed_preference_list" msgid="9167775378838880170">"<xliff:g id="CURRENT_ITEMS">%1$s</xliff:g>, <xliff:g id="ADDED_ITEMS">%2$s</xliff:g>"</string>
+    <string name="copy" msgid="6083905920877235314">"Kopisha"</string>
+    <string name="preference_copied" msgid="6685851473431805375">"\"<xliff:g id="SUMMARY">%1$s</xliff:g>\" kukopishelwe kuklibhodi."</string>
+    <string name="not_set" msgid="6573031135582639649">"Ayisethiwe"</string>
 </resources>
diff --git a/recyclerview/recyclerview/api/1.2.0-alpha03.txt b/recyclerview/recyclerview/api/1.2.0-alpha03.txt
new file mode 100644
index 0000000..45eaa5e
--- /dev/null
+++ b/recyclerview/recyclerview/api/1.2.0-alpha03.txt
@@ -0,0 +1,1089 @@
+// Signature format: 3.0
+package androidx.recyclerview.widget {
+
+  public final class AdapterListUpdateCallback implements androidx.recyclerview.widget.ListUpdateCallback {
+    ctor public AdapterListUpdateCallback(androidx.recyclerview.widget.RecyclerView.Adapter);
+    method public void onChanged(int, int, Object!);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public final class AsyncDifferConfig<T> {
+    method public java.util.concurrent.Executor getBackgroundThreadExecutor();
+    method public androidx.recyclerview.widget.DiffUtil.ItemCallback<T!> getDiffCallback();
+  }
+
+  public static final class AsyncDifferConfig.Builder<T> {
+    ctor public AsyncDifferConfig.Builder(androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
+    method public androidx.recyclerview.widget.AsyncDifferConfig<T!> build();
+    method public androidx.recyclerview.widget.AsyncDifferConfig.Builder<T!> setBackgroundThreadExecutor(java.util.concurrent.Executor!);
+  }
+
+  public class AsyncListDiffer<T> {
+    ctor public AsyncListDiffer(androidx.recyclerview.widget.RecyclerView.Adapter, androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
+    ctor public AsyncListDiffer(androidx.recyclerview.widget.ListUpdateCallback, androidx.recyclerview.widget.AsyncDifferConfig<T!>);
+    method public void addListListener(androidx.recyclerview.widget.AsyncListDiffer.ListListener<T!>);
+    method public java.util.List<T!> getCurrentList();
+    method public void removeListListener(androidx.recyclerview.widget.AsyncListDiffer.ListListener<T!>);
+    method public void submitList(java.util.List<T!>?);
+    method public void submitList(java.util.List<T!>?, Runnable?);
+  }
+
+  public static interface AsyncListDiffer.ListListener<T> {
+    method public void onCurrentListChanged(java.util.List<T!>, java.util.List<T!>);
+  }
+
+  public class AsyncListUtil<T> {
+    ctor public AsyncListUtil(Class<T!>, int, androidx.recyclerview.widget.AsyncListUtil.DataCallback<T!>, androidx.recyclerview.widget.AsyncListUtil.ViewCallback);
+    method public T? getItem(int);
+    method public int getItemCount();
+    method public void onRangeChanged();
+    method public void refresh();
+  }
+
+  public abstract static class AsyncListUtil.DataCallback<T> {
+    ctor public AsyncListUtil.DataCallback();
+    method @WorkerThread public abstract void fillData(T![], int, int);
+    method @WorkerThread public int getMaxCachedTiles();
+    method @WorkerThread public void recycleData(T![], int);
+    method @WorkerThread public abstract int refreshData();
+  }
+
+  public abstract static class AsyncListUtil.ViewCallback {
+    ctor public AsyncListUtil.ViewCallback();
+    method @UiThread public void extendRangeInto(int[], int[], int);
+    method @UiThread public abstract void getItemRangeInto(int[]);
+    method @UiThread public abstract void onDataRefresh();
+    method @UiThread public abstract void onItemLoaded(int);
+    field public static final int HINT_SCROLL_ASC = 2; // 0x2
+    field public static final int HINT_SCROLL_DESC = 1; // 0x1
+    field public static final int HINT_SCROLL_NONE = 0; // 0x0
+  }
+
+  public class BatchingListUpdateCallback implements androidx.recyclerview.widget.ListUpdateCallback {
+    ctor public BatchingListUpdateCallback(androidx.recyclerview.widget.ListUpdateCallback);
+    method public void dispatchLastEvent();
+    method public void onChanged(int, int, Object!);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public class DefaultItemAnimator extends androidx.recyclerview.widget.SimpleItemAnimator {
+    ctor public DefaultItemAnimator();
+    method public boolean animateAdd(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder!, androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animateMove(androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animateRemove(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void endAnimation(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void endAnimations();
+    method public boolean isRunning();
+    method public void runPendingAnimations();
+  }
+
+  public class DiffUtil {
+    method public static androidx.recyclerview.widget.DiffUtil.DiffResult calculateDiff(androidx.recyclerview.widget.DiffUtil.Callback);
+    method public static androidx.recyclerview.widget.DiffUtil.DiffResult calculateDiff(androidx.recyclerview.widget.DiffUtil.Callback, boolean);
+  }
+
+  public abstract static class DiffUtil.Callback {
+    ctor public DiffUtil.Callback();
+    method public abstract boolean areContentsTheSame(int, int);
+    method public abstract boolean areItemsTheSame(int, int);
+    method public Object? getChangePayload(int, int);
+    method public abstract int getNewListSize();
+    method public abstract int getOldListSize();
+  }
+
+  public static class DiffUtil.DiffResult {
+    method public int convertNewPositionToOld(@IntRange(from=0) int);
+    method public int convertOldPositionToNew(@IntRange(from=0) int);
+    method public void dispatchUpdatesTo(androidx.recyclerview.widget.RecyclerView.Adapter);
+    method public void dispatchUpdatesTo(androidx.recyclerview.widget.ListUpdateCallback);
+    field public static final int NO_POSITION = -1; // 0xffffffff
+  }
+
+  public abstract static class DiffUtil.ItemCallback<T> {
+    ctor public DiffUtil.ItemCallback();
+    method public abstract boolean areContentsTheSame(T, T);
+    method public abstract boolean areItemsTheSame(T, T);
+    method public Object? getChangePayload(T, T);
+  }
+
+  public class DividerItemDecoration extends androidx.recyclerview.widget.RecyclerView.ItemDecoration {
+    ctor public DividerItemDecoration(android.content.Context!, int);
+    method public android.graphics.drawable.Drawable? getDrawable();
+    method public void setDrawable(android.graphics.drawable.Drawable);
+    method public void setOrientation(int);
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  public class GridLayoutManager extends androidx.recyclerview.widget.LinearLayoutManager {
+    ctor public GridLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
+    ctor public GridLayoutManager(android.content.Context!, int);
+    ctor public GridLayoutManager(android.content.Context!, int, int, boolean);
+    method public int getSpanCount();
+    method public androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup! getSpanSizeLookup();
+    method public boolean isUsingSpansToEstimateScrollbarDimensions();
+    method public void setSpanCount(int);
+    method public void setSpanSizeLookup(androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup!);
+    method public void setUsingSpansToEstimateScrollbarDimensions(boolean);
+    field public static final int DEFAULT_SPAN_COUNT = -1; // 0xffffffff
+  }
+
+  public static final class GridLayoutManager.DefaultSpanSizeLookup extends androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup {
+    ctor public GridLayoutManager.DefaultSpanSizeLookup();
+    method public int getSpanSize(int);
+  }
+
+  public static class GridLayoutManager.LayoutParams extends androidx.recyclerview.widget.RecyclerView.LayoutParams {
+    ctor public GridLayoutManager.LayoutParams(android.content.Context!, android.util.AttributeSet!);
+    ctor public GridLayoutManager.LayoutParams(int, int);
+    ctor public GridLayoutManager.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
+    ctor public GridLayoutManager.LayoutParams(android.view.ViewGroup.LayoutParams!);
+    ctor public GridLayoutManager.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public int getSpanIndex();
+    method public int getSpanSize();
+    field public static final int INVALID_SPAN_ID = -1; // 0xffffffff
+  }
+
+  public abstract static class GridLayoutManager.SpanSizeLookup {
+    ctor public GridLayoutManager.SpanSizeLookup();
+    method public int getSpanGroupIndex(int, int);
+    method public int getSpanIndex(int, int);
+    method public abstract int getSpanSize(int);
+    method public void invalidateSpanGroupIndexCache();
+    method public void invalidateSpanIndexCache();
+    method public boolean isSpanGroupIndexCacheEnabled();
+    method public boolean isSpanIndexCacheEnabled();
+    method public void setSpanGroupIndexCacheEnabled(boolean);
+    method public void setSpanIndexCacheEnabled(boolean);
+  }
+
+  public class ItemTouchHelper extends androidx.recyclerview.widget.RecyclerView.ItemDecoration implements androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener {
+    ctor public ItemTouchHelper(androidx.recyclerview.widget.ItemTouchHelper.Callback);
+    method public void attachToRecyclerView(androidx.recyclerview.widget.RecyclerView?);
+    method public void onChildViewAttachedToWindow(android.view.View);
+    method public void onChildViewDetachedFromWindow(android.view.View);
+    method public void startDrag(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void startSwipe(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    field public static final int ACTION_STATE_DRAG = 2; // 0x2
+    field public static final int ACTION_STATE_IDLE = 0; // 0x0
+    field public static final int ACTION_STATE_SWIPE = 1; // 0x1
+    field public static final int ANIMATION_TYPE_DRAG = 8; // 0x8
+    field public static final int ANIMATION_TYPE_SWIPE_CANCEL = 4; // 0x4
+    field public static final int ANIMATION_TYPE_SWIPE_SUCCESS = 2; // 0x2
+    field public static final int DOWN = 2; // 0x2
+    field public static final int END = 32; // 0x20
+    field public static final int LEFT = 4; // 0x4
+    field public static final int RIGHT = 8; // 0x8
+    field public static final int START = 16; // 0x10
+    field public static final int UP = 1; // 0x1
+  }
+
+  public abstract static class ItemTouchHelper.Callback {
+    ctor public ItemTouchHelper.Callback();
+    method public boolean canDropOver(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! chooseDropTarget(androidx.recyclerview.widget.RecyclerView.ViewHolder, java.util.List<androidx.recyclerview.widget.RecyclerView.ViewHolder!>, int, int);
+    method public void clearView(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public int convertToAbsoluteDirection(int, int);
+    method public static int convertToRelativeDirection(int, int);
+    method public long getAnimationDuration(androidx.recyclerview.widget.RecyclerView, int, float, float);
+    method public int getBoundingBoxMargin();
+    method public static androidx.recyclerview.widget.ItemTouchUIUtil getDefaultUIUtil();
+    method public float getMoveThreshold(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public abstract int getMovementFlags(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public float getSwipeEscapeVelocity(float);
+    method public float getSwipeThreshold(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public float getSwipeVelocityThreshold(float);
+    method public int interpolateOutOfBoundsScroll(androidx.recyclerview.widget.RecyclerView, int, int, int, long);
+    method public boolean isItemViewSwipeEnabled();
+    method public boolean isLongPressDragEnabled();
+    method public static int makeFlag(int, int);
+    method public static int makeMovementFlags(int, int);
+    method public void onChildDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, float, float, int, boolean);
+    method public void onChildDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder!, float, float, int, boolean);
+    method public abstract boolean onMove(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onMoved(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, int, androidx.recyclerview.widget.RecyclerView.ViewHolder, int, int, int);
+    method public void onSelectedChanged(androidx.recyclerview.widget.RecyclerView.ViewHolder?, int);
+    method public abstract void onSwiped(androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
+    field public static final int DEFAULT_DRAG_ANIMATION_DURATION = 200; // 0xc8
+    field public static final int DEFAULT_SWIPE_ANIMATION_DURATION = 250; // 0xfa
+  }
+
+  public abstract static class ItemTouchHelper.SimpleCallback extends androidx.recyclerview.widget.ItemTouchHelper.Callback {
+    ctor public ItemTouchHelper.SimpleCallback(int, int);
+    method public int getDragDirs(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public int getMovementFlags(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public int getSwipeDirs(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void setDefaultDragDirs(int);
+    method public void setDefaultSwipeDirs(int);
+  }
+
+  public static interface ItemTouchHelper.ViewDropHandler {
+    method public void prepareForDrop(android.view.View, android.view.View, int, int);
+  }
+
+  public interface ItemTouchUIUtil {
+    method public void clearView(android.view.View!);
+    method public void onDraw(android.graphics.Canvas!, androidx.recyclerview.widget.RecyclerView!, android.view.View!, float, float, int, boolean);
+    method public void onDrawOver(android.graphics.Canvas!, androidx.recyclerview.widget.RecyclerView!, android.view.View!, float, float, int, boolean);
+    method public void onSelected(android.view.View!);
+  }
+
+  public class LinearLayoutManager extends androidx.recyclerview.widget.RecyclerView.LayoutManager implements androidx.recyclerview.widget.ItemTouchHelper.ViewDropHandler androidx.recyclerview.widget.RecyclerView.SmoothScroller.ScrollVectorProvider {
+    ctor public LinearLayoutManager(android.content.Context!);
+    ctor public LinearLayoutManager(android.content.Context!, int, boolean);
+    ctor public LinearLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
+    method protected void calculateExtraLayoutSpace(androidx.recyclerview.widget.RecyclerView.State, int[]);
+    method public android.graphics.PointF! computeScrollVectorForPosition(int);
+    method public int findFirstCompletelyVisibleItemPosition();
+    method public int findFirstVisibleItemPosition();
+    method public int findLastCompletelyVisibleItemPosition();
+    method public int findLastVisibleItemPosition();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
+    method @Deprecated protected int getExtraLayoutSpace(androidx.recyclerview.widget.RecyclerView.State!);
+    method public int getInitialPrefetchItemCount();
+    method public int getOrientation();
+    method public boolean getRecycleChildrenOnDetach();
+    method public boolean getReverseLayout();
+    method public boolean getStackFromEnd();
+    method protected boolean isLayoutRTL();
+    method public boolean isSmoothScrollbarEnabled();
+    method public void prepareForDrop(android.view.View, android.view.View, int, int);
+    method public void scrollToPositionWithOffset(int, int);
+    method public void setInitialPrefetchItemCount(int);
+    method public void setOrientation(int);
+    method public void setRecycleChildrenOnDetach(boolean);
+    method public void setReverseLayout(boolean);
+    method public void setSmoothScrollbarEnabled(boolean);
+    method public void setStackFromEnd(boolean);
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int INVALID_OFFSET = -2147483648; // 0x80000000
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  protected static class LinearLayoutManager.LayoutChunkResult {
+    ctor protected LinearLayoutManager.LayoutChunkResult();
+    field public int mConsumed;
+    field public boolean mFinished;
+    field public boolean mFocusable;
+    field public boolean mIgnoreConsumed;
+  }
+
+  public class LinearSmoothScroller extends androidx.recyclerview.widget.RecyclerView.SmoothScroller {
+    ctor public LinearSmoothScroller(android.content.Context!);
+    method public int calculateDtToFit(int, int, int, int, int);
+    method public int calculateDxToMakeVisible(android.view.View!, int);
+    method public int calculateDyToMakeVisible(android.view.View!, int);
+    method protected float calculateSpeedPerPixel(android.util.DisplayMetrics!);
+    method protected int calculateTimeForDeceleration(int);
+    method protected int calculateTimeForScrolling(int);
+    method protected int getHorizontalSnapPreference();
+    method protected int getVerticalSnapPreference();
+    method protected void onSeekTargetStep(int, int, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
+    method protected void onStart();
+    method protected void onStop();
+    method protected void onTargetFound(android.view.View!, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
+    method protected void updateActionForInterimTarget(androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
+    field public static final int SNAP_TO_ANY = 0; // 0x0
+    field public static final int SNAP_TO_END = 1; // 0x1
+    field public static final int SNAP_TO_START = -1; // 0xffffffff
+    field protected final android.view.animation.DecelerateInterpolator! mDecelerateInterpolator;
+    field protected int mInterimTargetDx;
+    field protected int mInterimTargetDy;
+    field protected final android.view.animation.LinearInterpolator! mLinearInterpolator;
+    field protected android.graphics.PointF! mTargetVector;
+  }
+
+  public class LinearSnapHelper extends androidx.recyclerview.widget.SnapHelper {
+    ctor public LinearSnapHelper();
+    method public int[]! calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
+    method public android.view.View! findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
+  }
+
+  public abstract class ListAdapter<T, VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> extends androidx.recyclerview.widget.RecyclerView.Adapter<VH> {
+    ctor protected ListAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
+    ctor protected ListAdapter(androidx.recyclerview.widget.AsyncDifferConfig<T!>);
+    method public java.util.List<T!> getCurrentList();
+    method protected T! getItem(int);
+    method public int getItemCount();
+    method public void onCurrentListChanged(java.util.List<T!>, java.util.List<T!>);
+    method public void submitList(java.util.List<T!>?);
+    method public void submitList(java.util.List<T!>?, Runnable?);
+  }
+
+  public interface ListUpdateCallback {
+    method public void onChanged(int, int, Object?);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public final class MergeAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder> {
+    ctor @java.lang.SafeVarargs public MergeAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!...);
+    ctor @java.lang.SafeVarargs public MergeAdapter(androidx.recyclerview.widget.MergeAdapter.Config, androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!...);
+    ctor public MergeAdapter(java.util.List<androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!>);
+    ctor public MergeAdapter(androidx.recyclerview.widget.MergeAdapter.Config, java.util.List<androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!>);
+    method public boolean addAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
+    method public boolean addAdapter(int, androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
+    method public java.util.List<androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!> getAdapters();
+    method public int getItemCount();
+    method public void onBindViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder onCreateViewHolder(android.view.ViewGroup, int);
+    method public boolean onFailedToRecycleView(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onViewAttachedToWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onViewDetachedFromWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onViewRecycled(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public boolean removeAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
+  }
+
+  public static class MergeAdapter.Config {
+    field public static final androidx.recyclerview.widget.MergeAdapter.Config DEFAULT;
+    field public final boolean isolateViewTypes;
+    field public final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode stableIdMode;
+  }
+
+  public static class MergeAdapter.Config.Builder {
+    ctor public MergeAdapter.Config.Builder();
+    method public androidx.recyclerview.widget.MergeAdapter.Config build();
+    method public androidx.recyclerview.widget.MergeAdapter.Config.Builder setIsolateViewTypes(boolean);
+    method public androidx.recyclerview.widget.MergeAdapter.Config.Builder setStableIdMode(androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode);
+  }
+
+  public enum MergeAdapter.Config.StableIdMode {
+    enum_constant public static final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode ISOLATED_STABLE_IDS;
+    enum_constant public static final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode NO_STABLE_IDS;
+    enum_constant public static final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode SHARED_STABLE_IDS;
+  }
+
+  public abstract class OrientationHelper {
+    method public static androidx.recyclerview.widget.OrientationHelper! createHorizontalHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public static androidx.recyclerview.widget.OrientationHelper! createOrientationHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int);
+    method public static androidx.recyclerview.widget.OrientationHelper! createVerticalHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public abstract int getDecoratedEnd(android.view.View!);
+    method public abstract int getDecoratedMeasurement(android.view.View!);
+    method public abstract int getDecoratedMeasurementInOther(android.view.View!);
+    method public abstract int getDecoratedStart(android.view.View!);
+    method public abstract int getEnd();
+    method public abstract int getEndAfterPadding();
+    method public abstract int getEndPadding();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutManager! getLayoutManager();
+    method public abstract int getMode();
+    method public abstract int getModeInOther();
+    method public abstract int getStartAfterPadding();
+    method public abstract int getTotalSpace();
+    method public int getTotalSpaceChange();
+    method public abstract int getTransformedEndWithDecoration(android.view.View!);
+    method public abstract int getTransformedStartWithDecoration(android.view.View!);
+    method public abstract void offsetChild(android.view.View!, int);
+    method public abstract void offsetChildren(int);
+    method public void onLayoutComplete();
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int VERTICAL = 1; // 0x1
+    field protected final androidx.recyclerview.widget.RecyclerView.LayoutManager! mLayoutManager;
+  }
+
+  public class PagerSnapHelper extends androidx.recyclerview.widget.SnapHelper {
+    ctor public PagerSnapHelper();
+    method public int[]? calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
+    method public android.view.View? findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
+  }
+
+  public class RecyclerView extends android.view.ViewGroup implements androidx.core.view.NestedScrollingChild2 androidx.core.view.NestedScrollingChild3 androidx.core.view.ScrollingView {
+    ctor public RecyclerView(android.content.Context);
+    ctor public RecyclerView(android.content.Context, android.util.AttributeSet?);
+    ctor public RecyclerView(android.content.Context, android.util.AttributeSet?, int);
+    method public void addItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration, int);
+    method public void addItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration);
+    method public void addOnChildAttachStateChangeListener(androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener);
+    method public void addOnItemTouchListener(androidx.recyclerview.widget.RecyclerView.OnItemTouchListener);
+    method public void addOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener);
+    method public void clearOnChildAttachStateChangeListeners();
+    method public void clearOnScrollListeners();
+    method public int computeHorizontalScrollExtent();
+    method public int computeHorizontalScrollOffset();
+    method public int computeHorizontalScrollRange();
+    method public int computeVerticalScrollExtent();
+    method public int computeVerticalScrollOffset();
+    method public int computeVerticalScrollRange();
+    method public boolean dispatchNestedPreScroll(int, int, int[]!, int[]!, int);
+    method public boolean dispatchNestedScroll(int, int, int, int, int[]!, int);
+    method public final void dispatchNestedScroll(int, int, int, int, int[]!, int, int[]);
+    method public boolean drawChild(android.graphics.Canvas!, android.view.View!, long);
+    method public android.view.View? findChildViewUnder(float, float);
+    method public android.view.View? findContainingItemView(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findContainingViewHolder(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForAdapterPosition(int);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! findViewHolderForItemId(long);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForLayoutPosition(int);
+    method @Deprecated public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForPosition(int);
+    method public boolean fling(int, int);
+    method public androidx.recyclerview.widget.RecyclerView.Adapter? getAdapter();
+    method public int getChildAdapterPosition(android.view.View);
+    method public long getChildItemId(android.view.View);
+    method public int getChildLayoutPosition(android.view.View);
+    method @Deprecated public int getChildPosition(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! getChildViewHolder(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate? getCompatAccessibilityDelegate();
+    method public void getDecoratedBoundsWithMargins(android.view.View, android.graphics.Rect);
+    method public androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory getEdgeEffectFactory();
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator? getItemAnimator();
+    method public androidx.recyclerview.widget.RecyclerView.ItemDecoration getItemDecorationAt(int);
+    method public int getItemDecorationCount();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutManager? getLayoutManager();
+    method public int getMaxFlingVelocity();
+    method public int getMinFlingVelocity();
+    method public androidx.recyclerview.widget.RecyclerView.OnFlingListener? getOnFlingListener();
+    method public boolean getPreserveFocusAfterLayout();
+    method public androidx.recyclerview.widget.RecyclerView.RecycledViewPool getRecycledViewPool();
+    method public int getScrollState();
+    method public boolean hasFixedSize();
+    method public boolean hasNestedScrollingParent(int);
+    method public boolean hasPendingAdapterUpdates();
+    method public void invalidateItemDecorations();
+    method public boolean isAnimating();
+    method public boolean isComputingLayout();
+    method @Deprecated public boolean isLayoutFrozen();
+    method public final boolean isLayoutSuppressed();
+    method public void nestedScrollBy(int, int);
+    method public void offsetChildrenHorizontal(@Px int);
+    method public void offsetChildrenVertical(@Px int);
+    method public void onChildAttachedToWindow(android.view.View);
+    method public void onChildDetachedFromWindow(android.view.View);
+    method public void onDraw(android.graphics.Canvas!);
+    method public void onScrollStateChanged(int);
+    method public void onScrolled(@Px int, @Px int);
+    method public void removeItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration);
+    method public void removeItemDecorationAt(int);
+    method public void removeOnChildAttachStateChangeListener(androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener);
+    method public void removeOnItemTouchListener(androidx.recyclerview.widget.RecyclerView.OnItemTouchListener);
+    method public void removeOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener);
+    method public void scrollToPosition(int);
+    method public void setAccessibilityDelegateCompat(androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate?);
+    method public void setAdapter(androidx.recyclerview.widget.RecyclerView.Adapter?);
+    method public void setChildDrawingOrderCallback(androidx.recyclerview.widget.RecyclerView.ChildDrawingOrderCallback?);
+    method public void setEdgeEffectFactory(androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory);
+    method public void setHasFixedSize(boolean);
+    method public void setItemAnimator(androidx.recyclerview.widget.RecyclerView.ItemAnimator?);
+    method public void setItemViewCacheSize(int);
+    method @Deprecated public void setLayoutFrozen(boolean);
+    method public void setLayoutManager(androidx.recyclerview.widget.RecyclerView.LayoutManager?);
+    method @Deprecated public void setLayoutTransition(android.animation.LayoutTransition!);
+    method public void setOnFlingListener(androidx.recyclerview.widget.RecyclerView.OnFlingListener?);
+    method @Deprecated public void setOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener?);
+    method public void setPreserveFocusAfterLayout(boolean);
+    method public void setRecycledViewPool(androidx.recyclerview.widget.RecyclerView.RecycledViewPool?);
+    method public void setRecyclerListener(androidx.recyclerview.widget.RecyclerView.RecyclerListener?);
+    method public void setScrollingTouchSlop(int);
+    method public void setViewCacheExtension(androidx.recyclerview.widget.RecyclerView.ViewCacheExtension?);
+    method public void smoothScrollBy(@Px int, @Px int);
+    method public void smoothScrollBy(@Px int, @Px int, android.view.animation.Interpolator?);
+    method public void smoothScrollBy(@Px int, @Px int, android.view.animation.Interpolator?, int);
+    method public void smoothScrollToPosition(int);
+    method public boolean startNestedScroll(int, int);
+    method public void stopNestedScroll(int);
+    method public void stopScroll();
+    method public final void suppressLayout(boolean);
+    method public void swapAdapter(androidx.recyclerview.widget.RecyclerView.Adapter?, boolean);
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int INVALID_TYPE = -1; // 0xffffffff
+    field public static final long NO_ID = -1L; // 0xffffffffffffffffL
+    field public static final int NO_POSITION = -1; // 0xffffffff
+    field public static final int SCROLL_STATE_DRAGGING = 1; // 0x1
+    field public static final int SCROLL_STATE_IDLE = 0; // 0x0
+    field public static final int SCROLL_STATE_SETTLING = 2; // 0x2
+    field public static final int TOUCH_SLOP_DEFAULT = 0; // 0x0
+    field public static final int TOUCH_SLOP_PAGING = 1; // 0x1
+    field public static final int UNDEFINED_DURATION = -2147483648; // 0x80000000
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  public abstract static class RecyclerView.Adapter<VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> {
+    ctor public RecyclerView.Adapter();
+    method public final void bindViewHolder(VH, int);
+    method public final VH createViewHolder(android.view.ViewGroup, int);
+    method public int findRelativeAdapterPositionIn(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>, androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
+    method public abstract int getItemCount();
+    method public long getItemId(int);
+    method public int getItemViewType(int);
+    method public final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy getStateRestorationPolicy();
+    method public final boolean hasObservers();
+    method public final boolean hasStableIds();
+    method public final void notifyDataSetChanged();
+    method public final void notifyItemChanged(int);
+    method public final void notifyItemChanged(int, Object?);
+    method public final void notifyItemInserted(int);
+    method public final void notifyItemMoved(int, int);
+    method public final void notifyItemRangeChanged(int, int);
+    method public final void notifyItemRangeChanged(int, int, Object?);
+    method public final void notifyItemRangeInserted(int, int);
+    method public final void notifyItemRangeRemoved(int, int);
+    method public final void notifyItemRemoved(int);
+    method public void onAttachedToRecyclerView(androidx.recyclerview.widget.RecyclerView);
+    method public abstract void onBindViewHolder(VH, int);
+    method public void onBindViewHolder(VH, int, java.util.List<java.lang.Object!>);
+    method public abstract VH onCreateViewHolder(android.view.ViewGroup, int);
+    method public void onDetachedFromRecyclerView(androidx.recyclerview.widget.RecyclerView);
+    method public boolean onFailedToRecycleView(VH);
+    method public void onViewAttachedToWindow(VH);
+    method public void onViewDetachedFromWindow(VH);
+    method public void onViewRecycled(VH);
+    method public void registerAdapterDataObserver(androidx.recyclerview.widget.RecyclerView.AdapterDataObserver);
+    method public void setHasStableIds(boolean);
+    method public void setStateRestorationPolicy(androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy);
+    method public void unregisterAdapterDataObserver(androidx.recyclerview.widget.RecyclerView.AdapterDataObserver);
+  }
+
+  public enum RecyclerView.Adapter.StateRestorationPolicy {
+    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy ALLOW;
+    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy PREVENT;
+    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy PREVENT_WHEN_EMPTY;
+  }
+
+  public abstract static class RecyclerView.AdapterDataObserver {
+    ctor public RecyclerView.AdapterDataObserver();
+    method public void onChanged();
+    method public void onItemRangeChanged(int, int);
+    method public void onItemRangeChanged(int, int, Object?);
+    method public void onItemRangeInserted(int, int);
+    method public void onItemRangeMoved(int, int, int);
+    method public void onItemRangeRemoved(int, int);
+    method public void onStateRestorationPolicyChanged();
+  }
+
+  public static interface RecyclerView.ChildDrawingOrderCallback {
+    method public int onGetChildDrawingOrder(int, int);
+  }
+
+  public static class RecyclerView.EdgeEffectFactory {
+    ctor public RecyclerView.EdgeEffectFactory();
+    method protected android.widget.EdgeEffect createEdgeEffect(androidx.recyclerview.widget.RecyclerView, @androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.EdgeDirection int);
+    field public static final int DIRECTION_BOTTOM = 3; // 0x3
+    field public static final int DIRECTION_LEFT = 0; // 0x0
+    field public static final int DIRECTION_RIGHT = 2; // 0x2
+    field public static final int DIRECTION_TOP = 1; // 0x1
+  }
+
+  @IntDef({androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_LEFT, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_TOP, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_RIGHT, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_BOTTOM}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface RecyclerView.EdgeEffectFactory.EdgeDirection {
+  }
+
+  public abstract static class RecyclerView.ItemAnimator {
+    ctor public RecyclerView.ItemAnimator();
+    method public abstract boolean animateAppearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateDisappearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?);
+    method public abstract boolean animatePersistence(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public boolean canReuseUpdatedViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public boolean canReuseUpdatedViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder, java.util.List<java.lang.Object!>);
+    method public final void dispatchAnimationFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public final void dispatchAnimationStarted(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public final void dispatchAnimationsFinished();
+    method public abstract void endAnimation(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public abstract void endAnimations();
+    method public long getAddDuration();
+    method public long getChangeDuration();
+    method public long getMoveDuration();
+    method public long getRemoveDuration();
+    method public abstract boolean isRunning();
+    method public final boolean isRunning(androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemAnimatorFinishedListener?);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo obtainHolderInfo();
+    method public void onAnimationFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onAnimationStarted(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo recordPostLayoutInformation(androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo recordPreLayoutInformation(androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.ViewHolder, @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges int, java.util.List<java.lang.Object!>);
+    method public abstract void runPendingAnimations();
+    method public void setAddDuration(long);
+    method public void setChangeDuration(long);
+    method public void setMoveDuration(long);
+    method public void setRemoveDuration(long);
+    field public static final int FLAG_APPEARED_IN_PRE_LAYOUT = 4096; // 0x1000
+    field public static final int FLAG_CHANGED = 2; // 0x2
+    field public static final int FLAG_INVALIDATED = 4; // 0x4
+    field public static final int FLAG_MOVED = 2048; // 0x800
+    field public static final int FLAG_REMOVED = 8; // 0x8
+  }
+
+  @IntDef(flag=true, value={androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_CHANGED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_REMOVED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_MOVED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_INVALIDATED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_APPEARED_IN_PRE_LAYOUT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface RecyclerView.ItemAnimator.AdapterChanges {
+  }
+
+  public static interface RecyclerView.ItemAnimator.ItemAnimatorFinishedListener {
+    method public void onAnimationsFinished();
+  }
+
+  public static class RecyclerView.ItemAnimator.ItemHolderInfo {
+    ctor public RecyclerView.ItemAnimator.ItemHolderInfo();
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo setFrom(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo setFrom(androidx.recyclerview.widget.RecyclerView.ViewHolder, @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges int);
+    field public int bottom;
+    field @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges public int changeFlags;
+    field public int left;
+    field public int right;
+    field public int top;
+  }
+
+  public abstract static class RecyclerView.ItemDecoration {
+    ctor public RecyclerView.ItemDecoration();
+    method @Deprecated public void getItemOffsets(android.graphics.Rect, int, androidx.recyclerview.widget.RecyclerView);
+    method public void getItemOffsets(android.graphics.Rect, android.view.View, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
+    method public void onDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
+    method @Deprecated public void onDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView);
+    method public void onDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
+    method @Deprecated public void onDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView);
+  }
+
+  public abstract static class RecyclerView.LayoutManager {
+    ctor public RecyclerView.LayoutManager();
+    method public void addDisappearingView(android.view.View!);
+    method public void addDisappearingView(android.view.View!, int);
+    method public void addView(android.view.View!);
+    method public void addView(android.view.View!, int);
+    method public void assertInLayoutOrScroll(String!);
+    method public void assertNotInLayoutOrScroll(String!);
+    method public void attachView(android.view.View, int, androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public void attachView(android.view.View, int);
+    method public void attachView(android.view.View);
+    method public void calculateItemDecorationsForChild(android.view.View, android.graphics.Rect);
+    method public boolean canScrollHorizontally();
+    method public boolean canScrollVertically();
+    method public boolean checkLayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public static int chooseSize(int, int, int);
+    method public void collectAdjacentPrefetchPositions(int, int, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.LayoutManager.LayoutPrefetchRegistry!);
+    method public void collectInitialPrefetchPositions(int, androidx.recyclerview.widget.RecyclerView.LayoutManager.LayoutPrefetchRegistry!);
+    method public int computeHorizontalScrollExtent(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeHorizontalScrollOffset(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeHorizontalScrollRange(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeVerticalScrollExtent(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeVerticalScrollOffset(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeVerticalScrollRange(androidx.recyclerview.widget.RecyclerView.State);
+    method public void detachAndScrapAttachedViews(androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void detachAndScrapView(android.view.View, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void detachAndScrapViewAt(int, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void detachView(android.view.View);
+    method public void detachViewAt(int);
+    method public void endAnimation(android.view.View!);
+    method public android.view.View? findContainingItemView(android.view.View);
+    method public android.view.View? findViewByPosition(int);
+    method public abstract androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateLayoutParams(android.content.Context!, android.util.AttributeSet!);
+    method public int getBaseline();
+    method public int getBottomDecorationHeight(android.view.View);
+    method public android.view.View? getChildAt(int);
+    method public int getChildCount();
+    method @Deprecated public static int getChildMeasureSpec(int, int, int, boolean);
+    method public static int getChildMeasureSpec(int, int, int, int, boolean);
+    method public boolean getClipToPadding();
+    method public int getColumnCountForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public int getDecoratedBottom(android.view.View);
+    method public void getDecoratedBoundsWithMargins(android.view.View, android.graphics.Rect);
+    method public int getDecoratedLeft(android.view.View);
+    method public int getDecoratedMeasuredHeight(android.view.View);
+    method public int getDecoratedMeasuredWidth(android.view.View);
+    method public int getDecoratedRight(android.view.View);
+    method public int getDecoratedTop(android.view.View);
+    method public android.view.View? getFocusedChild();
+    method @Px public int getHeight();
+    method public int getHeightMode();
+    method public int getItemCount();
+    method public int getItemViewType(android.view.View);
+    method public int getLayoutDirection();
+    method public int getLeftDecorationWidth(android.view.View);
+    method @Px public int getMinimumHeight();
+    method @Px public int getMinimumWidth();
+    method @Px public int getPaddingBottom();
+    method @Px public int getPaddingEnd();
+    method @Px public int getPaddingLeft();
+    method @Px public int getPaddingRight();
+    method @Px public int getPaddingStart();
+    method @Px public int getPaddingTop();
+    method public int getPosition(android.view.View);
+    method public static androidx.recyclerview.widget.RecyclerView.LayoutManager.Properties! getProperties(android.content.Context, android.util.AttributeSet?, int, int);
+    method public int getRightDecorationWidth(android.view.View);
+    method public int getRowCountForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public int getSelectionModeForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public int getTopDecorationHeight(android.view.View);
+    method public void getTransformedBoundingBox(android.view.View, boolean, android.graphics.Rect);
+    method @Px public int getWidth();
+    method public int getWidthMode();
+    method public boolean hasFocus();
+    method public void ignoreView(android.view.View);
+    method public boolean isAttachedToWindow();
+    method public boolean isAutoMeasureEnabled();
+    method public boolean isFocused();
+    method public final boolean isItemPrefetchEnabled();
+    method public boolean isLayoutHierarchical(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public boolean isMeasurementCacheEnabled();
+    method public boolean isSmoothScrolling();
+    method public boolean isViewPartiallyVisible(android.view.View, boolean, boolean);
+    method public void layoutDecorated(android.view.View, int, int, int, int);
+    method public void layoutDecoratedWithMargins(android.view.View, int, int, int, int);
+    method public void measureChild(android.view.View, int, int);
+    method public void measureChildWithMargins(android.view.View, int, int);
+    method public void moveView(int, int);
+    method public void offsetChildrenHorizontal(@Px int);
+    method public void offsetChildrenVertical(@Px int);
+    method public void onAdapterChanged(androidx.recyclerview.widget.RecyclerView.Adapter?, androidx.recyclerview.widget.RecyclerView.Adapter?);
+    method public boolean onAddFocusables(androidx.recyclerview.widget.RecyclerView, java.util.ArrayList<android.view.View!>, int, int);
+    method @CallSuper public void onAttachedToWindow(androidx.recyclerview.widget.RecyclerView!);
+    method @Deprecated public void onDetachedFromWindow(androidx.recyclerview.widget.RecyclerView!);
+    method @CallSuper public void onDetachedFromWindow(androidx.recyclerview.widget.RecyclerView!, androidx.recyclerview.widget.RecyclerView.Recycler!);
+    method public android.view.View? onFocusSearchFailed(android.view.View, int, androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+    method public void onInitializeAccessibilityEvent(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.accessibility.AccessibilityEvent);
+    method public void onInitializeAccessibilityNodeInfo(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, androidx.core.view.accessibility.AccessibilityNodeInfoCompat);
+    method public void onInitializeAccessibilityNodeInfoForItem(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.View, androidx.core.view.accessibility.AccessibilityNodeInfoCompat);
+    method public android.view.View? onInterceptFocusSearch(android.view.View, int);
+    method public void onItemsAdded(androidx.recyclerview.widget.RecyclerView, int, int);
+    method public void onItemsChanged(androidx.recyclerview.widget.RecyclerView);
+    method public void onItemsMoved(androidx.recyclerview.widget.RecyclerView, int, int, int);
+    method public void onItemsRemoved(androidx.recyclerview.widget.RecyclerView, int, int);
+    method public void onItemsUpdated(androidx.recyclerview.widget.RecyclerView, int, int);
+    method public void onItemsUpdated(androidx.recyclerview.widget.RecyclerView, int, int, Object?);
+    method public void onLayoutChildren(androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
+    method public void onLayoutCompleted(androidx.recyclerview.widget.RecyclerView.State!);
+    method public void onMeasure(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, int, int);
+    method @Deprecated public boolean onRequestChildFocus(androidx.recyclerview.widget.RecyclerView, android.view.View, android.view.View?);
+    method public boolean onRequestChildFocus(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State, android.view.View, android.view.View?);
+    method public void onRestoreInstanceState(android.os.Parcelable!);
+    method public android.os.Parcelable? onSaveInstanceState();
+    method public void onScrollStateChanged(int);
+    method public boolean performAccessibilityAction(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, int, android.os.Bundle?);
+    method public boolean performAccessibilityActionForItem(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.View, int, android.os.Bundle?);
+    method public void postOnAnimation(Runnable!);
+    method public void removeAllViews();
+    method public void removeAndRecycleAllViews(androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void removeAndRecycleView(android.view.View, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void removeAndRecycleViewAt(int, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public boolean removeCallbacks(Runnable!);
+    method public void removeDetachedView(android.view.View);
+    method public void removeView(android.view.View!);
+    method public void removeViewAt(int);
+    method public boolean requestChildRectangleOnScreen(androidx.recyclerview.widget.RecyclerView, android.view.View, android.graphics.Rect, boolean);
+    method public boolean requestChildRectangleOnScreen(androidx.recyclerview.widget.RecyclerView, android.view.View, android.graphics.Rect, boolean, boolean);
+    method public void requestLayout();
+    method public void requestSimpleAnimationsInNextLayout();
+    method public int scrollHorizontallyBy(int, androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
+    method public void scrollToPosition(int);
+    method public int scrollVerticallyBy(int, androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
+    method @Deprecated public void setAutoMeasureEnabled(boolean);
+    method public final void setItemPrefetchEnabled(boolean);
+    method public void setMeasuredDimension(android.graphics.Rect!, int, int);
+    method public void setMeasuredDimension(int, int);
+    method public void setMeasurementCacheEnabled(boolean);
+    method public void smoothScrollToPosition(androidx.recyclerview.widget.RecyclerView!, androidx.recyclerview.widget.RecyclerView.State!, int);
+    method public void startSmoothScroll(androidx.recyclerview.widget.RecyclerView.SmoothScroller!);
+    method public void stopIgnoringView(android.view.View);
+    method public boolean supportsPredictiveItemAnimations();
+  }
+
+  public static interface RecyclerView.LayoutManager.LayoutPrefetchRegistry {
+    method public void addPosition(int, int);
+  }
+
+  public static class RecyclerView.LayoutManager.Properties {
+    ctor public RecyclerView.LayoutManager.Properties();
+    field public int orientation;
+    field public boolean reverseLayout;
+    field public int spanCount;
+    field public boolean stackFromEnd;
+  }
+
+  public static class RecyclerView.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
+    ctor public RecyclerView.LayoutParams(android.content.Context!, android.util.AttributeSet!);
+    ctor public RecyclerView.LayoutParams(int, int);
+    ctor public RecyclerView.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
+    ctor public RecyclerView.LayoutParams(android.view.ViewGroup.LayoutParams!);
+    ctor public RecyclerView.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public int getAbsoluteAdapterPosition();
+    method public int getBindingAdapterPosition();
+    method @Deprecated public int getViewAdapterPosition();
+    method public int getViewLayoutPosition();
+    method @Deprecated public int getViewPosition();
+    method public boolean isItemChanged();
+    method public boolean isItemRemoved();
+    method public boolean isViewInvalid();
+    method public boolean viewNeedsUpdate();
+  }
+
+  public static interface RecyclerView.OnChildAttachStateChangeListener {
+    method public void onChildViewAttachedToWindow(android.view.View);
+    method public void onChildViewDetachedFromWindow(android.view.View);
+  }
+
+  public abstract static class RecyclerView.OnFlingListener {
+    ctor public RecyclerView.OnFlingListener();
+    method public abstract boolean onFling(int, int);
+  }
+
+  public static interface RecyclerView.OnItemTouchListener {
+    method public boolean onInterceptTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+    method public void onRequestDisallowInterceptTouchEvent(boolean);
+    method public void onTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+  }
+
+  public abstract static class RecyclerView.OnScrollListener {
+    ctor public RecyclerView.OnScrollListener();
+    method public void onScrollStateChanged(androidx.recyclerview.widget.RecyclerView, int);
+    method public void onScrolled(androidx.recyclerview.widget.RecyclerView, int, int);
+  }
+
+  public static class RecyclerView.RecycledViewPool {
+    ctor public RecyclerView.RecycledViewPool();
+    method public void clear();
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? getRecycledView(int);
+    method public int getRecycledViewCount(int);
+    method public void putRecycledView(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void setMaxRecycledViews(int, int);
+  }
+
+  public final class RecyclerView.Recycler {
+    ctor public RecyclerView.Recycler();
+    method public void bindViewToPosition(android.view.View, int);
+    method public void clear();
+    method public int convertPreLayoutPositionToPostLayout(int);
+    method public java.util.List<androidx.recyclerview.widget.RecyclerView.ViewHolder!> getScrapList();
+    method public android.view.View getViewForPosition(int);
+    method public void recycleView(android.view.View);
+    method public void setViewCacheSize(int);
+  }
+
+  public static interface RecyclerView.RecyclerListener {
+    method public void onViewRecycled(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+  }
+
+  public static class RecyclerView.SimpleOnItemTouchListener implements androidx.recyclerview.widget.RecyclerView.OnItemTouchListener {
+    ctor public RecyclerView.SimpleOnItemTouchListener();
+    method public boolean onInterceptTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+    method public void onRequestDisallowInterceptTouchEvent(boolean);
+    method public void onTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+  }
+
+  public abstract static class RecyclerView.SmoothScroller {
+    ctor public RecyclerView.SmoothScroller();
+    method public android.graphics.PointF? computeScrollVectorForPosition(int);
+    method public android.view.View! findViewByPosition(int);
+    method public int getChildCount();
+    method public int getChildPosition(android.view.View!);
+    method public androidx.recyclerview.widget.RecyclerView.LayoutManager? getLayoutManager();
+    method public int getTargetPosition();
+    method @Deprecated public void instantScrollToPosition(int);
+    method public boolean isPendingInitialRun();
+    method public boolean isRunning();
+    method protected void normalize(android.graphics.PointF);
+    method protected void onChildAttachedToWindow(android.view.View!);
+    method protected abstract void onSeekTargetStep(@Px int, @Px int, androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action);
+    method protected abstract void onStart();
+    method protected abstract void onStop();
+    method protected abstract void onTargetFound(android.view.View, androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action);
+    method public void setTargetPosition(int);
+    method protected final void stop();
+  }
+
+  public static class RecyclerView.SmoothScroller.Action {
+    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int);
+    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int, int);
+    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int, int, android.view.animation.Interpolator?);
+    method public int getDuration();
+    method @Px public int getDx();
+    method @Px public int getDy();
+    method public android.view.animation.Interpolator? getInterpolator();
+    method public void jumpTo(int);
+    method public void setDuration(int);
+    method public void setDx(@Px int);
+    method public void setDy(@Px int);
+    method public void setInterpolator(android.view.animation.Interpolator?);
+    method public void update(@Px int, @Px int, int, android.view.animation.Interpolator?);
+    field public static final int UNDEFINED_DURATION = -2147483648; // 0x80000000
+  }
+
+  public static interface RecyclerView.SmoothScroller.ScrollVectorProvider {
+    method public android.graphics.PointF? computeScrollVectorForPosition(int);
+  }
+
+  public static class RecyclerView.State {
+    ctor public RecyclerView.State();
+    method public boolean didStructureChange();
+    method public <T> T! get(int);
+    method public int getItemCount();
+    method public int getRemainingScrollHorizontal();
+    method public int getRemainingScrollVertical();
+    method public int getTargetScrollPosition();
+    method public boolean hasTargetScrollPosition();
+    method public boolean isMeasuring();
+    method public boolean isPreLayout();
+    method public void put(int, Object!);
+    method public void remove(int);
+    method public boolean willRunPredictiveAnimations();
+    method public boolean willRunSimpleAnimations();
+  }
+
+  public abstract static class RecyclerView.ViewCacheExtension {
+    ctor public RecyclerView.ViewCacheExtension();
+    method public abstract android.view.View? getViewForPositionAndType(androidx.recyclerview.widget.RecyclerView.Recycler, int, int);
+  }
+
+  public abstract static class RecyclerView.ViewHolder {
+    ctor public RecyclerView.ViewHolder(android.view.View);
+    method public final int getAbsoluteAdapterPosition();
+    method @Deprecated public final int getAdapterPosition();
+    method public final androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>? getBindingAdapter();
+    method public final int getBindingAdapterPosition();
+    method public final long getItemId();
+    method public final int getItemViewType();
+    method public final int getLayoutPosition();
+    method public final int getOldPosition();
+    method @Deprecated public final int getPosition();
+    method public final boolean isRecyclable();
+    method public final void setIsRecyclable(boolean);
+    field public final android.view.View itemView;
+  }
+
+  public class RecyclerViewAccessibilityDelegate extends androidx.core.view.AccessibilityDelegateCompat {
+    ctor public RecyclerViewAccessibilityDelegate(androidx.recyclerview.widget.RecyclerView);
+    method public androidx.core.view.AccessibilityDelegateCompat getItemDelegate();
+  }
+
+  public static class RecyclerViewAccessibilityDelegate.ItemDelegate extends androidx.core.view.AccessibilityDelegateCompat {
+    ctor public RecyclerViewAccessibilityDelegate.ItemDelegate(androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate);
+  }
+
+  public abstract class SimpleItemAnimator extends androidx.recyclerview.widget.RecyclerView.ItemAnimator {
+    ctor public SimpleItemAnimator();
+    method public abstract boolean animateAdd(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public boolean animateAppearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder!, androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animateDisappearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?);
+    method public abstract boolean animateMove(androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animatePersistence(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateRemove(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchAddFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchAddStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchChangeFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public final void dispatchChangeStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public final void dispatchMoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchMoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchRemoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchRemoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public boolean getSupportsChangeAnimations();
+    method public void onAddFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onAddStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onChangeFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public void onChangeStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public void onMoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onMoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onRemoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onRemoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void setSupportsChangeAnimations(boolean);
+  }
+
+  public abstract class SnapHelper extends androidx.recyclerview.widget.RecyclerView.OnFlingListener {
+    ctor public SnapHelper();
+    method public void attachToRecyclerView(androidx.recyclerview.widget.RecyclerView?) throws java.lang.IllegalStateException;
+    method public abstract int[]? calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
+    method public int[]! calculateScrollDistance(int, int);
+    method protected androidx.recyclerview.widget.RecyclerView.SmoothScroller? createScroller(androidx.recyclerview.widget.RecyclerView.LayoutManager);
+    method @Deprecated protected androidx.recyclerview.widget.LinearSmoothScroller? createSnapScroller(androidx.recyclerview.widget.RecyclerView.LayoutManager);
+    method public abstract android.view.View? findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public abstract int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
+    method public boolean onFling(int, int);
+  }
+
+  public class SortedList<T> {
+    ctor public SortedList(Class<T!>, androidx.recyclerview.widget.SortedList.Callback<T!>);
+    ctor public SortedList(Class<T!>, androidx.recyclerview.widget.SortedList.Callback<T!>, int);
+    method public int add(T!);
+    method public void addAll(T![], boolean);
+    method public void addAll(T!...);
+    method public void addAll(java.util.Collection<T!>);
+    method public void beginBatchedUpdates();
+    method public void clear();
+    method public void endBatchedUpdates();
+    method public T! get(int) throws java.lang.IndexOutOfBoundsException;
+    method public int indexOf(T!);
+    method public void recalculatePositionOfItemAt(int);
+    method public boolean remove(T!);
+    method public T! removeItemAt(int);
+    method public void replaceAll(T![], boolean);
+    method public void replaceAll(T!...);
+    method public void replaceAll(java.util.Collection<T!>);
+    method public int size();
+    method public void updateItemAt(int, T!);
+    field public static final int INVALID_POSITION = -1; // 0xffffffff
+  }
+
+  public static class SortedList.BatchedCallback<T2> extends androidx.recyclerview.widget.SortedList.Callback<T2> {
+    ctor public SortedList.BatchedCallback(androidx.recyclerview.widget.SortedList.Callback<T2!>!);
+    method public boolean areContentsTheSame(T2!, T2!);
+    method public boolean areItemsTheSame(T2!, T2!);
+    method public int compare(T2!, T2!);
+    method public void dispatchLastEvent();
+    method public void onChanged(int, int);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public abstract static class SortedList.Callback<T2> implements java.util.Comparator<T2> androidx.recyclerview.widget.ListUpdateCallback {
+    ctor public SortedList.Callback();
+    method public abstract boolean areContentsTheSame(T2!, T2!);
+    method public abstract boolean areItemsTheSame(T2!, T2!);
+    method public abstract int compare(T2!, T2!);
+    method public Object? getChangePayload(T2!, T2!);
+    method public abstract void onChanged(int, int);
+    method public void onChanged(int, int, Object!);
+  }
+
+  public abstract class SortedListAdapterCallback<T2> extends androidx.recyclerview.widget.SortedList.Callback<T2> {
+    ctor public SortedListAdapterCallback(androidx.recyclerview.widget.RecyclerView.Adapter!);
+    method public void onChanged(int, int);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public class StaggeredGridLayoutManager extends androidx.recyclerview.widget.RecyclerView.LayoutManager implements androidx.recyclerview.widget.RecyclerView.SmoothScroller.ScrollVectorProvider {
+    ctor public StaggeredGridLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
+    ctor public StaggeredGridLayoutManager(int, int);
+    method public android.graphics.PointF! computeScrollVectorForPosition(int);
+    method public int[]! findFirstCompletelyVisibleItemPositions(int[]!);
+    method public int[]! findFirstVisibleItemPositions(int[]!);
+    method public int[]! findLastCompletelyVisibleItemPositions(int[]!);
+    method public int[]! findLastVisibleItemPositions(int[]!);
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
+    method public int getGapStrategy();
+    method public int getOrientation();
+    method public boolean getReverseLayout();
+    method public int getSpanCount();
+    method public void invalidateSpanAssignments();
+    method public void scrollToPositionWithOffset(int, int);
+    method public void setGapStrategy(int);
+    method public void setOrientation(int);
+    method public void setReverseLayout(boolean);
+    method public void setSpanCount(int);
+    field @Deprecated public static final int GAP_HANDLING_LAZY = 1; // 0x1
+    field public static final int GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS = 2; // 0x2
+    field public static final int GAP_HANDLING_NONE = 0; // 0x0
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  public static class StaggeredGridLayoutManager.LayoutParams extends androidx.recyclerview.widget.RecyclerView.LayoutParams {
+    ctor public StaggeredGridLayoutManager.LayoutParams(android.content.Context!, android.util.AttributeSet!);
+    ctor public StaggeredGridLayoutManager.LayoutParams(int, int);
+    ctor public StaggeredGridLayoutManager.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
+    ctor public StaggeredGridLayoutManager.LayoutParams(android.view.ViewGroup.LayoutParams!);
+    ctor public StaggeredGridLayoutManager.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public final int getSpanIndex();
+    method public boolean isFullSpan();
+    method public void setFullSpan(boolean);
+    field public static final int INVALID_SPAN_ID = -1; // 0xffffffff
+  }
+
+}
+
diff --git a/recyclerview/recyclerview/api/public_plus_experimental_1.2.0-alpha03.txt b/recyclerview/recyclerview/api/public_plus_experimental_1.2.0-alpha03.txt
new file mode 100644
index 0000000..45eaa5e
--- /dev/null
+++ b/recyclerview/recyclerview/api/public_plus_experimental_1.2.0-alpha03.txt
@@ -0,0 +1,1089 @@
+// Signature format: 3.0
+package androidx.recyclerview.widget {
+
+  public final class AdapterListUpdateCallback implements androidx.recyclerview.widget.ListUpdateCallback {
+    ctor public AdapterListUpdateCallback(androidx.recyclerview.widget.RecyclerView.Adapter);
+    method public void onChanged(int, int, Object!);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public final class AsyncDifferConfig<T> {
+    method public java.util.concurrent.Executor getBackgroundThreadExecutor();
+    method public androidx.recyclerview.widget.DiffUtil.ItemCallback<T!> getDiffCallback();
+  }
+
+  public static final class AsyncDifferConfig.Builder<T> {
+    ctor public AsyncDifferConfig.Builder(androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
+    method public androidx.recyclerview.widget.AsyncDifferConfig<T!> build();
+    method public androidx.recyclerview.widget.AsyncDifferConfig.Builder<T!> setBackgroundThreadExecutor(java.util.concurrent.Executor!);
+  }
+
+  public class AsyncListDiffer<T> {
+    ctor public AsyncListDiffer(androidx.recyclerview.widget.RecyclerView.Adapter, androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
+    ctor public AsyncListDiffer(androidx.recyclerview.widget.ListUpdateCallback, androidx.recyclerview.widget.AsyncDifferConfig<T!>);
+    method public void addListListener(androidx.recyclerview.widget.AsyncListDiffer.ListListener<T!>);
+    method public java.util.List<T!> getCurrentList();
+    method public void removeListListener(androidx.recyclerview.widget.AsyncListDiffer.ListListener<T!>);
+    method public void submitList(java.util.List<T!>?);
+    method public void submitList(java.util.List<T!>?, Runnable?);
+  }
+
+  public static interface AsyncListDiffer.ListListener<T> {
+    method public void onCurrentListChanged(java.util.List<T!>, java.util.List<T!>);
+  }
+
+  public class AsyncListUtil<T> {
+    ctor public AsyncListUtil(Class<T!>, int, androidx.recyclerview.widget.AsyncListUtil.DataCallback<T!>, androidx.recyclerview.widget.AsyncListUtil.ViewCallback);
+    method public T? getItem(int);
+    method public int getItemCount();
+    method public void onRangeChanged();
+    method public void refresh();
+  }
+
+  public abstract static class AsyncListUtil.DataCallback<T> {
+    ctor public AsyncListUtil.DataCallback();
+    method @WorkerThread public abstract void fillData(T![], int, int);
+    method @WorkerThread public int getMaxCachedTiles();
+    method @WorkerThread public void recycleData(T![], int);
+    method @WorkerThread public abstract int refreshData();
+  }
+
+  public abstract static class AsyncListUtil.ViewCallback {
+    ctor public AsyncListUtil.ViewCallback();
+    method @UiThread public void extendRangeInto(int[], int[], int);
+    method @UiThread public abstract void getItemRangeInto(int[]);
+    method @UiThread public abstract void onDataRefresh();
+    method @UiThread public abstract void onItemLoaded(int);
+    field public static final int HINT_SCROLL_ASC = 2; // 0x2
+    field public static final int HINT_SCROLL_DESC = 1; // 0x1
+    field public static final int HINT_SCROLL_NONE = 0; // 0x0
+  }
+
+  public class BatchingListUpdateCallback implements androidx.recyclerview.widget.ListUpdateCallback {
+    ctor public BatchingListUpdateCallback(androidx.recyclerview.widget.ListUpdateCallback);
+    method public void dispatchLastEvent();
+    method public void onChanged(int, int, Object!);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public class DefaultItemAnimator extends androidx.recyclerview.widget.SimpleItemAnimator {
+    ctor public DefaultItemAnimator();
+    method public boolean animateAdd(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder!, androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animateMove(androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animateRemove(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void endAnimation(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void endAnimations();
+    method public boolean isRunning();
+    method public void runPendingAnimations();
+  }
+
+  public class DiffUtil {
+    method public static androidx.recyclerview.widget.DiffUtil.DiffResult calculateDiff(androidx.recyclerview.widget.DiffUtil.Callback);
+    method public static androidx.recyclerview.widget.DiffUtil.DiffResult calculateDiff(androidx.recyclerview.widget.DiffUtil.Callback, boolean);
+  }
+
+  public abstract static class DiffUtil.Callback {
+    ctor public DiffUtil.Callback();
+    method public abstract boolean areContentsTheSame(int, int);
+    method public abstract boolean areItemsTheSame(int, int);
+    method public Object? getChangePayload(int, int);
+    method public abstract int getNewListSize();
+    method public abstract int getOldListSize();
+  }
+
+  public static class DiffUtil.DiffResult {
+    method public int convertNewPositionToOld(@IntRange(from=0) int);
+    method public int convertOldPositionToNew(@IntRange(from=0) int);
+    method public void dispatchUpdatesTo(androidx.recyclerview.widget.RecyclerView.Adapter);
+    method public void dispatchUpdatesTo(androidx.recyclerview.widget.ListUpdateCallback);
+    field public static final int NO_POSITION = -1; // 0xffffffff
+  }
+
+  public abstract static class DiffUtil.ItemCallback<T> {
+    ctor public DiffUtil.ItemCallback();
+    method public abstract boolean areContentsTheSame(T, T);
+    method public abstract boolean areItemsTheSame(T, T);
+    method public Object? getChangePayload(T, T);
+  }
+
+  public class DividerItemDecoration extends androidx.recyclerview.widget.RecyclerView.ItemDecoration {
+    ctor public DividerItemDecoration(android.content.Context!, int);
+    method public android.graphics.drawable.Drawable? getDrawable();
+    method public void setDrawable(android.graphics.drawable.Drawable);
+    method public void setOrientation(int);
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  public class GridLayoutManager extends androidx.recyclerview.widget.LinearLayoutManager {
+    ctor public GridLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
+    ctor public GridLayoutManager(android.content.Context!, int);
+    ctor public GridLayoutManager(android.content.Context!, int, int, boolean);
+    method public int getSpanCount();
+    method public androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup! getSpanSizeLookup();
+    method public boolean isUsingSpansToEstimateScrollbarDimensions();
+    method public void setSpanCount(int);
+    method public void setSpanSizeLookup(androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup!);
+    method public void setUsingSpansToEstimateScrollbarDimensions(boolean);
+    field public static final int DEFAULT_SPAN_COUNT = -1; // 0xffffffff
+  }
+
+  public static final class GridLayoutManager.DefaultSpanSizeLookup extends androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup {
+    ctor public GridLayoutManager.DefaultSpanSizeLookup();
+    method public int getSpanSize(int);
+  }
+
+  public static class GridLayoutManager.LayoutParams extends androidx.recyclerview.widget.RecyclerView.LayoutParams {
+    ctor public GridLayoutManager.LayoutParams(android.content.Context!, android.util.AttributeSet!);
+    ctor public GridLayoutManager.LayoutParams(int, int);
+    ctor public GridLayoutManager.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
+    ctor public GridLayoutManager.LayoutParams(android.view.ViewGroup.LayoutParams!);
+    ctor public GridLayoutManager.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public int getSpanIndex();
+    method public int getSpanSize();
+    field public static final int INVALID_SPAN_ID = -1; // 0xffffffff
+  }
+
+  public abstract static class GridLayoutManager.SpanSizeLookup {
+    ctor public GridLayoutManager.SpanSizeLookup();
+    method public int getSpanGroupIndex(int, int);
+    method public int getSpanIndex(int, int);
+    method public abstract int getSpanSize(int);
+    method public void invalidateSpanGroupIndexCache();
+    method public void invalidateSpanIndexCache();
+    method public boolean isSpanGroupIndexCacheEnabled();
+    method public boolean isSpanIndexCacheEnabled();
+    method public void setSpanGroupIndexCacheEnabled(boolean);
+    method public void setSpanIndexCacheEnabled(boolean);
+  }
+
+  public class ItemTouchHelper extends androidx.recyclerview.widget.RecyclerView.ItemDecoration implements androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener {
+    ctor public ItemTouchHelper(androidx.recyclerview.widget.ItemTouchHelper.Callback);
+    method public void attachToRecyclerView(androidx.recyclerview.widget.RecyclerView?);
+    method public void onChildViewAttachedToWindow(android.view.View);
+    method public void onChildViewDetachedFromWindow(android.view.View);
+    method public void startDrag(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void startSwipe(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    field public static final int ACTION_STATE_DRAG = 2; // 0x2
+    field public static final int ACTION_STATE_IDLE = 0; // 0x0
+    field public static final int ACTION_STATE_SWIPE = 1; // 0x1
+    field public static final int ANIMATION_TYPE_DRAG = 8; // 0x8
+    field public static final int ANIMATION_TYPE_SWIPE_CANCEL = 4; // 0x4
+    field public static final int ANIMATION_TYPE_SWIPE_SUCCESS = 2; // 0x2
+    field public static final int DOWN = 2; // 0x2
+    field public static final int END = 32; // 0x20
+    field public static final int LEFT = 4; // 0x4
+    field public static final int RIGHT = 8; // 0x8
+    field public static final int START = 16; // 0x10
+    field public static final int UP = 1; // 0x1
+  }
+
+  public abstract static class ItemTouchHelper.Callback {
+    ctor public ItemTouchHelper.Callback();
+    method public boolean canDropOver(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! chooseDropTarget(androidx.recyclerview.widget.RecyclerView.ViewHolder, java.util.List<androidx.recyclerview.widget.RecyclerView.ViewHolder!>, int, int);
+    method public void clearView(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public int convertToAbsoluteDirection(int, int);
+    method public static int convertToRelativeDirection(int, int);
+    method public long getAnimationDuration(androidx.recyclerview.widget.RecyclerView, int, float, float);
+    method public int getBoundingBoxMargin();
+    method public static androidx.recyclerview.widget.ItemTouchUIUtil getDefaultUIUtil();
+    method public float getMoveThreshold(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public abstract int getMovementFlags(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public float getSwipeEscapeVelocity(float);
+    method public float getSwipeThreshold(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public float getSwipeVelocityThreshold(float);
+    method public int interpolateOutOfBoundsScroll(androidx.recyclerview.widget.RecyclerView, int, int, int, long);
+    method public boolean isItemViewSwipeEnabled();
+    method public boolean isLongPressDragEnabled();
+    method public static int makeFlag(int, int);
+    method public static int makeMovementFlags(int, int);
+    method public void onChildDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, float, float, int, boolean);
+    method public void onChildDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder!, float, float, int, boolean);
+    method public abstract boolean onMove(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onMoved(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, int, androidx.recyclerview.widget.RecyclerView.ViewHolder, int, int, int);
+    method public void onSelectedChanged(androidx.recyclerview.widget.RecyclerView.ViewHolder?, int);
+    method public abstract void onSwiped(androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
+    field public static final int DEFAULT_DRAG_ANIMATION_DURATION = 200; // 0xc8
+    field public static final int DEFAULT_SWIPE_ANIMATION_DURATION = 250; // 0xfa
+  }
+
+  public abstract static class ItemTouchHelper.SimpleCallback extends androidx.recyclerview.widget.ItemTouchHelper.Callback {
+    ctor public ItemTouchHelper.SimpleCallback(int, int);
+    method public int getDragDirs(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public int getMovementFlags(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public int getSwipeDirs(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void setDefaultDragDirs(int);
+    method public void setDefaultSwipeDirs(int);
+  }
+
+  public static interface ItemTouchHelper.ViewDropHandler {
+    method public void prepareForDrop(android.view.View, android.view.View, int, int);
+  }
+
+  public interface ItemTouchUIUtil {
+    method public void clearView(android.view.View!);
+    method public void onDraw(android.graphics.Canvas!, androidx.recyclerview.widget.RecyclerView!, android.view.View!, float, float, int, boolean);
+    method public void onDrawOver(android.graphics.Canvas!, androidx.recyclerview.widget.RecyclerView!, android.view.View!, float, float, int, boolean);
+    method public void onSelected(android.view.View!);
+  }
+
+  public class LinearLayoutManager extends androidx.recyclerview.widget.RecyclerView.LayoutManager implements androidx.recyclerview.widget.ItemTouchHelper.ViewDropHandler androidx.recyclerview.widget.RecyclerView.SmoothScroller.ScrollVectorProvider {
+    ctor public LinearLayoutManager(android.content.Context!);
+    ctor public LinearLayoutManager(android.content.Context!, int, boolean);
+    ctor public LinearLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
+    method protected void calculateExtraLayoutSpace(androidx.recyclerview.widget.RecyclerView.State, int[]);
+    method public android.graphics.PointF! computeScrollVectorForPosition(int);
+    method public int findFirstCompletelyVisibleItemPosition();
+    method public int findFirstVisibleItemPosition();
+    method public int findLastCompletelyVisibleItemPosition();
+    method public int findLastVisibleItemPosition();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
+    method @Deprecated protected int getExtraLayoutSpace(androidx.recyclerview.widget.RecyclerView.State!);
+    method public int getInitialPrefetchItemCount();
+    method public int getOrientation();
+    method public boolean getRecycleChildrenOnDetach();
+    method public boolean getReverseLayout();
+    method public boolean getStackFromEnd();
+    method protected boolean isLayoutRTL();
+    method public boolean isSmoothScrollbarEnabled();
+    method public void prepareForDrop(android.view.View, android.view.View, int, int);
+    method public void scrollToPositionWithOffset(int, int);
+    method public void setInitialPrefetchItemCount(int);
+    method public void setOrientation(int);
+    method public void setRecycleChildrenOnDetach(boolean);
+    method public void setReverseLayout(boolean);
+    method public void setSmoothScrollbarEnabled(boolean);
+    method public void setStackFromEnd(boolean);
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int INVALID_OFFSET = -2147483648; // 0x80000000
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  protected static class LinearLayoutManager.LayoutChunkResult {
+    ctor protected LinearLayoutManager.LayoutChunkResult();
+    field public int mConsumed;
+    field public boolean mFinished;
+    field public boolean mFocusable;
+    field public boolean mIgnoreConsumed;
+  }
+
+  public class LinearSmoothScroller extends androidx.recyclerview.widget.RecyclerView.SmoothScroller {
+    ctor public LinearSmoothScroller(android.content.Context!);
+    method public int calculateDtToFit(int, int, int, int, int);
+    method public int calculateDxToMakeVisible(android.view.View!, int);
+    method public int calculateDyToMakeVisible(android.view.View!, int);
+    method protected float calculateSpeedPerPixel(android.util.DisplayMetrics!);
+    method protected int calculateTimeForDeceleration(int);
+    method protected int calculateTimeForScrolling(int);
+    method protected int getHorizontalSnapPreference();
+    method protected int getVerticalSnapPreference();
+    method protected void onSeekTargetStep(int, int, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
+    method protected void onStart();
+    method protected void onStop();
+    method protected void onTargetFound(android.view.View!, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
+    method protected void updateActionForInterimTarget(androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
+    field public static final int SNAP_TO_ANY = 0; // 0x0
+    field public static final int SNAP_TO_END = 1; // 0x1
+    field public static final int SNAP_TO_START = -1; // 0xffffffff
+    field protected final android.view.animation.DecelerateInterpolator! mDecelerateInterpolator;
+    field protected int mInterimTargetDx;
+    field protected int mInterimTargetDy;
+    field protected final android.view.animation.LinearInterpolator! mLinearInterpolator;
+    field protected android.graphics.PointF! mTargetVector;
+  }
+
+  public class LinearSnapHelper extends androidx.recyclerview.widget.SnapHelper {
+    ctor public LinearSnapHelper();
+    method public int[]! calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
+    method public android.view.View! findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
+  }
+
+  public abstract class ListAdapter<T, VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> extends androidx.recyclerview.widget.RecyclerView.Adapter<VH> {
+    ctor protected ListAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
+    ctor protected ListAdapter(androidx.recyclerview.widget.AsyncDifferConfig<T!>);
+    method public java.util.List<T!> getCurrentList();
+    method protected T! getItem(int);
+    method public int getItemCount();
+    method public void onCurrentListChanged(java.util.List<T!>, java.util.List<T!>);
+    method public void submitList(java.util.List<T!>?);
+    method public void submitList(java.util.List<T!>?, Runnable?);
+  }
+
+  public interface ListUpdateCallback {
+    method public void onChanged(int, int, Object?);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public final class MergeAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder> {
+    ctor @java.lang.SafeVarargs public MergeAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!...);
+    ctor @java.lang.SafeVarargs public MergeAdapter(androidx.recyclerview.widget.MergeAdapter.Config, androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!...);
+    ctor public MergeAdapter(java.util.List<androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!>);
+    ctor public MergeAdapter(androidx.recyclerview.widget.MergeAdapter.Config, java.util.List<androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!>);
+    method public boolean addAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
+    method public boolean addAdapter(int, androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
+    method public java.util.List<androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!> getAdapters();
+    method public int getItemCount();
+    method public void onBindViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder onCreateViewHolder(android.view.ViewGroup, int);
+    method public boolean onFailedToRecycleView(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onViewAttachedToWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onViewDetachedFromWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onViewRecycled(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public boolean removeAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
+  }
+
+  public static class MergeAdapter.Config {
+    field public static final androidx.recyclerview.widget.MergeAdapter.Config DEFAULT;
+    field public final boolean isolateViewTypes;
+    field public final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode stableIdMode;
+  }
+
+  public static class MergeAdapter.Config.Builder {
+    ctor public MergeAdapter.Config.Builder();
+    method public androidx.recyclerview.widget.MergeAdapter.Config build();
+    method public androidx.recyclerview.widget.MergeAdapter.Config.Builder setIsolateViewTypes(boolean);
+    method public androidx.recyclerview.widget.MergeAdapter.Config.Builder setStableIdMode(androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode);
+  }
+
+  public enum MergeAdapter.Config.StableIdMode {
+    enum_constant public static final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode ISOLATED_STABLE_IDS;
+    enum_constant public static final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode NO_STABLE_IDS;
+    enum_constant public static final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode SHARED_STABLE_IDS;
+  }
+
+  public abstract class OrientationHelper {
+    method public static androidx.recyclerview.widget.OrientationHelper! createHorizontalHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public static androidx.recyclerview.widget.OrientationHelper! createOrientationHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int);
+    method public static androidx.recyclerview.widget.OrientationHelper! createVerticalHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public abstract int getDecoratedEnd(android.view.View!);
+    method public abstract int getDecoratedMeasurement(android.view.View!);
+    method public abstract int getDecoratedMeasurementInOther(android.view.View!);
+    method public abstract int getDecoratedStart(android.view.View!);
+    method public abstract int getEnd();
+    method public abstract int getEndAfterPadding();
+    method public abstract int getEndPadding();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutManager! getLayoutManager();
+    method public abstract int getMode();
+    method public abstract int getModeInOther();
+    method public abstract int getStartAfterPadding();
+    method public abstract int getTotalSpace();
+    method public int getTotalSpaceChange();
+    method public abstract int getTransformedEndWithDecoration(android.view.View!);
+    method public abstract int getTransformedStartWithDecoration(android.view.View!);
+    method public abstract void offsetChild(android.view.View!, int);
+    method public abstract void offsetChildren(int);
+    method public void onLayoutComplete();
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int VERTICAL = 1; // 0x1
+    field protected final androidx.recyclerview.widget.RecyclerView.LayoutManager! mLayoutManager;
+  }
+
+  public class PagerSnapHelper extends androidx.recyclerview.widget.SnapHelper {
+    ctor public PagerSnapHelper();
+    method public int[]? calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
+    method public android.view.View? findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
+  }
+
+  public class RecyclerView extends android.view.ViewGroup implements androidx.core.view.NestedScrollingChild2 androidx.core.view.NestedScrollingChild3 androidx.core.view.ScrollingView {
+    ctor public RecyclerView(android.content.Context);
+    ctor public RecyclerView(android.content.Context, android.util.AttributeSet?);
+    ctor public RecyclerView(android.content.Context, android.util.AttributeSet?, int);
+    method public void addItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration, int);
+    method public void addItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration);
+    method public void addOnChildAttachStateChangeListener(androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener);
+    method public void addOnItemTouchListener(androidx.recyclerview.widget.RecyclerView.OnItemTouchListener);
+    method public void addOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener);
+    method public void clearOnChildAttachStateChangeListeners();
+    method public void clearOnScrollListeners();
+    method public int computeHorizontalScrollExtent();
+    method public int computeHorizontalScrollOffset();
+    method public int computeHorizontalScrollRange();
+    method public int computeVerticalScrollExtent();
+    method public int computeVerticalScrollOffset();
+    method public int computeVerticalScrollRange();
+    method public boolean dispatchNestedPreScroll(int, int, int[]!, int[]!, int);
+    method public boolean dispatchNestedScroll(int, int, int, int, int[]!, int);
+    method public final void dispatchNestedScroll(int, int, int, int, int[]!, int, int[]);
+    method public boolean drawChild(android.graphics.Canvas!, android.view.View!, long);
+    method public android.view.View? findChildViewUnder(float, float);
+    method public android.view.View? findContainingItemView(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findContainingViewHolder(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForAdapterPosition(int);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! findViewHolderForItemId(long);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForLayoutPosition(int);
+    method @Deprecated public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForPosition(int);
+    method public boolean fling(int, int);
+    method public androidx.recyclerview.widget.RecyclerView.Adapter? getAdapter();
+    method public int getChildAdapterPosition(android.view.View);
+    method public long getChildItemId(android.view.View);
+    method public int getChildLayoutPosition(android.view.View);
+    method @Deprecated public int getChildPosition(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! getChildViewHolder(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate? getCompatAccessibilityDelegate();
+    method public void getDecoratedBoundsWithMargins(android.view.View, android.graphics.Rect);
+    method public androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory getEdgeEffectFactory();
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator? getItemAnimator();
+    method public androidx.recyclerview.widget.RecyclerView.ItemDecoration getItemDecorationAt(int);
+    method public int getItemDecorationCount();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutManager? getLayoutManager();
+    method public int getMaxFlingVelocity();
+    method public int getMinFlingVelocity();
+    method public androidx.recyclerview.widget.RecyclerView.OnFlingListener? getOnFlingListener();
+    method public boolean getPreserveFocusAfterLayout();
+    method public androidx.recyclerview.widget.RecyclerView.RecycledViewPool getRecycledViewPool();
+    method public int getScrollState();
+    method public boolean hasFixedSize();
+    method public boolean hasNestedScrollingParent(int);
+    method public boolean hasPendingAdapterUpdates();
+    method public void invalidateItemDecorations();
+    method public boolean isAnimating();
+    method public boolean isComputingLayout();
+    method @Deprecated public boolean isLayoutFrozen();
+    method public final boolean isLayoutSuppressed();
+    method public void nestedScrollBy(int, int);
+    method public void offsetChildrenHorizontal(@Px int);
+    method public void offsetChildrenVertical(@Px int);
+    method public void onChildAttachedToWindow(android.view.View);
+    method public void onChildDetachedFromWindow(android.view.View);
+    method public void onDraw(android.graphics.Canvas!);
+    method public void onScrollStateChanged(int);
+    method public void onScrolled(@Px int, @Px int);
+    method public void removeItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration);
+    method public void removeItemDecorationAt(int);
+    method public void removeOnChildAttachStateChangeListener(androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener);
+    method public void removeOnItemTouchListener(androidx.recyclerview.widget.RecyclerView.OnItemTouchListener);
+    method public void removeOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener);
+    method public void scrollToPosition(int);
+    method public void setAccessibilityDelegateCompat(androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate?);
+    method public void setAdapter(androidx.recyclerview.widget.RecyclerView.Adapter?);
+    method public void setChildDrawingOrderCallback(androidx.recyclerview.widget.RecyclerView.ChildDrawingOrderCallback?);
+    method public void setEdgeEffectFactory(androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory);
+    method public void setHasFixedSize(boolean);
+    method public void setItemAnimator(androidx.recyclerview.widget.RecyclerView.ItemAnimator?);
+    method public void setItemViewCacheSize(int);
+    method @Deprecated public void setLayoutFrozen(boolean);
+    method public void setLayoutManager(androidx.recyclerview.widget.RecyclerView.LayoutManager?);
+    method @Deprecated public void setLayoutTransition(android.animation.LayoutTransition!);
+    method public void setOnFlingListener(androidx.recyclerview.widget.RecyclerView.OnFlingListener?);
+    method @Deprecated public void setOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener?);
+    method public void setPreserveFocusAfterLayout(boolean);
+    method public void setRecycledViewPool(androidx.recyclerview.widget.RecyclerView.RecycledViewPool?);
+    method public void setRecyclerListener(androidx.recyclerview.widget.RecyclerView.RecyclerListener?);
+    method public void setScrollingTouchSlop(int);
+    method public void setViewCacheExtension(androidx.recyclerview.widget.RecyclerView.ViewCacheExtension?);
+    method public void smoothScrollBy(@Px int, @Px int);
+    method public void smoothScrollBy(@Px int, @Px int, android.view.animation.Interpolator?);
+    method public void smoothScrollBy(@Px int, @Px int, android.view.animation.Interpolator?, int);
+    method public void smoothScrollToPosition(int);
+    method public boolean startNestedScroll(int, int);
+    method public void stopNestedScroll(int);
+    method public void stopScroll();
+    method public final void suppressLayout(boolean);
+    method public void swapAdapter(androidx.recyclerview.widget.RecyclerView.Adapter?, boolean);
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int INVALID_TYPE = -1; // 0xffffffff
+    field public static final long NO_ID = -1L; // 0xffffffffffffffffL
+    field public static final int NO_POSITION = -1; // 0xffffffff
+    field public static final int SCROLL_STATE_DRAGGING = 1; // 0x1
+    field public static final int SCROLL_STATE_IDLE = 0; // 0x0
+    field public static final int SCROLL_STATE_SETTLING = 2; // 0x2
+    field public static final int TOUCH_SLOP_DEFAULT = 0; // 0x0
+    field public static final int TOUCH_SLOP_PAGING = 1; // 0x1
+    field public static final int UNDEFINED_DURATION = -2147483648; // 0x80000000
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  public abstract static class RecyclerView.Adapter<VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> {
+    ctor public RecyclerView.Adapter();
+    method public final void bindViewHolder(VH, int);
+    method public final VH createViewHolder(android.view.ViewGroup, int);
+    method public int findRelativeAdapterPositionIn(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>, androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
+    method public abstract int getItemCount();
+    method public long getItemId(int);
+    method public int getItemViewType(int);
+    method public final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy getStateRestorationPolicy();
+    method public final boolean hasObservers();
+    method public final boolean hasStableIds();
+    method public final void notifyDataSetChanged();
+    method public final void notifyItemChanged(int);
+    method public final void notifyItemChanged(int, Object?);
+    method public final void notifyItemInserted(int);
+    method public final void notifyItemMoved(int, int);
+    method public final void notifyItemRangeChanged(int, int);
+    method public final void notifyItemRangeChanged(int, int, Object?);
+    method public final void notifyItemRangeInserted(int, int);
+    method public final void notifyItemRangeRemoved(int, int);
+    method public final void notifyItemRemoved(int);
+    method public void onAttachedToRecyclerView(androidx.recyclerview.widget.RecyclerView);
+    method public abstract void onBindViewHolder(VH, int);
+    method public void onBindViewHolder(VH, int, java.util.List<java.lang.Object!>);
+    method public abstract VH onCreateViewHolder(android.view.ViewGroup, int);
+    method public void onDetachedFromRecyclerView(androidx.recyclerview.widget.RecyclerView);
+    method public boolean onFailedToRecycleView(VH);
+    method public void onViewAttachedToWindow(VH);
+    method public void onViewDetachedFromWindow(VH);
+    method public void onViewRecycled(VH);
+    method public void registerAdapterDataObserver(androidx.recyclerview.widget.RecyclerView.AdapterDataObserver);
+    method public void setHasStableIds(boolean);
+    method public void setStateRestorationPolicy(androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy);
+    method public void unregisterAdapterDataObserver(androidx.recyclerview.widget.RecyclerView.AdapterDataObserver);
+  }
+
+  public enum RecyclerView.Adapter.StateRestorationPolicy {
+    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy ALLOW;
+    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy PREVENT;
+    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy PREVENT_WHEN_EMPTY;
+  }
+
+  public abstract static class RecyclerView.AdapterDataObserver {
+    ctor public RecyclerView.AdapterDataObserver();
+    method public void onChanged();
+    method public void onItemRangeChanged(int, int);
+    method public void onItemRangeChanged(int, int, Object?);
+    method public void onItemRangeInserted(int, int);
+    method public void onItemRangeMoved(int, int, int);
+    method public void onItemRangeRemoved(int, int);
+    method public void onStateRestorationPolicyChanged();
+  }
+
+  public static interface RecyclerView.ChildDrawingOrderCallback {
+    method public int onGetChildDrawingOrder(int, int);
+  }
+
+  public static class RecyclerView.EdgeEffectFactory {
+    ctor public RecyclerView.EdgeEffectFactory();
+    method protected android.widget.EdgeEffect createEdgeEffect(androidx.recyclerview.widget.RecyclerView, @androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.EdgeDirection int);
+    field public static final int DIRECTION_BOTTOM = 3; // 0x3
+    field public static final int DIRECTION_LEFT = 0; // 0x0
+    field public static final int DIRECTION_RIGHT = 2; // 0x2
+    field public static final int DIRECTION_TOP = 1; // 0x1
+  }
+
+  @IntDef({androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_LEFT, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_TOP, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_RIGHT, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_BOTTOM}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface RecyclerView.EdgeEffectFactory.EdgeDirection {
+  }
+
+  public abstract static class RecyclerView.ItemAnimator {
+    ctor public RecyclerView.ItemAnimator();
+    method public abstract boolean animateAppearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateDisappearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?);
+    method public abstract boolean animatePersistence(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public boolean canReuseUpdatedViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public boolean canReuseUpdatedViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder, java.util.List<java.lang.Object!>);
+    method public final void dispatchAnimationFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public final void dispatchAnimationStarted(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public final void dispatchAnimationsFinished();
+    method public abstract void endAnimation(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public abstract void endAnimations();
+    method public long getAddDuration();
+    method public long getChangeDuration();
+    method public long getMoveDuration();
+    method public long getRemoveDuration();
+    method public abstract boolean isRunning();
+    method public final boolean isRunning(androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemAnimatorFinishedListener?);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo obtainHolderInfo();
+    method public void onAnimationFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onAnimationStarted(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo recordPostLayoutInformation(androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo recordPreLayoutInformation(androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.ViewHolder, @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges int, java.util.List<java.lang.Object!>);
+    method public abstract void runPendingAnimations();
+    method public void setAddDuration(long);
+    method public void setChangeDuration(long);
+    method public void setMoveDuration(long);
+    method public void setRemoveDuration(long);
+    field public static final int FLAG_APPEARED_IN_PRE_LAYOUT = 4096; // 0x1000
+    field public static final int FLAG_CHANGED = 2; // 0x2
+    field public static final int FLAG_INVALIDATED = 4; // 0x4
+    field public static final int FLAG_MOVED = 2048; // 0x800
+    field public static final int FLAG_REMOVED = 8; // 0x8
+  }
+
+  @IntDef(flag=true, value={androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_CHANGED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_REMOVED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_MOVED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_INVALIDATED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_APPEARED_IN_PRE_LAYOUT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface RecyclerView.ItemAnimator.AdapterChanges {
+  }
+
+  public static interface RecyclerView.ItemAnimator.ItemAnimatorFinishedListener {
+    method public void onAnimationsFinished();
+  }
+
+  public static class RecyclerView.ItemAnimator.ItemHolderInfo {
+    ctor public RecyclerView.ItemAnimator.ItemHolderInfo();
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo setFrom(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo setFrom(androidx.recyclerview.widget.RecyclerView.ViewHolder, @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges int);
+    field public int bottom;
+    field @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges public int changeFlags;
+    field public int left;
+    field public int right;
+    field public int top;
+  }
+
+  public abstract static class RecyclerView.ItemDecoration {
+    ctor public RecyclerView.ItemDecoration();
+    method @Deprecated public void getItemOffsets(android.graphics.Rect, int, androidx.recyclerview.widget.RecyclerView);
+    method public void getItemOffsets(android.graphics.Rect, android.view.View, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
+    method public void onDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
+    method @Deprecated public void onDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView);
+    method public void onDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
+    method @Deprecated public void onDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView);
+  }
+
+  public abstract static class RecyclerView.LayoutManager {
+    ctor public RecyclerView.LayoutManager();
+    method public void addDisappearingView(android.view.View!);
+    method public void addDisappearingView(android.view.View!, int);
+    method public void addView(android.view.View!);
+    method public void addView(android.view.View!, int);
+    method public void assertInLayoutOrScroll(String!);
+    method public void assertNotInLayoutOrScroll(String!);
+    method public void attachView(android.view.View, int, androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public void attachView(android.view.View, int);
+    method public void attachView(android.view.View);
+    method public void calculateItemDecorationsForChild(android.view.View, android.graphics.Rect);
+    method public boolean canScrollHorizontally();
+    method public boolean canScrollVertically();
+    method public boolean checkLayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public static int chooseSize(int, int, int);
+    method public void collectAdjacentPrefetchPositions(int, int, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.LayoutManager.LayoutPrefetchRegistry!);
+    method public void collectInitialPrefetchPositions(int, androidx.recyclerview.widget.RecyclerView.LayoutManager.LayoutPrefetchRegistry!);
+    method public int computeHorizontalScrollExtent(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeHorizontalScrollOffset(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeHorizontalScrollRange(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeVerticalScrollExtent(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeVerticalScrollOffset(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeVerticalScrollRange(androidx.recyclerview.widget.RecyclerView.State);
+    method public void detachAndScrapAttachedViews(androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void detachAndScrapView(android.view.View, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void detachAndScrapViewAt(int, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void detachView(android.view.View);
+    method public void detachViewAt(int);
+    method public void endAnimation(android.view.View!);
+    method public android.view.View? findContainingItemView(android.view.View);
+    method public android.view.View? findViewByPosition(int);
+    method public abstract androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateLayoutParams(android.content.Context!, android.util.AttributeSet!);
+    method public int getBaseline();
+    method public int getBottomDecorationHeight(android.view.View);
+    method public android.view.View? getChildAt(int);
+    method public int getChildCount();
+    method @Deprecated public static int getChildMeasureSpec(int, int, int, boolean);
+    method public static int getChildMeasureSpec(int, int, int, int, boolean);
+    method public boolean getClipToPadding();
+    method public int getColumnCountForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public int getDecoratedBottom(android.view.View);
+    method public void getDecoratedBoundsWithMargins(android.view.View, android.graphics.Rect);
+    method public int getDecoratedLeft(android.view.View);
+    method public int getDecoratedMeasuredHeight(android.view.View);
+    method public int getDecoratedMeasuredWidth(android.view.View);
+    method public int getDecoratedRight(android.view.View);
+    method public int getDecoratedTop(android.view.View);
+    method public android.view.View? getFocusedChild();
+    method @Px public int getHeight();
+    method public int getHeightMode();
+    method public int getItemCount();
+    method public int getItemViewType(android.view.View);
+    method public int getLayoutDirection();
+    method public int getLeftDecorationWidth(android.view.View);
+    method @Px public int getMinimumHeight();
+    method @Px public int getMinimumWidth();
+    method @Px public int getPaddingBottom();
+    method @Px public int getPaddingEnd();
+    method @Px public int getPaddingLeft();
+    method @Px public int getPaddingRight();
+    method @Px public int getPaddingStart();
+    method @Px public int getPaddingTop();
+    method public int getPosition(android.view.View);
+    method public static androidx.recyclerview.widget.RecyclerView.LayoutManager.Properties! getProperties(android.content.Context, android.util.AttributeSet?, int, int);
+    method public int getRightDecorationWidth(android.view.View);
+    method public int getRowCountForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public int getSelectionModeForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public int getTopDecorationHeight(android.view.View);
+    method public void getTransformedBoundingBox(android.view.View, boolean, android.graphics.Rect);
+    method @Px public int getWidth();
+    method public int getWidthMode();
+    method public boolean hasFocus();
+    method public void ignoreView(android.view.View);
+    method public boolean isAttachedToWindow();
+    method public boolean isAutoMeasureEnabled();
+    method public boolean isFocused();
+    method public final boolean isItemPrefetchEnabled();
+    method public boolean isLayoutHierarchical(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public boolean isMeasurementCacheEnabled();
+    method public boolean isSmoothScrolling();
+    method public boolean isViewPartiallyVisible(android.view.View, boolean, boolean);
+    method public void layoutDecorated(android.view.View, int, int, int, int);
+    method public void layoutDecoratedWithMargins(android.view.View, int, int, int, int);
+    method public void measureChild(android.view.View, int, int);
+    method public void measureChildWithMargins(android.view.View, int, int);
+    method public void moveView(int, int);
+    method public void offsetChildrenHorizontal(@Px int);
+    method public void offsetChildrenVertical(@Px int);
+    method public void onAdapterChanged(androidx.recyclerview.widget.RecyclerView.Adapter?, androidx.recyclerview.widget.RecyclerView.Adapter?);
+    method public boolean onAddFocusables(androidx.recyclerview.widget.RecyclerView, java.util.ArrayList<android.view.View!>, int, int);
+    method @CallSuper public void onAttachedToWindow(androidx.recyclerview.widget.RecyclerView!);
+    method @Deprecated public void onDetachedFromWindow(androidx.recyclerview.widget.RecyclerView!);
+    method @CallSuper public void onDetachedFromWindow(androidx.recyclerview.widget.RecyclerView!, androidx.recyclerview.widget.RecyclerView.Recycler!);
+    method public android.view.View? onFocusSearchFailed(android.view.View, int, androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+    method public void onInitializeAccessibilityEvent(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.accessibility.AccessibilityEvent);
+    method public void onInitializeAccessibilityNodeInfo(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, androidx.core.view.accessibility.AccessibilityNodeInfoCompat);
+    method public void onInitializeAccessibilityNodeInfoForItem(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.View, androidx.core.view.accessibility.AccessibilityNodeInfoCompat);
+    method public android.view.View? onInterceptFocusSearch(android.view.View, int);
+    method public void onItemsAdded(androidx.recyclerview.widget.RecyclerView, int, int);
+    method public void onItemsChanged(androidx.recyclerview.widget.RecyclerView);
+    method public void onItemsMoved(androidx.recyclerview.widget.RecyclerView, int, int, int);
+    method public void onItemsRemoved(androidx.recyclerview.widget.RecyclerView, int, int);
+    method public void onItemsUpdated(androidx.recyclerview.widget.RecyclerView, int, int);
+    method public void onItemsUpdated(androidx.recyclerview.widget.RecyclerView, int, int, Object?);
+    method public void onLayoutChildren(androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
+    method public void onLayoutCompleted(androidx.recyclerview.widget.RecyclerView.State!);
+    method public void onMeasure(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, int, int);
+    method @Deprecated public boolean onRequestChildFocus(androidx.recyclerview.widget.RecyclerView, android.view.View, android.view.View?);
+    method public boolean onRequestChildFocus(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State, android.view.View, android.view.View?);
+    method public void onRestoreInstanceState(android.os.Parcelable!);
+    method public android.os.Parcelable? onSaveInstanceState();
+    method public void onScrollStateChanged(int);
+    method public boolean performAccessibilityAction(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, int, android.os.Bundle?);
+    method public boolean performAccessibilityActionForItem(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.View, int, android.os.Bundle?);
+    method public void postOnAnimation(Runnable!);
+    method public void removeAllViews();
+    method public void removeAndRecycleAllViews(androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void removeAndRecycleView(android.view.View, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void removeAndRecycleViewAt(int, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public boolean removeCallbacks(Runnable!);
+    method public void removeDetachedView(android.view.View);
+    method public void removeView(android.view.View!);
+    method public void removeViewAt(int);
+    method public boolean requestChildRectangleOnScreen(androidx.recyclerview.widget.RecyclerView, android.view.View, android.graphics.Rect, boolean);
+    method public boolean requestChildRectangleOnScreen(androidx.recyclerview.widget.RecyclerView, android.view.View, android.graphics.Rect, boolean, boolean);
+    method public void requestLayout();
+    method public void requestSimpleAnimationsInNextLayout();
+    method public int scrollHorizontallyBy(int, androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
+    method public void scrollToPosition(int);
+    method public int scrollVerticallyBy(int, androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
+    method @Deprecated public void setAutoMeasureEnabled(boolean);
+    method public final void setItemPrefetchEnabled(boolean);
+    method public void setMeasuredDimension(android.graphics.Rect!, int, int);
+    method public void setMeasuredDimension(int, int);
+    method public void setMeasurementCacheEnabled(boolean);
+    method public void smoothScrollToPosition(androidx.recyclerview.widget.RecyclerView!, androidx.recyclerview.widget.RecyclerView.State!, int);
+    method public void startSmoothScroll(androidx.recyclerview.widget.RecyclerView.SmoothScroller!);
+    method public void stopIgnoringView(android.view.View);
+    method public boolean supportsPredictiveItemAnimations();
+  }
+
+  public static interface RecyclerView.LayoutManager.LayoutPrefetchRegistry {
+    method public void addPosition(int, int);
+  }
+
+  public static class RecyclerView.LayoutManager.Properties {
+    ctor public RecyclerView.LayoutManager.Properties();
+    field public int orientation;
+    field public boolean reverseLayout;
+    field public int spanCount;
+    field public boolean stackFromEnd;
+  }
+
+  public static class RecyclerView.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
+    ctor public RecyclerView.LayoutParams(android.content.Context!, android.util.AttributeSet!);
+    ctor public RecyclerView.LayoutParams(int, int);
+    ctor public RecyclerView.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
+    ctor public RecyclerView.LayoutParams(android.view.ViewGroup.LayoutParams!);
+    ctor public RecyclerView.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public int getAbsoluteAdapterPosition();
+    method public int getBindingAdapterPosition();
+    method @Deprecated public int getViewAdapterPosition();
+    method public int getViewLayoutPosition();
+    method @Deprecated public int getViewPosition();
+    method public boolean isItemChanged();
+    method public boolean isItemRemoved();
+    method public boolean isViewInvalid();
+    method public boolean viewNeedsUpdate();
+  }
+
+  public static interface RecyclerView.OnChildAttachStateChangeListener {
+    method public void onChildViewAttachedToWindow(android.view.View);
+    method public void onChildViewDetachedFromWindow(android.view.View);
+  }
+
+  public abstract static class RecyclerView.OnFlingListener {
+    ctor public RecyclerView.OnFlingListener();
+    method public abstract boolean onFling(int, int);
+  }
+
+  public static interface RecyclerView.OnItemTouchListener {
+    method public boolean onInterceptTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+    method public void onRequestDisallowInterceptTouchEvent(boolean);
+    method public void onTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+  }
+
+  public abstract static class RecyclerView.OnScrollListener {
+    ctor public RecyclerView.OnScrollListener();
+    method public void onScrollStateChanged(androidx.recyclerview.widget.RecyclerView, int);
+    method public void onScrolled(androidx.recyclerview.widget.RecyclerView, int, int);
+  }
+
+  public static class RecyclerView.RecycledViewPool {
+    ctor public RecyclerView.RecycledViewPool();
+    method public void clear();
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? getRecycledView(int);
+    method public int getRecycledViewCount(int);
+    method public void putRecycledView(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void setMaxRecycledViews(int, int);
+  }
+
+  public final class RecyclerView.Recycler {
+    ctor public RecyclerView.Recycler();
+    method public void bindViewToPosition(android.view.View, int);
+    method public void clear();
+    method public int convertPreLayoutPositionToPostLayout(int);
+    method public java.util.List<androidx.recyclerview.widget.RecyclerView.ViewHolder!> getScrapList();
+    method public android.view.View getViewForPosition(int);
+    method public void recycleView(android.view.View);
+    method public void setViewCacheSize(int);
+  }
+
+  public static interface RecyclerView.RecyclerListener {
+    method public void onViewRecycled(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+  }
+
+  public static class RecyclerView.SimpleOnItemTouchListener implements androidx.recyclerview.widget.RecyclerView.OnItemTouchListener {
+    ctor public RecyclerView.SimpleOnItemTouchListener();
+    method public boolean onInterceptTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+    method public void onRequestDisallowInterceptTouchEvent(boolean);
+    method public void onTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+  }
+
+  public abstract static class RecyclerView.SmoothScroller {
+    ctor public RecyclerView.SmoothScroller();
+    method public android.graphics.PointF? computeScrollVectorForPosition(int);
+    method public android.view.View! findViewByPosition(int);
+    method public int getChildCount();
+    method public int getChildPosition(android.view.View!);
+    method public androidx.recyclerview.widget.RecyclerView.LayoutManager? getLayoutManager();
+    method public int getTargetPosition();
+    method @Deprecated public void instantScrollToPosition(int);
+    method public boolean isPendingInitialRun();
+    method public boolean isRunning();
+    method protected void normalize(android.graphics.PointF);
+    method protected void onChildAttachedToWindow(android.view.View!);
+    method protected abstract void onSeekTargetStep(@Px int, @Px int, androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action);
+    method protected abstract void onStart();
+    method protected abstract void onStop();
+    method protected abstract void onTargetFound(android.view.View, androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action);
+    method public void setTargetPosition(int);
+    method protected final void stop();
+  }
+
+  public static class RecyclerView.SmoothScroller.Action {
+    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int);
+    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int, int);
+    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int, int, android.view.animation.Interpolator?);
+    method public int getDuration();
+    method @Px public int getDx();
+    method @Px public int getDy();
+    method public android.view.animation.Interpolator? getInterpolator();
+    method public void jumpTo(int);
+    method public void setDuration(int);
+    method public void setDx(@Px int);
+    method public void setDy(@Px int);
+    method public void setInterpolator(android.view.animation.Interpolator?);
+    method public void update(@Px int, @Px int, int, android.view.animation.Interpolator?);
+    field public static final int UNDEFINED_DURATION = -2147483648; // 0x80000000
+  }
+
+  public static interface RecyclerView.SmoothScroller.ScrollVectorProvider {
+    method public android.graphics.PointF? computeScrollVectorForPosition(int);
+  }
+
+  public static class RecyclerView.State {
+    ctor public RecyclerView.State();
+    method public boolean didStructureChange();
+    method public <T> T! get(int);
+    method public int getItemCount();
+    method public int getRemainingScrollHorizontal();
+    method public int getRemainingScrollVertical();
+    method public int getTargetScrollPosition();
+    method public boolean hasTargetScrollPosition();
+    method public boolean isMeasuring();
+    method public boolean isPreLayout();
+    method public void put(int, Object!);
+    method public void remove(int);
+    method public boolean willRunPredictiveAnimations();
+    method public boolean willRunSimpleAnimations();
+  }
+
+  public abstract static class RecyclerView.ViewCacheExtension {
+    ctor public RecyclerView.ViewCacheExtension();
+    method public abstract android.view.View? getViewForPositionAndType(androidx.recyclerview.widget.RecyclerView.Recycler, int, int);
+  }
+
+  public abstract static class RecyclerView.ViewHolder {
+    ctor public RecyclerView.ViewHolder(android.view.View);
+    method public final int getAbsoluteAdapterPosition();
+    method @Deprecated public final int getAdapterPosition();
+    method public final androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>? getBindingAdapter();
+    method public final int getBindingAdapterPosition();
+    method public final long getItemId();
+    method public final int getItemViewType();
+    method public final int getLayoutPosition();
+    method public final int getOldPosition();
+    method @Deprecated public final int getPosition();
+    method public final boolean isRecyclable();
+    method public final void setIsRecyclable(boolean);
+    field public final android.view.View itemView;
+  }
+
+  public class RecyclerViewAccessibilityDelegate extends androidx.core.view.AccessibilityDelegateCompat {
+    ctor public RecyclerViewAccessibilityDelegate(androidx.recyclerview.widget.RecyclerView);
+    method public androidx.core.view.AccessibilityDelegateCompat getItemDelegate();
+  }
+
+  public static class RecyclerViewAccessibilityDelegate.ItemDelegate extends androidx.core.view.AccessibilityDelegateCompat {
+    ctor public RecyclerViewAccessibilityDelegate.ItemDelegate(androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate);
+  }
+
+  public abstract class SimpleItemAnimator extends androidx.recyclerview.widget.RecyclerView.ItemAnimator {
+    ctor public SimpleItemAnimator();
+    method public abstract boolean animateAdd(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public boolean animateAppearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder!, androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animateDisappearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?);
+    method public abstract boolean animateMove(androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animatePersistence(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateRemove(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchAddFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchAddStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchChangeFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public final void dispatchChangeStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public final void dispatchMoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchMoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchRemoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchRemoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public boolean getSupportsChangeAnimations();
+    method public void onAddFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onAddStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onChangeFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public void onChangeStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public void onMoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onMoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onRemoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onRemoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void setSupportsChangeAnimations(boolean);
+  }
+
+  public abstract class SnapHelper extends androidx.recyclerview.widget.RecyclerView.OnFlingListener {
+    ctor public SnapHelper();
+    method public void attachToRecyclerView(androidx.recyclerview.widget.RecyclerView?) throws java.lang.IllegalStateException;
+    method public abstract int[]? calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
+    method public int[]! calculateScrollDistance(int, int);
+    method protected androidx.recyclerview.widget.RecyclerView.SmoothScroller? createScroller(androidx.recyclerview.widget.RecyclerView.LayoutManager);
+    method @Deprecated protected androidx.recyclerview.widget.LinearSmoothScroller? createSnapScroller(androidx.recyclerview.widget.RecyclerView.LayoutManager);
+    method public abstract android.view.View? findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public abstract int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
+    method public boolean onFling(int, int);
+  }
+
+  public class SortedList<T> {
+    ctor public SortedList(Class<T!>, androidx.recyclerview.widget.SortedList.Callback<T!>);
+    ctor public SortedList(Class<T!>, androidx.recyclerview.widget.SortedList.Callback<T!>, int);
+    method public int add(T!);
+    method public void addAll(T![], boolean);
+    method public void addAll(T!...);
+    method public void addAll(java.util.Collection<T!>);
+    method public void beginBatchedUpdates();
+    method public void clear();
+    method public void endBatchedUpdates();
+    method public T! get(int) throws java.lang.IndexOutOfBoundsException;
+    method public int indexOf(T!);
+    method public void recalculatePositionOfItemAt(int);
+    method public boolean remove(T!);
+    method public T! removeItemAt(int);
+    method public void replaceAll(T![], boolean);
+    method public void replaceAll(T!...);
+    method public void replaceAll(java.util.Collection<T!>);
+    method public int size();
+    method public void updateItemAt(int, T!);
+    field public static final int INVALID_POSITION = -1; // 0xffffffff
+  }
+
+  public static class SortedList.BatchedCallback<T2> extends androidx.recyclerview.widget.SortedList.Callback<T2> {
+    ctor public SortedList.BatchedCallback(androidx.recyclerview.widget.SortedList.Callback<T2!>!);
+    method public boolean areContentsTheSame(T2!, T2!);
+    method public boolean areItemsTheSame(T2!, T2!);
+    method public int compare(T2!, T2!);
+    method public void dispatchLastEvent();
+    method public void onChanged(int, int);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public abstract static class SortedList.Callback<T2> implements java.util.Comparator<T2> androidx.recyclerview.widget.ListUpdateCallback {
+    ctor public SortedList.Callback();
+    method public abstract boolean areContentsTheSame(T2!, T2!);
+    method public abstract boolean areItemsTheSame(T2!, T2!);
+    method public abstract int compare(T2!, T2!);
+    method public Object? getChangePayload(T2!, T2!);
+    method public abstract void onChanged(int, int);
+    method public void onChanged(int, int, Object!);
+  }
+
+  public abstract class SortedListAdapterCallback<T2> extends androidx.recyclerview.widget.SortedList.Callback<T2> {
+    ctor public SortedListAdapterCallback(androidx.recyclerview.widget.RecyclerView.Adapter!);
+    method public void onChanged(int, int);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public class StaggeredGridLayoutManager extends androidx.recyclerview.widget.RecyclerView.LayoutManager implements androidx.recyclerview.widget.RecyclerView.SmoothScroller.ScrollVectorProvider {
+    ctor public StaggeredGridLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
+    ctor public StaggeredGridLayoutManager(int, int);
+    method public android.graphics.PointF! computeScrollVectorForPosition(int);
+    method public int[]! findFirstCompletelyVisibleItemPositions(int[]!);
+    method public int[]! findFirstVisibleItemPositions(int[]!);
+    method public int[]! findLastCompletelyVisibleItemPositions(int[]!);
+    method public int[]! findLastVisibleItemPositions(int[]!);
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
+    method public int getGapStrategy();
+    method public int getOrientation();
+    method public boolean getReverseLayout();
+    method public int getSpanCount();
+    method public void invalidateSpanAssignments();
+    method public void scrollToPositionWithOffset(int, int);
+    method public void setGapStrategy(int);
+    method public void setOrientation(int);
+    method public void setReverseLayout(boolean);
+    method public void setSpanCount(int);
+    field @Deprecated public static final int GAP_HANDLING_LAZY = 1; // 0x1
+    field public static final int GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS = 2; // 0x2
+    field public static final int GAP_HANDLING_NONE = 0; // 0x0
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  public static class StaggeredGridLayoutManager.LayoutParams extends androidx.recyclerview.widget.RecyclerView.LayoutParams {
+    ctor public StaggeredGridLayoutManager.LayoutParams(android.content.Context!, android.util.AttributeSet!);
+    ctor public StaggeredGridLayoutManager.LayoutParams(int, int);
+    ctor public StaggeredGridLayoutManager.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
+    ctor public StaggeredGridLayoutManager.LayoutParams(android.view.ViewGroup.LayoutParams!);
+    ctor public StaggeredGridLayoutManager.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public final int getSpanIndex();
+    method public boolean isFullSpan();
+    method public void setFullSpan(boolean);
+    field public static final int INVALID_SPAN_ID = -1; // 0xffffffff
+  }
+
+}
+
diff --git a/recyclerview/recyclerview/api/res-1.2.0-alpha03.txt b/recyclerview/recyclerview/api/res-1.2.0-alpha03.txt
new file mode 100644
index 0000000..475bfc43
--- /dev/null
+++ b/recyclerview/recyclerview/api/res-1.2.0-alpha03.txt
@@ -0,0 +1,9 @@
+attr fastScrollEnabled
+attr fastScrollHorizontalThumbDrawable
+attr fastScrollHorizontalTrackDrawable
+attr fastScrollVerticalThumbDrawable
+attr fastScrollVerticalTrackDrawable
+attr layoutManager
+attr reverseLayout
+attr spanCount
+attr stackFromEnd
diff --git a/recyclerview/recyclerview/api/restricted_1.2.0-alpha03.txt b/recyclerview/recyclerview/api/restricted_1.2.0-alpha03.txt
new file mode 100644
index 0000000..eaa0522
--- /dev/null
+++ b/recyclerview/recyclerview/api/restricted_1.2.0-alpha03.txt
@@ -0,0 +1,1092 @@
+// Signature format: 3.0
+package androidx.recyclerview.widget {
+
+  public final class AdapterListUpdateCallback implements androidx.recyclerview.widget.ListUpdateCallback {
+    ctor public AdapterListUpdateCallback(androidx.recyclerview.widget.RecyclerView.Adapter);
+    method public void onChanged(int, int, Object!);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public final class AsyncDifferConfig<T> {
+    method public java.util.concurrent.Executor getBackgroundThreadExecutor();
+    method public androidx.recyclerview.widget.DiffUtil.ItemCallback<T!> getDiffCallback();
+  }
+
+  public static final class AsyncDifferConfig.Builder<T> {
+    ctor public AsyncDifferConfig.Builder(androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
+    method public androidx.recyclerview.widget.AsyncDifferConfig<T!> build();
+    method public androidx.recyclerview.widget.AsyncDifferConfig.Builder<T!> setBackgroundThreadExecutor(java.util.concurrent.Executor!);
+  }
+
+  public class AsyncListDiffer<T> {
+    ctor public AsyncListDiffer(androidx.recyclerview.widget.RecyclerView.Adapter, androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
+    ctor public AsyncListDiffer(androidx.recyclerview.widget.ListUpdateCallback, androidx.recyclerview.widget.AsyncDifferConfig<T!>);
+    method public void addListListener(androidx.recyclerview.widget.AsyncListDiffer.ListListener<T!>);
+    method public java.util.List<T!> getCurrentList();
+    method public void removeListListener(androidx.recyclerview.widget.AsyncListDiffer.ListListener<T!>);
+    method public void submitList(java.util.List<T!>?);
+    method public void submitList(java.util.List<T!>?, Runnable?);
+  }
+
+  public static interface AsyncListDiffer.ListListener<T> {
+    method public void onCurrentListChanged(java.util.List<T!>, java.util.List<T!>);
+  }
+
+  public class AsyncListUtil<T> {
+    ctor public AsyncListUtil(Class<T!>, int, androidx.recyclerview.widget.AsyncListUtil.DataCallback<T!>, androidx.recyclerview.widget.AsyncListUtil.ViewCallback);
+    method public T? getItem(int);
+    method public int getItemCount();
+    method public void onRangeChanged();
+    method public void refresh();
+  }
+
+  public abstract static class AsyncListUtil.DataCallback<T> {
+    ctor public AsyncListUtil.DataCallback();
+    method @WorkerThread public abstract void fillData(T![], int, int);
+    method @WorkerThread public int getMaxCachedTiles();
+    method @WorkerThread public void recycleData(T![], int);
+    method @WorkerThread public abstract int refreshData();
+  }
+
+  public abstract static class AsyncListUtil.ViewCallback {
+    ctor public AsyncListUtil.ViewCallback();
+    method @UiThread public void extendRangeInto(int[], int[], int);
+    method @UiThread public abstract void getItemRangeInto(int[]);
+    method @UiThread public abstract void onDataRefresh();
+    method @UiThread public abstract void onItemLoaded(int);
+    field public static final int HINT_SCROLL_ASC = 2; // 0x2
+    field public static final int HINT_SCROLL_DESC = 1; // 0x1
+    field public static final int HINT_SCROLL_NONE = 0; // 0x0
+  }
+
+  public class BatchingListUpdateCallback implements androidx.recyclerview.widget.ListUpdateCallback {
+    ctor public BatchingListUpdateCallback(androidx.recyclerview.widget.ListUpdateCallback);
+    method public void dispatchLastEvent();
+    method public void onChanged(int, int, Object!);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public class DefaultItemAnimator extends androidx.recyclerview.widget.SimpleItemAnimator {
+    ctor public DefaultItemAnimator();
+    method public boolean animateAdd(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder!, androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animateMove(androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animateRemove(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void endAnimation(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void endAnimations();
+    method public boolean isRunning();
+    method public void runPendingAnimations();
+  }
+
+  public class DiffUtil {
+    method public static androidx.recyclerview.widget.DiffUtil.DiffResult calculateDiff(androidx.recyclerview.widget.DiffUtil.Callback);
+    method public static androidx.recyclerview.widget.DiffUtil.DiffResult calculateDiff(androidx.recyclerview.widget.DiffUtil.Callback, boolean);
+  }
+
+  public abstract static class DiffUtil.Callback {
+    ctor public DiffUtil.Callback();
+    method public abstract boolean areContentsTheSame(int, int);
+    method public abstract boolean areItemsTheSame(int, int);
+    method public Object? getChangePayload(int, int);
+    method public abstract int getNewListSize();
+    method public abstract int getOldListSize();
+  }
+
+  public static class DiffUtil.DiffResult {
+    method public int convertNewPositionToOld(@IntRange(from=0) int);
+    method public int convertOldPositionToNew(@IntRange(from=0) int);
+    method public void dispatchUpdatesTo(androidx.recyclerview.widget.RecyclerView.Adapter);
+    method public void dispatchUpdatesTo(androidx.recyclerview.widget.ListUpdateCallback);
+    field public static final int NO_POSITION = -1; // 0xffffffff
+  }
+
+  public abstract static class DiffUtil.ItemCallback<T> {
+    ctor public DiffUtil.ItemCallback();
+    method public abstract boolean areContentsTheSame(T, T);
+    method public abstract boolean areItemsTheSame(T, T);
+    method public Object? getChangePayload(T, T);
+  }
+
+  public class DividerItemDecoration extends androidx.recyclerview.widget.RecyclerView.ItemDecoration {
+    ctor public DividerItemDecoration(android.content.Context!, int);
+    method public android.graphics.drawable.Drawable? getDrawable();
+    method public void setDrawable(android.graphics.drawable.Drawable);
+    method public void setOrientation(int);
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  public class GridLayoutManager extends androidx.recyclerview.widget.LinearLayoutManager {
+    ctor public GridLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
+    ctor public GridLayoutManager(android.content.Context!, int);
+    ctor public GridLayoutManager(android.content.Context!, int, @androidx.recyclerview.widget.RecyclerView.Orientation int, boolean);
+    method public int getSpanCount();
+    method public androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup! getSpanSizeLookup();
+    method public boolean isUsingSpansToEstimateScrollbarDimensions();
+    method public void setSpanCount(int);
+    method public void setSpanSizeLookup(androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup!);
+    method public void setUsingSpansToEstimateScrollbarDimensions(boolean);
+    field public static final int DEFAULT_SPAN_COUNT = -1; // 0xffffffff
+  }
+
+  public static final class GridLayoutManager.DefaultSpanSizeLookup extends androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup {
+    ctor public GridLayoutManager.DefaultSpanSizeLookup();
+    method public int getSpanSize(int);
+  }
+
+  public static class GridLayoutManager.LayoutParams extends androidx.recyclerview.widget.RecyclerView.LayoutParams {
+    ctor public GridLayoutManager.LayoutParams(android.content.Context!, android.util.AttributeSet!);
+    ctor public GridLayoutManager.LayoutParams(int, int);
+    ctor public GridLayoutManager.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
+    ctor public GridLayoutManager.LayoutParams(android.view.ViewGroup.LayoutParams!);
+    ctor public GridLayoutManager.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public int getSpanIndex();
+    method public int getSpanSize();
+    field public static final int INVALID_SPAN_ID = -1; // 0xffffffff
+  }
+
+  public abstract static class GridLayoutManager.SpanSizeLookup {
+    ctor public GridLayoutManager.SpanSizeLookup();
+    method public int getSpanGroupIndex(int, int);
+    method public int getSpanIndex(int, int);
+    method public abstract int getSpanSize(int);
+    method public void invalidateSpanGroupIndexCache();
+    method public void invalidateSpanIndexCache();
+    method public boolean isSpanGroupIndexCacheEnabled();
+    method public boolean isSpanIndexCacheEnabled();
+    method public void setSpanGroupIndexCacheEnabled(boolean);
+    method public void setSpanIndexCacheEnabled(boolean);
+  }
+
+  public class ItemTouchHelper extends androidx.recyclerview.widget.RecyclerView.ItemDecoration implements androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener {
+    ctor public ItemTouchHelper(androidx.recyclerview.widget.ItemTouchHelper.Callback);
+    method public void attachToRecyclerView(androidx.recyclerview.widget.RecyclerView?);
+    method public void onChildViewAttachedToWindow(android.view.View);
+    method public void onChildViewDetachedFromWindow(android.view.View);
+    method public void startDrag(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void startSwipe(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    field public static final int ACTION_STATE_DRAG = 2; // 0x2
+    field public static final int ACTION_STATE_IDLE = 0; // 0x0
+    field public static final int ACTION_STATE_SWIPE = 1; // 0x1
+    field public static final int ANIMATION_TYPE_DRAG = 8; // 0x8
+    field public static final int ANIMATION_TYPE_SWIPE_CANCEL = 4; // 0x4
+    field public static final int ANIMATION_TYPE_SWIPE_SUCCESS = 2; // 0x2
+    field public static final int DOWN = 2; // 0x2
+    field public static final int END = 32; // 0x20
+    field public static final int LEFT = 4; // 0x4
+    field public static final int RIGHT = 8; // 0x8
+    field public static final int START = 16; // 0x10
+    field public static final int UP = 1; // 0x1
+  }
+
+  public abstract static class ItemTouchHelper.Callback {
+    ctor public ItemTouchHelper.Callback();
+    method public boolean canDropOver(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! chooseDropTarget(androidx.recyclerview.widget.RecyclerView.ViewHolder, java.util.List<androidx.recyclerview.widget.RecyclerView.ViewHolder!>, int, int);
+    method public void clearView(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public int convertToAbsoluteDirection(int, int);
+    method public static int convertToRelativeDirection(int, int);
+    method public long getAnimationDuration(androidx.recyclerview.widget.RecyclerView, int, float, float);
+    method public int getBoundingBoxMargin();
+    method public static androidx.recyclerview.widget.ItemTouchUIUtil getDefaultUIUtil();
+    method public float getMoveThreshold(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public abstract int getMovementFlags(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public float getSwipeEscapeVelocity(float);
+    method public float getSwipeThreshold(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public float getSwipeVelocityThreshold(float);
+    method public int interpolateOutOfBoundsScroll(androidx.recyclerview.widget.RecyclerView, int, int, int, long);
+    method public boolean isItemViewSwipeEnabled();
+    method public boolean isLongPressDragEnabled();
+    method public static int makeFlag(int, int);
+    method public static int makeMovementFlags(int, int);
+    method public void onChildDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, float, float, int, boolean);
+    method public void onChildDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder!, float, float, int, boolean);
+    method public abstract boolean onMove(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onMoved(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, int, androidx.recyclerview.widget.RecyclerView.ViewHolder, int, int, int);
+    method public void onSelectedChanged(androidx.recyclerview.widget.RecyclerView.ViewHolder?, int);
+    method public abstract void onSwiped(androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
+    field public static final int DEFAULT_DRAG_ANIMATION_DURATION = 200; // 0xc8
+    field public static final int DEFAULT_SWIPE_ANIMATION_DURATION = 250; // 0xfa
+  }
+
+  public abstract static class ItemTouchHelper.SimpleCallback extends androidx.recyclerview.widget.ItemTouchHelper.Callback {
+    ctor public ItemTouchHelper.SimpleCallback(int, int);
+    method public int getDragDirs(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public int getMovementFlags(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public int getSwipeDirs(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void setDefaultDragDirs(int);
+    method public void setDefaultSwipeDirs(int);
+  }
+
+  public static interface ItemTouchHelper.ViewDropHandler {
+    method public void prepareForDrop(android.view.View, android.view.View, int, int);
+  }
+
+  public interface ItemTouchUIUtil {
+    method public void clearView(android.view.View!);
+    method public void onDraw(android.graphics.Canvas!, androidx.recyclerview.widget.RecyclerView!, android.view.View!, float, float, int, boolean);
+    method public void onDrawOver(android.graphics.Canvas!, androidx.recyclerview.widget.RecyclerView!, android.view.View!, float, float, int, boolean);
+    method public void onSelected(android.view.View!);
+  }
+
+  public class LinearLayoutManager extends androidx.recyclerview.widget.RecyclerView.LayoutManager implements androidx.recyclerview.widget.ItemTouchHelper.ViewDropHandler androidx.recyclerview.widget.RecyclerView.SmoothScroller.ScrollVectorProvider {
+    ctor public LinearLayoutManager(android.content.Context!);
+    ctor public LinearLayoutManager(android.content.Context!, @androidx.recyclerview.widget.RecyclerView.Orientation int, boolean);
+    ctor public LinearLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
+    method protected void calculateExtraLayoutSpace(androidx.recyclerview.widget.RecyclerView.State, int[]);
+    method public android.graphics.PointF! computeScrollVectorForPosition(int);
+    method public int findFirstCompletelyVisibleItemPosition();
+    method public int findFirstVisibleItemPosition();
+    method public int findLastCompletelyVisibleItemPosition();
+    method public int findLastVisibleItemPosition();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
+    method @Deprecated protected int getExtraLayoutSpace(androidx.recyclerview.widget.RecyclerView.State!);
+    method public int getInitialPrefetchItemCount();
+    method @androidx.recyclerview.widget.RecyclerView.Orientation public int getOrientation();
+    method public boolean getRecycleChildrenOnDetach();
+    method public boolean getReverseLayout();
+    method public boolean getStackFromEnd();
+    method protected boolean isLayoutRTL();
+    method public boolean isSmoothScrollbarEnabled();
+    method public void prepareForDrop(android.view.View, android.view.View, int, int);
+    method public void scrollToPositionWithOffset(int, int);
+    method public void setInitialPrefetchItemCount(int);
+    method public void setOrientation(@androidx.recyclerview.widget.RecyclerView.Orientation int);
+    method public void setRecycleChildrenOnDetach(boolean);
+    method public void setReverseLayout(boolean);
+    method public void setSmoothScrollbarEnabled(boolean);
+    method public void setStackFromEnd(boolean);
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int INVALID_OFFSET = -2147483648; // 0x80000000
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  protected static class LinearLayoutManager.LayoutChunkResult {
+    ctor protected LinearLayoutManager.LayoutChunkResult();
+    field public int mConsumed;
+    field public boolean mFinished;
+    field public boolean mFocusable;
+    field public boolean mIgnoreConsumed;
+  }
+
+  public class LinearSmoothScroller extends androidx.recyclerview.widget.RecyclerView.SmoothScroller {
+    ctor public LinearSmoothScroller(android.content.Context!);
+    method public int calculateDtToFit(int, int, int, int, int);
+    method public int calculateDxToMakeVisible(android.view.View!, int);
+    method public int calculateDyToMakeVisible(android.view.View!, int);
+    method protected float calculateSpeedPerPixel(android.util.DisplayMetrics!);
+    method protected int calculateTimeForDeceleration(int);
+    method protected int calculateTimeForScrolling(int);
+    method protected int getHorizontalSnapPreference();
+    method protected int getVerticalSnapPreference();
+    method protected void onSeekTargetStep(int, int, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
+    method protected void onStart();
+    method protected void onStop();
+    method protected void onTargetFound(android.view.View!, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
+    method protected void updateActionForInterimTarget(androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
+    field public static final int SNAP_TO_ANY = 0; // 0x0
+    field public static final int SNAP_TO_END = 1; // 0x1
+    field public static final int SNAP_TO_START = -1; // 0xffffffff
+    field protected final android.view.animation.DecelerateInterpolator! mDecelerateInterpolator;
+    field protected int mInterimTargetDx;
+    field protected int mInterimTargetDy;
+    field protected final android.view.animation.LinearInterpolator! mLinearInterpolator;
+    field protected android.graphics.PointF! mTargetVector;
+  }
+
+  public class LinearSnapHelper extends androidx.recyclerview.widget.SnapHelper {
+    ctor public LinearSnapHelper();
+    method public int[]! calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
+    method public android.view.View! findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
+  }
+
+  public abstract class ListAdapter<T, VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> extends androidx.recyclerview.widget.RecyclerView.Adapter<VH> {
+    ctor protected ListAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
+    ctor protected ListAdapter(androidx.recyclerview.widget.AsyncDifferConfig<T!>);
+    method public java.util.List<T!> getCurrentList();
+    method protected T! getItem(int);
+    method public int getItemCount();
+    method public void onCurrentListChanged(java.util.List<T!>, java.util.List<T!>);
+    method public void submitList(java.util.List<T!>?);
+    method public void submitList(java.util.List<T!>?, Runnable?);
+  }
+
+  public interface ListUpdateCallback {
+    method public void onChanged(int, int, Object?);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public final class MergeAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder> {
+    ctor @java.lang.SafeVarargs public MergeAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!...);
+    ctor @java.lang.SafeVarargs public MergeAdapter(androidx.recyclerview.widget.MergeAdapter.Config, androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!...);
+    ctor public MergeAdapter(java.util.List<androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!>);
+    ctor public MergeAdapter(androidx.recyclerview.widget.MergeAdapter.Config, java.util.List<androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!>);
+    method public boolean addAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
+    method public boolean addAdapter(int, androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
+    method public java.util.List<androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!> getAdapters();
+    method public int getItemCount();
+    method public void onBindViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder onCreateViewHolder(android.view.ViewGroup, int);
+    method public boolean onFailedToRecycleView(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onViewAttachedToWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onViewDetachedFromWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onViewRecycled(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public boolean removeAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
+  }
+
+  public static class MergeAdapter.Config {
+    field public static final androidx.recyclerview.widget.MergeAdapter.Config DEFAULT;
+    field public final boolean isolateViewTypes;
+    field public final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode stableIdMode;
+  }
+
+  public static class MergeAdapter.Config.Builder {
+    ctor public MergeAdapter.Config.Builder();
+    method public androidx.recyclerview.widget.MergeAdapter.Config build();
+    method public androidx.recyclerview.widget.MergeAdapter.Config.Builder setIsolateViewTypes(boolean);
+    method public androidx.recyclerview.widget.MergeAdapter.Config.Builder setStableIdMode(androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode);
+  }
+
+  public enum MergeAdapter.Config.StableIdMode {
+    enum_constant public static final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode ISOLATED_STABLE_IDS;
+    enum_constant public static final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode NO_STABLE_IDS;
+    enum_constant public static final androidx.recyclerview.widget.MergeAdapter.Config.StableIdMode SHARED_STABLE_IDS;
+  }
+
+  public abstract class OrientationHelper {
+    method public static androidx.recyclerview.widget.OrientationHelper! createHorizontalHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public static androidx.recyclerview.widget.OrientationHelper! createOrientationHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!, @androidx.recyclerview.widget.RecyclerView.Orientation int);
+    method public static androidx.recyclerview.widget.OrientationHelper! createVerticalHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public abstract int getDecoratedEnd(android.view.View!);
+    method public abstract int getDecoratedMeasurement(android.view.View!);
+    method public abstract int getDecoratedMeasurementInOther(android.view.View!);
+    method public abstract int getDecoratedStart(android.view.View!);
+    method public abstract int getEnd();
+    method public abstract int getEndAfterPadding();
+    method public abstract int getEndPadding();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutManager! getLayoutManager();
+    method public abstract int getMode();
+    method public abstract int getModeInOther();
+    method public abstract int getStartAfterPadding();
+    method public abstract int getTotalSpace();
+    method public int getTotalSpaceChange();
+    method public abstract int getTransformedEndWithDecoration(android.view.View!);
+    method public abstract int getTransformedStartWithDecoration(android.view.View!);
+    method public abstract void offsetChild(android.view.View!, int);
+    method public abstract void offsetChildren(int);
+    method public void onLayoutComplete();
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int VERTICAL = 1; // 0x1
+    field protected final androidx.recyclerview.widget.RecyclerView.LayoutManager! mLayoutManager;
+  }
+
+  public class PagerSnapHelper extends androidx.recyclerview.widget.SnapHelper {
+    ctor public PagerSnapHelper();
+    method public int[]? calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
+    method public android.view.View? findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
+  }
+
+  public class RecyclerView extends android.view.ViewGroup implements androidx.core.view.NestedScrollingChild2 androidx.core.view.NestedScrollingChild3 androidx.core.view.ScrollingView {
+    ctor public RecyclerView(android.content.Context);
+    ctor public RecyclerView(android.content.Context, android.util.AttributeSet?);
+    ctor public RecyclerView(android.content.Context, android.util.AttributeSet?, int);
+    method public void addItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration, int);
+    method public void addItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration);
+    method public void addOnChildAttachStateChangeListener(androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener);
+    method public void addOnItemTouchListener(androidx.recyclerview.widget.RecyclerView.OnItemTouchListener);
+    method public void addOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener);
+    method public void clearOnChildAttachStateChangeListeners();
+    method public void clearOnScrollListeners();
+    method public int computeHorizontalScrollExtent();
+    method public int computeHorizontalScrollOffset();
+    method public int computeHorizontalScrollRange();
+    method public int computeVerticalScrollExtent();
+    method public int computeVerticalScrollOffset();
+    method public int computeVerticalScrollRange();
+    method public boolean dispatchNestedPreScroll(int, int, int[]!, int[]!, int);
+    method public boolean dispatchNestedScroll(int, int, int, int, int[]!, int);
+    method public final void dispatchNestedScroll(int, int, int, int, int[]!, int, int[]);
+    method public boolean drawChild(android.graphics.Canvas!, android.view.View!, long);
+    method public android.view.View? findChildViewUnder(float, float);
+    method public android.view.View? findContainingItemView(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findContainingViewHolder(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForAdapterPosition(int);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! findViewHolderForItemId(long);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForLayoutPosition(int);
+    method @Deprecated public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForPosition(int);
+    method public boolean fling(int, int);
+    method public androidx.recyclerview.widget.RecyclerView.Adapter? getAdapter();
+    method public int getChildAdapterPosition(android.view.View);
+    method public long getChildItemId(android.view.View);
+    method public int getChildLayoutPosition(android.view.View);
+    method @Deprecated public int getChildPosition(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! getChildViewHolder(android.view.View);
+    method public androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate? getCompatAccessibilityDelegate();
+    method public void getDecoratedBoundsWithMargins(android.view.View, android.graphics.Rect);
+    method public androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory getEdgeEffectFactory();
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator? getItemAnimator();
+    method public androidx.recyclerview.widget.RecyclerView.ItemDecoration getItemDecorationAt(int);
+    method public int getItemDecorationCount();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutManager? getLayoutManager();
+    method public int getMaxFlingVelocity();
+    method public int getMinFlingVelocity();
+    method public androidx.recyclerview.widget.RecyclerView.OnFlingListener? getOnFlingListener();
+    method public boolean getPreserveFocusAfterLayout();
+    method public androidx.recyclerview.widget.RecyclerView.RecycledViewPool getRecycledViewPool();
+    method public int getScrollState();
+    method public boolean hasFixedSize();
+    method public boolean hasNestedScrollingParent(int);
+    method public boolean hasPendingAdapterUpdates();
+    method public void invalidateItemDecorations();
+    method public boolean isAnimating();
+    method public boolean isComputingLayout();
+    method @Deprecated public boolean isLayoutFrozen();
+    method public final boolean isLayoutSuppressed();
+    method public void nestedScrollBy(int, int);
+    method public void offsetChildrenHorizontal(@Px int);
+    method public void offsetChildrenVertical(@Px int);
+    method public void onChildAttachedToWindow(android.view.View);
+    method public void onChildDetachedFromWindow(android.view.View);
+    method public void onDraw(android.graphics.Canvas!);
+    method public void onScrollStateChanged(int);
+    method public void onScrolled(@Px int, @Px int);
+    method public void removeItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration);
+    method public void removeItemDecorationAt(int);
+    method public void removeOnChildAttachStateChangeListener(androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener);
+    method public void removeOnItemTouchListener(androidx.recyclerview.widget.RecyclerView.OnItemTouchListener);
+    method public void removeOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener);
+    method public void scrollToPosition(int);
+    method public void setAccessibilityDelegateCompat(androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate?);
+    method public void setAdapter(androidx.recyclerview.widget.RecyclerView.Adapter?);
+    method public void setChildDrawingOrderCallback(androidx.recyclerview.widget.RecyclerView.ChildDrawingOrderCallback?);
+    method public void setEdgeEffectFactory(androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory);
+    method public void setHasFixedSize(boolean);
+    method public void setItemAnimator(androidx.recyclerview.widget.RecyclerView.ItemAnimator?);
+    method public void setItemViewCacheSize(int);
+    method @Deprecated public void setLayoutFrozen(boolean);
+    method public void setLayoutManager(androidx.recyclerview.widget.RecyclerView.LayoutManager?);
+    method @Deprecated public void setLayoutTransition(android.animation.LayoutTransition!);
+    method public void setOnFlingListener(androidx.recyclerview.widget.RecyclerView.OnFlingListener?);
+    method @Deprecated public void setOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener?);
+    method public void setPreserveFocusAfterLayout(boolean);
+    method public void setRecycledViewPool(androidx.recyclerview.widget.RecyclerView.RecycledViewPool?);
+    method public void setRecyclerListener(androidx.recyclerview.widget.RecyclerView.RecyclerListener?);
+    method public void setScrollingTouchSlop(int);
+    method public void setViewCacheExtension(androidx.recyclerview.widget.RecyclerView.ViewCacheExtension?);
+    method public void smoothScrollBy(@Px int, @Px int);
+    method public void smoothScrollBy(@Px int, @Px int, android.view.animation.Interpolator?);
+    method public void smoothScrollBy(@Px int, @Px int, android.view.animation.Interpolator?, int);
+    method public void smoothScrollToPosition(int);
+    method public boolean startNestedScroll(int, int);
+    method public void stopNestedScroll(int);
+    method public void stopScroll();
+    method public final void suppressLayout(boolean);
+    method public void swapAdapter(androidx.recyclerview.widget.RecyclerView.Adapter?, boolean);
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int INVALID_TYPE = -1; // 0xffffffff
+    field public static final long NO_ID = -1L; // 0xffffffffffffffffL
+    field public static final int NO_POSITION = -1; // 0xffffffff
+    field public static final int SCROLL_STATE_DRAGGING = 1; // 0x1
+    field public static final int SCROLL_STATE_IDLE = 0; // 0x0
+    field public static final int SCROLL_STATE_SETTLING = 2; // 0x2
+    field public static final int TOUCH_SLOP_DEFAULT = 0; // 0x0
+    field public static final int TOUCH_SLOP_PAGING = 1; // 0x1
+    field public static final int UNDEFINED_DURATION = -2147483648; // 0x80000000
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  public abstract static class RecyclerView.Adapter<VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> {
+    ctor public RecyclerView.Adapter();
+    method public final void bindViewHolder(VH, int);
+    method public final VH createViewHolder(android.view.ViewGroup, int);
+    method public int findRelativeAdapterPositionIn(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>, androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
+    method public abstract int getItemCount();
+    method public long getItemId(int);
+    method public int getItemViewType(int);
+    method public final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy getStateRestorationPolicy();
+    method public final boolean hasObservers();
+    method public final boolean hasStableIds();
+    method public final void notifyDataSetChanged();
+    method public final void notifyItemChanged(int);
+    method public final void notifyItemChanged(int, Object?);
+    method public final void notifyItemInserted(int);
+    method public final void notifyItemMoved(int, int);
+    method public final void notifyItemRangeChanged(int, int);
+    method public final void notifyItemRangeChanged(int, int, Object?);
+    method public final void notifyItemRangeInserted(int, int);
+    method public final void notifyItemRangeRemoved(int, int);
+    method public final void notifyItemRemoved(int);
+    method public void onAttachedToRecyclerView(androidx.recyclerview.widget.RecyclerView);
+    method public abstract void onBindViewHolder(VH, int);
+    method public void onBindViewHolder(VH, int, java.util.List<java.lang.Object!>);
+    method public abstract VH onCreateViewHolder(android.view.ViewGroup, int);
+    method public void onDetachedFromRecyclerView(androidx.recyclerview.widget.RecyclerView);
+    method public boolean onFailedToRecycleView(VH);
+    method public void onViewAttachedToWindow(VH);
+    method public void onViewDetachedFromWindow(VH);
+    method public void onViewRecycled(VH);
+    method public void registerAdapterDataObserver(androidx.recyclerview.widget.RecyclerView.AdapterDataObserver);
+    method public void setHasStableIds(boolean);
+    method public void setStateRestorationPolicy(androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy);
+    method public void unregisterAdapterDataObserver(androidx.recyclerview.widget.RecyclerView.AdapterDataObserver);
+  }
+
+  public enum RecyclerView.Adapter.StateRestorationPolicy {
+    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy ALLOW;
+    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy PREVENT;
+    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy PREVENT_WHEN_EMPTY;
+  }
+
+  public abstract static class RecyclerView.AdapterDataObserver {
+    ctor public RecyclerView.AdapterDataObserver();
+    method public void onChanged();
+    method public void onItemRangeChanged(int, int);
+    method public void onItemRangeChanged(int, int, Object?);
+    method public void onItemRangeInserted(int, int);
+    method public void onItemRangeMoved(int, int, int);
+    method public void onItemRangeRemoved(int, int);
+    method public void onStateRestorationPolicyChanged();
+  }
+
+  public static interface RecyclerView.ChildDrawingOrderCallback {
+    method public int onGetChildDrawingOrder(int, int);
+  }
+
+  public static class RecyclerView.EdgeEffectFactory {
+    ctor public RecyclerView.EdgeEffectFactory();
+    method protected android.widget.EdgeEffect createEdgeEffect(androidx.recyclerview.widget.RecyclerView, @androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.EdgeDirection int);
+    field public static final int DIRECTION_BOTTOM = 3; // 0x3
+    field public static final int DIRECTION_LEFT = 0; // 0x0
+    field public static final int DIRECTION_RIGHT = 2; // 0x2
+    field public static final int DIRECTION_TOP = 1; // 0x1
+  }
+
+  @IntDef({androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_LEFT, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_TOP, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_RIGHT, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_BOTTOM}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface RecyclerView.EdgeEffectFactory.EdgeDirection {
+  }
+
+  public abstract static class RecyclerView.ItemAnimator {
+    ctor public RecyclerView.ItemAnimator();
+    method public abstract boolean animateAppearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateDisappearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?);
+    method public abstract boolean animatePersistence(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public boolean canReuseUpdatedViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public boolean canReuseUpdatedViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder, java.util.List<java.lang.Object!>);
+    method public final void dispatchAnimationFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public final void dispatchAnimationStarted(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public final void dispatchAnimationsFinished();
+    method public abstract void endAnimation(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public abstract void endAnimations();
+    method public long getAddDuration();
+    method public long getChangeDuration();
+    method public long getMoveDuration();
+    method public long getRemoveDuration();
+    method public abstract boolean isRunning();
+    method public final boolean isRunning(androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemAnimatorFinishedListener?);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo obtainHolderInfo();
+    method public void onAnimationFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public void onAnimationStarted(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo recordPostLayoutInformation(androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo recordPreLayoutInformation(androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.ViewHolder, @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges int, java.util.List<java.lang.Object!>);
+    method public abstract void runPendingAnimations();
+    method public void setAddDuration(long);
+    method public void setChangeDuration(long);
+    method public void setMoveDuration(long);
+    method public void setRemoveDuration(long);
+    field public static final int FLAG_APPEARED_IN_PRE_LAYOUT = 4096; // 0x1000
+    field public static final int FLAG_CHANGED = 2; // 0x2
+    field public static final int FLAG_INVALIDATED = 4; // 0x4
+    field public static final int FLAG_MOVED = 2048; // 0x800
+    field public static final int FLAG_REMOVED = 8; // 0x8
+  }
+
+  @IntDef(flag=true, value={androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_CHANGED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_REMOVED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_MOVED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_INVALIDATED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_APPEARED_IN_PRE_LAYOUT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface RecyclerView.ItemAnimator.AdapterChanges {
+  }
+
+  public static interface RecyclerView.ItemAnimator.ItemAnimatorFinishedListener {
+    method public void onAnimationsFinished();
+  }
+
+  public static class RecyclerView.ItemAnimator.ItemHolderInfo {
+    ctor public RecyclerView.ItemAnimator.ItemHolderInfo();
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo setFrom(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo setFrom(androidx.recyclerview.widget.RecyclerView.ViewHolder, @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges int);
+    field public int bottom;
+    field @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges public int changeFlags;
+    field public int left;
+    field public int right;
+    field public int top;
+  }
+
+  public abstract static class RecyclerView.ItemDecoration {
+    ctor public RecyclerView.ItemDecoration();
+    method @Deprecated public void getItemOffsets(android.graphics.Rect, int, androidx.recyclerview.widget.RecyclerView);
+    method public void getItemOffsets(android.graphics.Rect, android.view.View, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
+    method public void onDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
+    method @Deprecated public void onDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView);
+    method public void onDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
+    method @Deprecated public void onDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView);
+  }
+
+  public abstract static class RecyclerView.LayoutManager {
+    ctor public RecyclerView.LayoutManager();
+    method public void addDisappearingView(android.view.View!);
+    method public void addDisappearingView(android.view.View!, int);
+    method public void addView(android.view.View!);
+    method public void addView(android.view.View!, int);
+    method public void assertInLayoutOrScroll(String!);
+    method public void assertNotInLayoutOrScroll(String!);
+    method public void attachView(android.view.View, int, androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public void attachView(android.view.View, int);
+    method public void attachView(android.view.View);
+    method public void calculateItemDecorationsForChild(android.view.View, android.graphics.Rect);
+    method public boolean canScrollHorizontally();
+    method public boolean canScrollVertically();
+    method public boolean checkLayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public static int chooseSize(int, int, int);
+    method public void collectAdjacentPrefetchPositions(int, int, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.LayoutManager.LayoutPrefetchRegistry!);
+    method public void collectInitialPrefetchPositions(int, androidx.recyclerview.widget.RecyclerView.LayoutManager.LayoutPrefetchRegistry!);
+    method public int computeHorizontalScrollExtent(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeHorizontalScrollOffset(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeHorizontalScrollRange(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeVerticalScrollExtent(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeVerticalScrollOffset(androidx.recyclerview.widget.RecyclerView.State);
+    method public int computeVerticalScrollRange(androidx.recyclerview.widget.RecyclerView.State);
+    method public void detachAndScrapAttachedViews(androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void detachAndScrapView(android.view.View, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void detachAndScrapViewAt(int, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void detachView(android.view.View);
+    method public void detachViewAt(int);
+    method public void endAnimation(android.view.View!);
+    method public android.view.View? findContainingItemView(android.view.View);
+    method public android.view.View? findViewByPosition(int);
+    method public abstract androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateLayoutParams(android.content.Context!, android.util.AttributeSet!);
+    method public int getBaseline();
+    method public int getBottomDecorationHeight(android.view.View);
+    method public android.view.View? getChildAt(int);
+    method public int getChildCount();
+    method @Deprecated public static int getChildMeasureSpec(int, int, int, boolean);
+    method public static int getChildMeasureSpec(int, int, int, int, boolean);
+    method public boolean getClipToPadding();
+    method public int getColumnCountForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public int getDecoratedBottom(android.view.View);
+    method public void getDecoratedBoundsWithMargins(android.view.View, android.graphics.Rect);
+    method public int getDecoratedLeft(android.view.View);
+    method public int getDecoratedMeasuredHeight(android.view.View);
+    method public int getDecoratedMeasuredWidth(android.view.View);
+    method public int getDecoratedRight(android.view.View);
+    method public int getDecoratedTop(android.view.View);
+    method public android.view.View? getFocusedChild();
+    method @Px public int getHeight();
+    method public int getHeightMode();
+    method public int getItemCount();
+    method public int getItemViewType(android.view.View);
+    method public int getLayoutDirection();
+    method public int getLeftDecorationWidth(android.view.View);
+    method @Px public int getMinimumHeight();
+    method @Px public int getMinimumWidth();
+    method @Px public int getPaddingBottom();
+    method @Px public int getPaddingEnd();
+    method @Px public int getPaddingLeft();
+    method @Px public int getPaddingRight();
+    method @Px public int getPaddingStart();
+    method @Px public int getPaddingTop();
+    method public int getPosition(android.view.View);
+    method public static androidx.recyclerview.widget.RecyclerView.LayoutManager.Properties! getProperties(android.content.Context, android.util.AttributeSet?, int, int);
+    method public int getRightDecorationWidth(android.view.View);
+    method public int getRowCountForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public int getSelectionModeForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public int getTopDecorationHeight(android.view.View);
+    method public void getTransformedBoundingBox(android.view.View, boolean, android.graphics.Rect);
+    method @Px public int getWidth();
+    method public int getWidthMode();
+    method public boolean hasFocus();
+    method public void ignoreView(android.view.View);
+    method public boolean isAttachedToWindow();
+    method public boolean isAutoMeasureEnabled();
+    method public boolean isFocused();
+    method public final boolean isItemPrefetchEnabled();
+    method public boolean isLayoutHierarchical(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public boolean isMeasurementCacheEnabled();
+    method public boolean isSmoothScrolling();
+    method public boolean isViewPartiallyVisible(android.view.View, boolean, boolean);
+    method public void layoutDecorated(android.view.View, int, int, int, int);
+    method public void layoutDecoratedWithMargins(android.view.View, int, int, int, int);
+    method public void measureChild(android.view.View, int, int);
+    method public void measureChildWithMargins(android.view.View, int, int);
+    method public void moveView(int, int);
+    method public void offsetChildrenHorizontal(@Px int);
+    method public void offsetChildrenVertical(@Px int);
+    method public void onAdapterChanged(androidx.recyclerview.widget.RecyclerView.Adapter?, androidx.recyclerview.widget.RecyclerView.Adapter?);
+    method public boolean onAddFocusables(androidx.recyclerview.widget.RecyclerView, java.util.ArrayList<android.view.View!>, int, int);
+    method @CallSuper public void onAttachedToWindow(androidx.recyclerview.widget.RecyclerView!);
+    method @Deprecated public void onDetachedFromWindow(androidx.recyclerview.widget.RecyclerView!);
+    method @CallSuper public void onDetachedFromWindow(androidx.recyclerview.widget.RecyclerView!, androidx.recyclerview.widget.RecyclerView.Recycler!);
+    method public android.view.View? onFocusSearchFailed(android.view.View, int, androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
+    method public void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
+    method public void onInitializeAccessibilityEvent(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.accessibility.AccessibilityEvent);
+    method public void onInitializeAccessibilityNodeInfo(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, androidx.core.view.accessibility.AccessibilityNodeInfoCompat);
+    method public void onInitializeAccessibilityNodeInfoForItem(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.View, androidx.core.view.accessibility.AccessibilityNodeInfoCompat);
+    method public android.view.View? onInterceptFocusSearch(android.view.View, int);
+    method public void onItemsAdded(androidx.recyclerview.widget.RecyclerView, int, int);
+    method public void onItemsChanged(androidx.recyclerview.widget.RecyclerView);
+    method public void onItemsMoved(androidx.recyclerview.widget.RecyclerView, int, int, int);
+    method public void onItemsRemoved(androidx.recyclerview.widget.RecyclerView, int, int);
+    method public void onItemsUpdated(androidx.recyclerview.widget.RecyclerView, int, int);
+    method public void onItemsUpdated(androidx.recyclerview.widget.RecyclerView, int, int, Object?);
+    method public void onLayoutChildren(androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
+    method public void onLayoutCompleted(androidx.recyclerview.widget.RecyclerView.State!);
+    method public void onMeasure(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, int, int);
+    method @Deprecated public boolean onRequestChildFocus(androidx.recyclerview.widget.RecyclerView, android.view.View, android.view.View?);
+    method public boolean onRequestChildFocus(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State, android.view.View, android.view.View?);
+    method public void onRestoreInstanceState(android.os.Parcelable!);
+    method public android.os.Parcelable? onSaveInstanceState();
+    method public void onScrollStateChanged(int);
+    method public boolean performAccessibilityAction(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, int, android.os.Bundle?);
+    method public boolean performAccessibilityActionForItem(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.View, int, android.os.Bundle?);
+    method public void postOnAnimation(Runnable!);
+    method public void removeAllViews();
+    method public void removeAndRecycleAllViews(androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void removeAndRecycleView(android.view.View, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public void removeAndRecycleViewAt(int, androidx.recyclerview.widget.RecyclerView.Recycler);
+    method public boolean removeCallbacks(Runnable!);
+    method public void removeDetachedView(android.view.View);
+    method public void removeView(android.view.View!);
+    method public void removeViewAt(int);
+    method public boolean requestChildRectangleOnScreen(androidx.recyclerview.widget.RecyclerView, android.view.View, android.graphics.Rect, boolean);
+    method public boolean requestChildRectangleOnScreen(androidx.recyclerview.widget.RecyclerView, android.view.View, android.graphics.Rect, boolean, boolean);
+    method public void requestLayout();
+    method public void requestSimpleAnimationsInNextLayout();
+    method public int scrollHorizontallyBy(int, androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
+    method public void scrollToPosition(int);
+    method public int scrollVerticallyBy(int, androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
+    method @Deprecated public void setAutoMeasureEnabled(boolean);
+    method public final void setItemPrefetchEnabled(boolean);
+    method public void setMeasuredDimension(android.graphics.Rect!, int, int);
+    method public void setMeasuredDimension(int, int);
+    method public void setMeasurementCacheEnabled(boolean);
+    method public void smoothScrollToPosition(androidx.recyclerview.widget.RecyclerView!, androidx.recyclerview.widget.RecyclerView.State!, int);
+    method public void startSmoothScroll(androidx.recyclerview.widget.RecyclerView.SmoothScroller!);
+    method public void stopIgnoringView(android.view.View);
+    method public boolean supportsPredictiveItemAnimations();
+  }
+
+  public static interface RecyclerView.LayoutManager.LayoutPrefetchRegistry {
+    method public void addPosition(int, int);
+  }
+
+  public static class RecyclerView.LayoutManager.Properties {
+    ctor public RecyclerView.LayoutManager.Properties();
+    field public int orientation;
+    field public boolean reverseLayout;
+    field public int spanCount;
+    field public boolean stackFromEnd;
+  }
+
+  public static class RecyclerView.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
+    ctor public RecyclerView.LayoutParams(android.content.Context!, android.util.AttributeSet!);
+    ctor public RecyclerView.LayoutParams(int, int);
+    ctor public RecyclerView.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
+    ctor public RecyclerView.LayoutParams(android.view.ViewGroup.LayoutParams!);
+    ctor public RecyclerView.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public int getAbsoluteAdapterPosition();
+    method public int getBindingAdapterPosition();
+    method @Deprecated public int getViewAdapterPosition();
+    method public int getViewLayoutPosition();
+    method @Deprecated public int getViewPosition();
+    method public boolean isItemChanged();
+    method public boolean isItemRemoved();
+    method public boolean isViewInvalid();
+    method public boolean viewNeedsUpdate();
+  }
+
+  public static interface RecyclerView.OnChildAttachStateChangeListener {
+    method public void onChildViewAttachedToWindow(android.view.View);
+    method public void onChildViewDetachedFromWindow(android.view.View);
+  }
+
+  public abstract static class RecyclerView.OnFlingListener {
+    ctor public RecyclerView.OnFlingListener();
+    method public abstract boolean onFling(int, int);
+  }
+
+  public static interface RecyclerView.OnItemTouchListener {
+    method public boolean onInterceptTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+    method public void onRequestDisallowInterceptTouchEvent(boolean);
+    method public void onTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+  }
+
+  public abstract static class RecyclerView.OnScrollListener {
+    ctor public RecyclerView.OnScrollListener();
+    method public void onScrollStateChanged(androidx.recyclerview.widget.RecyclerView, int);
+    method public void onScrolled(androidx.recyclerview.widget.RecyclerView, int, int);
+  }
+
+  @IntDef({androidx.recyclerview.widget.RecyclerView.HORIZONTAL, androidx.recyclerview.widget.RecyclerView.VERTICAL}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface RecyclerView.Orientation {
+  }
+
+  public static class RecyclerView.RecycledViewPool {
+    ctor public RecyclerView.RecycledViewPool();
+    method public void clear();
+    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? getRecycledView(int);
+    method public int getRecycledViewCount(int);
+    method public void putRecycledView(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void setMaxRecycledViews(int, int);
+  }
+
+  public final class RecyclerView.Recycler {
+    ctor public RecyclerView.Recycler();
+    method public void bindViewToPosition(android.view.View, int);
+    method public void clear();
+    method public int convertPreLayoutPositionToPostLayout(int);
+    method public java.util.List<androidx.recyclerview.widget.RecyclerView.ViewHolder!> getScrapList();
+    method public android.view.View getViewForPosition(int);
+    method public void recycleView(android.view.View);
+    method public void setViewCacheSize(int);
+  }
+
+  public static interface RecyclerView.RecyclerListener {
+    method public void onViewRecycled(androidx.recyclerview.widget.RecyclerView.ViewHolder);
+  }
+
+  public static class RecyclerView.SimpleOnItemTouchListener implements androidx.recyclerview.widget.RecyclerView.OnItemTouchListener {
+    ctor public RecyclerView.SimpleOnItemTouchListener();
+    method public boolean onInterceptTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+    method public void onRequestDisallowInterceptTouchEvent(boolean);
+    method public void onTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
+  }
+
+  public abstract static class RecyclerView.SmoothScroller {
+    ctor public RecyclerView.SmoothScroller();
+    method public android.graphics.PointF? computeScrollVectorForPosition(int);
+    method public android.view.View! findViewByPosition(int);
+    method public int getChildCount();
+    method public int getChildPosition(android.view.View!);
+    method public androidx.recyclerview.widget.RecyclerView.LayoutManager? getLayoutManager();
+    method public int getTargetPosition();
+    method @Deprecated public void instantScrollToPosition(int);
+    method public boolean isPendingInitialRun();
+    method public boolean isRunning();
+    method protected void normalize(android.graphics.PointF);
+    method protected void onChildAttachedToWindow(android.view.View!);
+    method protected abstract void onSeekTargetStep(@Px int, @Px int, androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action);
+    method protected abstract void onStart();
+    method protected abstract void onStop();
+    method protected abstract void onTargetFound(android.view.View, androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action);
+    method public void setTargetPosition(int);
+    method protected final void stop();
+  }
+
+  public static class RecyclerView.SmoothScroller.Action {
+    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int);
+    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int, int);
+    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int, int, android.view.animation.Interpolator?);
+    method public int getDuration();
+    method @Px public int getDx();
+    method @Px public int getDy();
+    method public android.view.animation.Interpolator? getInterpolator();
+    method public void jumpTo(int);
+    method public void setDuration(int);
+    method public void setDx(@Px int);
+    method public void setDy(@Px int);
+    method public void setInterpolator(android.view.animation.Interpolator?);
+    method public void update(@Px int, @Px int, int, android.view.animation.Interpolator?);
+    field public static final int UNDEFINED_DURATION = -2147483648; // 0x80000000
+  }
+
+  public static interface RecyclerView.SmoothScroller.ScrollVectorProvider {
+    method public android.graphics.PointF? computeScrollVectorForPosition(int);
+  }
+
+  public static class RecyclerView.State {
+    ctor public RecyclerView.State();
+    method public boolean didStructureChange();
+    method public <T> T! get(int);
+    method public int getItemCount();
+    method public int getRemainingScrollHorizontal();
+    method public int getRemainingScrollVertical();
+    method public int getTargetScrollPosition();
+    method public boolean hasTargetScrollPosition();
+    method public boolean isMeasuring();
+    method public boolean isPreLayout();
+    method public void put(int, Object!);
+    method public void remove(int);
+    method public boolean willRunPredictiveAnimations();
+    method public boolean willRunSimpleAnimations();
+  }
+
+  public abstract static class RecyclerView.ViewCacheExtension {
+    ctor public RecyclerView.ViewCacheExtension();
+    method public abstract android.view.View? getViewForPositionAndType(androidx.recyclerview.widget.RecyclerView.Recycler, int, int);
+  }
+
+  public abstract static class RecyclerView.ViewHolder {
+    ctor public RecyclerView.ViewHolder(android.view.View);
+    method public final int getAbsoluteAdapterPosition();
+    method @Deprecated public final int getAdapterPosition();
+    method public final androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>? getBindingAdapter();
+    method public final int getBindingAdapterPosition();
+    method public final long getItemId();
+    method public final int getItemViewType();
+    method public final int getLayoutPosition();
+    method public final int getOldPosition();
+    method @Deprecated public final int getPosition();
+    method public final boolean isRecyclable();
+    method public final void setIsRecyclable(boolean);
+    field public final android.view.View itemView;
+  }
+
+  public class RecyclerViewAccessibilityDelegate extends androidx.core.view.AccessibilityDelegateCompat {
+    ctor public RecyclerViewAccessibilityDelegate(androidx.recyclerview.widget.RecyclerView);
+    method public androidx.core.view.AccessibilityDelegateCompat getItemDelegate();
+  }
+
+  public static class RecyclerViewAccessibilityDelegate.ItemDelegate extends androidx.core.view.AccessibilityDelegateCompat {
+    ctor public RecyclerViewAccessibilityDelegate.ItemDelegate(androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate);
+  }
+
+  public abstract class SimpleItemAnimator extends androidx.recyclerview.widget.RecyclerView.ItemAnimator {
+    ctor public SimpleItemAnimator();
+    method public abstract boolean animateAdd(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public boolean animateAppearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder!, androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animateDisappearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?);
+    method public abstract boolean animateMove(androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
+    method public boolean animatePersistence(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
+    method public abstract boolean animateRemove(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchAddFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchAddStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchChangeFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public final void dispatchChangeStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public final void dispatchMoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchMoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchRemoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public final void dispatchRemoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public boolean getSupportsChangeAnimations();
+    method public void onAddFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onAddStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onChangeFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public void onChangeStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
+    method public void onMoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onMoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onRemoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void onRemoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
+    method public void setSupportsChangeAnimations(boolean);
+  }
+
+  public abstract class SnapHelper extends androidx.recyclerview.widget.RecyclerView.OnFlingListener {
+    ctor public SnapHelper();
+    method public void attachToRecyclerView(androidx.recyclerview.widget.RecyclerView?) throws java.lang.IllegalStateException;
+    method public abstract int[]? calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
+    method public int[]! calculateScrollDistance(int, int);
+    method protected androidx.recyclerview.widget.RecyclerView.SmoothScroller? createScroller(androidx.recyclerview.widget.RecyclerView.LayoutManager);
+    method @Deprecated protected androidx.recyclerview.widget.LinearSmoothScroller? createSnapScroller(androidx.recyclerview.widget.RecyclerView.LayoutManager);
+    method public abstract android.view.View? findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
+    method public abstract int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
+    method public boolean onFling(int, int);
+  }
+
+  public class SortedList<T> {
+    ctor public SortedList(Class<T!>, androidx.recyclerview.widget.SortedList.Callback<T!>);
+    ctor public SortedList(Class<T!>, androidx.recyclerview.widget.SortedList.Callback<T!>, int);
+    method public int add(T!);
+    method public void addAll(T![], boolean);
+    method public void addAll(T!...);
+    method public void addAll(java.util.Collection<T!>);
+    method public void beginBatchedUpdates();
+    method public void clear();
+    method public void endBatchedUpdates();
+    method public T! get(int) throws java.lang.IndexOutOfBoundsException;
+    method public int indexOf(T!);
+    method public void recalculatePositionOfItemAt(int);
+    method public boolean remove(T!);
+    method public T! removeItemAt(int);
+    method public void replaceAll(T![], boolean);
+    method public void replaceAll(T!...);
+    method public void replaceAll(java.util.Collection<T!>);
+    method public int size();
+    method public void updateItemAt(int, T!);
+    field public static final int INVALID_POSITION = -1; // 0xffffffff
+  }
+
+  public static class SortedList.BatchedCallback<T2> extends androidx.recyclerview.widget.SortedList.Callback<T2> {
+    ctor public SortedList.BatchedCallback(androidx.recyclerview.widget.SortedList.Callback<T2!>!);
+    method public boolean areContentsTheSame(T2!, T2!);
+    method public boolean areItemsTheSame(T2!, T2!);
+    method public int compare(T2!, T2!);
+    method public void dispatchLastEvent();
+    method public void onChanged(int, int);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public abstract static class SortedList.Callback<T2> implements java.util.Comparator<T2> androidx.recyclerview.widget.ListUpdateCallback {
+    ctor public SortedList.Callback();
+    method public abstract boolean areContentsTheSame(T2!, T2!);
+    method public abstract boolean areItemsTheSame(T2!, T2!);
+    method public abstract int compare(T2!, T2!);
+    method public Object? getChangePayload(T2!, T2!);
+    method public abstract void onChanged(int, int);
+    method public void onChanged(int, int, Object!);
+  }
+
+  public abstract class SortedListAdapterCallback<T2> extends androidx.recyclerview.widget.SortedList.Callback<T2> {
+    ctor public SortedListAdapterCallback(androidx.recyclerview.widget.RecyclerView.Adapter!);
+    method public void onChanged(int, int);
+    method public void onInserted(int, int);
+    method public void onMoved(int, int);
+    method public void onRemoved(int, int);
+  }
+
+  public class StaggeredGridLayoutManager extends androidx.recyclerview.widget.RecyclerView.LayoutManager implements androidx.recyclerview.widget.RecyclerView.SmoothScroller.ScrollVectorProvider {
+    ctor public StaggeredGridLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
+    ctor public StaggeredGridLayoutManager(int, int);
+    method public android.graphics.PointF! computeScrollVectorForPosition(int);
+    method public int[]! findFirstCompletelyVisibleItemPositions(int[]!);
+    method public int[]! findFirstVisibleItemPositions(int[]!);
+    method public int[]! findLastCompletelyVisibleItemPositions(int[]!);
+    method public int[]! findLastVisibleItemPositions(int[]!);
+    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
+    method public int getGapStrategy();
+    method public int getOrientation();
+    method public boolean getReverseLayout();
+    method public int getSpanCount();
+    method public void invalidateSpanAssignments();
+    method public void scrollToPositionWithOffset(int, int);
+    method public void setGapStrategy(int);
+    method public void setOrientation(int);
+    method public void setReverseLayout(boolean);
+    method public void setSpanCount(int);
+    field @Deprecated public static final int GAP_HANDLING_LAZY = 1; // 0x1
+    field public static final int GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS = 2; // 0x2
+    field public static final int GAP_HANDLING_NONE = 0; // 0x0
+    field public static final int HORIZONTAL = 0; // 0x0
+    field public static final int VERTICAL = 1; // 0x1
+  }
+
+  public static class StaggeredGridLayoutManager.LayoutParams extends androidx.recyclerview.widget.RecyclerView.LayoutParams {
+    ctor public StaggeredGridLayoutManager.LayoutParams(android.content.Context!, android.util.AttributeSet!);
+    ctor public StaggeredGridLayoutManager.LayoutParams(int, int);
+    ctor public StaggeredGridLayoutManager.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
+    ctor public StaggeredGridLayoutManager.LayoutParams(android.view.ViewGroup.LayoutParams!);
+    ctor public StaggeredGridLayoutManager.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
+    method public final int getSpanIndex();
+    method public boolean isFullSpan();
+    method public void setFullSpan(boolean);
+    field public static final int INVALID_SPAN_ID = -1; // 0xffffffff
+  }
+
+}
+
diff --git a/room/compiler/src/main/kotlin/androidx/room/log/RLog.kt b/room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
index 1338f21..6df6342 100644
--- a/room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
@@ -18,6 +18,7 @@
 
 package androidx.room.log
 
+import androidx.room.processor.Context
 import androidx.room.vo.Warning
 import java.io.StringWriter
 import javax.annotation.processing.ProcessingEnvironment
@@ -102,18 +103,12 @@
 
         fun hasErrors() = messages.containsKey(Diagnostic.Kind.ERROR)
 
-        fun writeTo(env: ProcessingEnvironment) {
+        fun writeTo(context: Context) {
+            val printMessage = context.logger.messager::printMessage
             messages.forEach { pair ->
                 val kind = pair.key
                 pair.value.forEach { (msg, element) ->
-                    env.messager.printMessage(
-                            kind,
-                            if (element != null && element.isFromCompiledClass()) {
-                                msg.appendElement(env.elementUtils, element)
-                            } else {
-                                msg
-                            },
-                            element)
+                    printMessage(kind, msg, element)
                 }
             }
         }
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 9bb9c64..a68207a 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
@@ -46,30 +46,91 @@
 ) {
     val context = baseContext.fork(executableElement)
 
+    /**
+     * The processing of the method might happen in multiple steps if we decide to rewrite the
+     * query after the first processing. To allow it while respecting the Context, it is
+     * implemented as a sub procedure in [InternalQueryProcessor].
+     */
     fun process(): QueryMethod {
+        val annotation = executableElement.toAnnotationBox(Query::class)?.value
+        context.checker.check(
+            annotation != null, executableElement,
+            ProcessorErrors.MISSING_QUERY_ANNOTATION
+        )
+
+        /**
+         * Run the first process without reporting any errors / warnings as we might be able to
+         * fix them for the developer.
+         */
+        val (initialResult, logs) = context.collectLogs {
+            InternalQueryProcessor(
+                context = it,
+                executableElement = executableElement,
+                dbVerifier = dbVerifier,
+                containing = containing
+            ).processQuery(annotation?.value)
+        }
+        // check if want to swap the query for a better one
+        val finalResult = if (initialResult is ReadQueryMethod) {
+            val rowAdapter = initialResult.queryResultBinder.adapter?.rowAdapter
+            val originalQuery = initialResult.query
+            val finalQuery = rowAdapter?.let {
+                context.queryRewriter?.rewrite(originalQuery, rowAdapter)
+            } ?: originalQuery
+            if (finalQuery != originalQuery) {
+                // ok parse again
+                return InternalQueryProcessor(
+                    context = context,
+                    executableElement = executableElement,
+                    dbVerifier = dbVerifier,
+                    containing = containing
+                ).processQuery(finalQuery.original)
+            } else {
+                initialResult
+            }
+        } else {
+            initialResult
+        }
+        if (finalResult == initialResult) {
+            // if we didn't rewrite it, send all logs to the calling context.
+            logs.writeTo(context)
+        }
+        return finalResult
+    }
+}
+
+private class InternalQueryProcessor(
+    val context: Context,
+    val executableElement: ExecutableElement,
+    val containing: DeclaredType,
+    val dbVerifier: DatabaseVerifier? = null
+) {
+    fun processQuery(input: String?): QueryMethod {
         val delegate = MethodProcessorDelegate.createFor(context, containing, executableElement)
         val returnType = delegate.extractReturnType()
 
-        val annotation = executableElement.toAnnotationBox(Query::class)?.value
-        context.checker.check(annotation != null, executableElement,
-                ProcessorErrors.MISSING_QUERY_ANNOTATION)
-
-        val query = if (annotation != null) {
-            val query = SqlParser.parse(annotation.value)
-            context.checker.check(query.errors.isEmpty(), executableElement,
-                    query.errors.joinToString("\n"))
+        val query = if (input != null) {
+            val query = SqlParser.parse(input)
+            context.checker.check(
+                query.errors.isEmpty(), executableElement,
+                query.errors.joinToString("\n")
+            )
             validateQuery(query)
-            context.checker.check(returnType.kind != TypeKind.ERROR,
-                    executableElement, ProcessorErrors.CANNOT_RESOLVE_RETURN_TYPE,
-                    executableElement)
+            context.checker.check(
+                returnType.kind != TypeKind.ERROR,
+                executableElement, ProcessorErrors.CANNOT_RESOLVE_RETURN_TYPE,
+                executableElement
+            )
             query
         } else {
             ParsedQuery.MISSING
         }
 
         val returnTypeName = returnType.typeName()
-        context.checker.notUnbound(returnTypeName, executableElement,
-                ProcessorErrors.CANNOT_USE_UNBOUND_GENERICS_IN_QUERY_METHODS)
+        context.checker.notUnbound(
+            returnTypeName, executableElement,
+            ProcessorErrors.CANNOT_USE_UNBOUND_GENERICS_IN_QUERY_METHODS
+        )
 
         val isPreparedQuery = PREPARED_TYPES.contains(query.type)
         val queryMethod = if (isPreparedQuery) {
@@ -82,15 +143,6 @@
     }
 
     private fun processQueryMethod(queryMethod: QueryMethod): QueryMethod {
-        if (queryMethod is ReadQueryMethod) {
-            queryMethod.query.resultInfo?.let { resultInfo ->
-                val adapter = queryMethod.queryResultBinder.adapter?.rowAdapter
-                if (adapter is PojoRowAdapter) {
-                    adapter.verifyMapping(context, resultInfo)
-                }
-            }
-        }
-
         val missing = queryMethod.sectionToParamMapping
             .filter { it.second == null }
             .map { it.first.text }
@@ -134,7 +186,8 @@
         context.checker.check(
             resultBinder.adapter != null,
             executableElement,
-            ProcessorErrors.cannotFindPreparedQueryResultAdapter(returnType.toString(), query.type))
+            ProcessorErrors.cannotFindPreparedQueryResultAdapter(returnType.toString(), query.type)
+        )
 
         val parameters = delegate.extractQueryParams()
         return WriteQueryMethod(
@@ -143,7 +196,8 @@
             name = executableElement.simpleName.toString(),
             returnType = returnType,
             parameters = parameters,
-            preparedQueryResultBinder = resultBinder)
+            preparedQueryResultBinder = resultBinder
+        )
     }
 
     private fun getQueryMethod(
@@ -156,35 +210,31 @@
         context.checker.check(
             resultBinder.adapter != null,
             executableElement,
-            ProcessorErrors.cannotFindQueryResultAdapter(returnType.toString()))
+            ProcessorErrors.cannotFindQueryResultAdapter(returnType.toString())
+        )
 
         val inTransaction = executableElement.hasAnnotation(Transaction::class)
         if (query.type == QueryType.SELECT && !inTransaction) {
             // put a warning if it is has relations and not annotated w/ transaction
             if (rowAdapter is PojoRowAdapter && rowAdapter.relationCollectors.isNotEmpty()) {
-                context.logger.w(Warning.RELATION_QUERY_WITHOUT_TRANSACTION,
-                    executableElement, ProcessorErrors.TRANSACTION_MISSING_ON_RELATION)
+                context.logger.w(
+                    Warning.RELATION_QUERY_WITHOUT_TRANSACTION,
+                    executableElement, ProcessorErrors.TRANSACTION_MISSING_ON_RELATION
+                )
             }
         }
 
         val parameters = delegate.extractQueryParams()
-        // if we are mapping to a POJO, re-interpret it
-        val finalQuery = rowAdapter?.let {
-            context.queryRewriter?.rewrite(query, rowAdapter)
-        } ?: query
-        if (finalQuery != query) {
-            // re validate if query has changed
-            validateQuery(finalQuery)
-        }
 
         return ReadQueryMethod(
             element = executableElement,
-            query = finalQuery,
+            query = query,
             name = executableElement.simpleName.toString(),
             returnType = returnType,
             parameters = parameters,
             inTransaction = inTransaction,
-            queryResultBinder = resultBinder)
+            queryResultBinder = resultBinder
+        )
     }
 
     companion object {
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt b/room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
index c652658..862cb35 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
@@ -459,6 +459,7 @@
                     ).process()
                     PojoRowAdapter(
                             context = subContext,
+                            info = resultInfo,
                             pojo = pojo,
                             out = typeMirror)
                 }
@@ -477,6 +478,11 @@
                 }
             }
 
+            if (rowAdapter != null && rowAdapterLogs?.hasErrors() != true) {
+                rowAdapterLogs?.writeTo(context)
+                return rowAdapter
+            }
+
             if ((resultInfo?.columns?.size ?: 1) == 1) {
                 val singleColumn = findCursorValueReader(typeMirror,
                         resultInfo?.columns?.get(0)?.type)
@@ -486,7 +492,7 @@
             }
             // if we tried, return its errors
             if (rowAdapter != null) {
-                rowAdapterLogs?.writeTo(context.processingEnv)
+                rowAdapterLogs?.writeTo(context)
                 return rowAdapter
             }
             if (query.runtimeQueryPlaceholder) {
@@ -500,6 +506,7 @@
                 ).process()
                 return PojoRowAdapter(
                         context = context,
+                        info = null,
                         pojo = pojo,
                         out = typeMirror)
             }
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
index 1bd98e9..74d1a49 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
@@ -42,67 +42,65 @@
  */
 class PojoRowAdapter(
     context: Context,
+    private val info: QueryResultInfo?,
     val pojo: Pojo,
     out: TypeMirror
 ) : RowAdapter(out) {
+    val mapping: Mapping
+    val relationCollectors: List<RelationCollector>
 
-    var mapping = Mapping(
-        matchedFields = pojo.fields,
-        unusedColumns = emptyList(),
-        unusedFields = emptyList(),
-        verified = false
-    )
-        private set
+    init {
 
-    val relationCollectors: List<RelationCollector> =
-        RelationCollector.createCollectors(context, pojo.relations)
-
-    fun verifyMapping(context: Context, info: QueryResultInfo) {
         // toMutableList documentation is not clear if it copies so lets be safe.
         val remainingFields = pojo.fields.mapTo(mutableListOf(), { it })
         val unusedColumns = arrayListOf<String>()
         val matchedFields: List<Field>
-        matchedFields = info.columns.mapNotNull { column ->
-            // first check remaining, otherwise check any. maybe developer wants to map the same
-            // column into 2 fields. (if they want to post process etc)
-            val field = remainingFields.firstOrNull { it.columnName == column.name }
-                ?: pojo.findFieldByColumnName(column.name)
-            if (field == null) {
-                unusedColumns.add(column.name)
-                null
-            } else {
-                remainingFields.remove(field)
-                field
+        if (info != null) {
+            matchedFields = info.columns.mapNotNull { column ->
+                // first check remaining, otherwise check any. maybe developer wants to map the same
+                // column into 2 fields. (if they want to post process etc)
+                val field = remainingFields.firstOrNull { it.columnName == column.name }
+                    ?: pojo.findFieldByColumnName(column.name)
+                if (field == null) {
+                    unusedColumns.add(column.name)
+                    null
+                } else {
+                    remainingFields.remove(field)
+                    field
+                }
             }
-        }
-        if (unusedColumns.isNotEmpty() || remainingFields.isNotEmpty()) {
-            val warningMsg = ProcessorErrors.cursorPojoMismatch(
-                pojoTypeName = pojo.typeName,
-                unusedColumns = unusedColumns,
-                allColumns = info.columns.map { it.name },
-                unusedFields = remainingFields,
-                allFields = pojo.fields
-            )
-            context.logger.w(Warning.CURSOR_MISMATCH, null, warningMsg)
-        }
-        val nonNulls = remainingFields.filter { it.nonNull }
-        if (nonNulls.isNotEmpty()) {
-            context.logger.e(
-                ProcessorErrors.pojoMissingNonNull(
+            if (unusedColumns.isNotEmpty() || remainingFields.isNotEmpty()) {
+                val warningMsg = ProcessorErrors.cursorPojoMismatch(
                     pojoTypeName = pojo.typeName,
-                    missingPojoFields = nonNulls.map { it.name },
-                    allQueryColumns = info.columns.map { it.name })
-            )
+                    unusedColumns = unusedColumns,
+                    allColumns = info.columns.map { it.name },
+                    unusedFields = remainingFields,
+                    allFields = pojo.fields
+                )
+                context.logger.w(Warning.CURSOR_MISMATCH, null, warningMsg)
+            }
+            val nonNulls = remainingFields.filter { it.nonNull }
+            if (nonNulls.isNotEmpty()) {
+                context.logger.e(
+                    ProcessorErrors.pojoMissingNonNull(
+                        pojoTypeName = pojo.typeName,
+                        missingPojoFields = nonNulls.map { it.name },
+                        allQueryColumns = info.columns.map { it.name })
+                )
+            }
+            if (matchedFields.isEmpty()) {
+                context.logger.e(ProcessorErrors.cannotFindQueryResultAdapter(out.toString()))
+            }
+        } else {
+            matchedFields = remainingFields.map { it }
+            remainingFields.clear()
         }
-        if (matchedFields.isEmpty()) {
-            context.logger.e(ProcessorErrors.cannotFindQueryResultAdapter(out.toString()))
-        }
+        relationCollectors = RelationCollector.createCollectors(context, pojo.relations)
 
         mapping = Mapping(
             matchedFields = matchedFields,
             unusedColumns = unusedColumns,
-            unusedFields = remainingFields,
-            verified = true
+            unusedFields = remainingFields
         )
     }
 
@@ -120,13 +118,17 @@
     override fun onCursorReady(cursorVarName: String, scope: CodeGenScope) {
         mapping.fieldsWithIndices = mapping.matchedFields.map {
             val indexVar = scope.getTmpVar("_cursorIndexOf${it.name.stripNonJava().capitalize()}")
-            val indexMethod = if (mapping.verified) "getColumnIndexOrThrow" else "getColumnIndex"
+            val indexMethod = if (info == null) {
+                "getColumnIndex"
+            } else {
+                "getColumnIndexOrThrow"
+            }
             scope.builder().addStatement(
                 "final $T $L = $T.$L($L, $S)",
                 TypeName.INT, indexVar, RoomTypeNames.CURSOR_UTIL, indexMethod, cursorVarName,
                 it.columnName
             )
-            FieldWithIndex(field = it, indexVar = indexVar, alwaysExists = mapping.verified)
+            FieldWithIndex(field = it, indexVar = indexVar, alwaysExists = info != null)
         }
         if (relationCollectors.isNotEmpty()) {
             relationCollectors.forEach { it.writeInitCode(scope) }
@@ -159,8 +161,7 @@
     data class Mapping(
         val matchedFields: List<Field>,
         val unusedColumns: List<String>,
-        val unusedFields: List<Field>,
-        internal val verified: Boolean
+        val unusedFields: List<Field>
     ) {
         // set when cursor is ready.
         lateinit var fieldsWithIndices: List<FieldWithIndex>
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java
index 7f4a952..e8fa14e 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java
@@ -21,7 +21,6 @@
 import android.view.View;
 import android.widget.FrameLayout;
 
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import androidx.transition.ArcMotion;
 import androidx.transition.ChangeBounds;
 import androidx.transition.Transition;
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeColor.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeColor.java
index 19f6041..5bba2a1 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeColor.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeColor.java
@@ -16,9 +16,6 @@
 
 package com.example.android.support.transition.widget;
 
-import android.animation.Animator;
-import android.animation.ArgbEvaluator;
-import android.animation.ValueAnimator;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.view.View;
@@ -26,6 +23,9 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.ArgbEvaluator;
+import androidx.core.animation.ValueAnimator;
 import androidx.transition.Transition;
 import androidx.transition.TransitionValues;
 
@@ -64,8 +64,8 @@
     @Nullable
     @Override
     public Animator createAnimator(@NonNull ViewGroup sceneRoot,
-                                   @Nullable TransitionValues startValues,
-                                   @Nullable TransitionValues endValues) {
+            @Nullable TransitionValues startValues,
+            @Nullable TransitionValues endValues) {
         // This transition can only be applied to views that are on both starting and ending scenes.
         if (null == startValues || null == endValues) {
             return null;
@@ -91,13 +91,13 @@
                 // animation runs on the UI thread. The Evaluator controls what type of
                 // interpolation is done. In this case, an ArgbEvaluator interpolates between two
                 // #argb values, which are specified as the 2nd and 3rd input arguments.
-                ValueAnimator animator = ValueAnimator.ofObject(new ArgbEvaluator(),
+                ValueAnimator animator = ValueAnimator.ofObject(ArgbEvaluator.getInstance(),
                         startColor.getColor(), endColor.getColor());
                 // Add an update listener to the Animator object.
                 animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
                     @Override
-                    public void onAnimationUpdate(ValueAnimator animation) {
-                        Object value = animation.getAnimatedValue();
+                    public void onAnimationUpdate(@NonNull Animator animation) {
+                        Object value = ((ValueAnimator) animation).getAnimatedValue();
                         // Each time the ValueAnimator produces a new frame in the animation, change
                         // the background color of the target. Ensure that the value isn't null.
                         if (null != value) {
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java
index 6761f59..f3c94e0 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java
@@ -22,7 +22,6 @@
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import androidx.transition.ArcMotion;
 import androidx.transition.ChangeTransform;
 import androidx.transition.TransitionManager;
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FastOutSlowInInterpolator.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FastOutSlowInInterpolator.java
new file mode 100644
index 0000000..6cf5ba4
--- /dev/null
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FastOutSlowInInterpolator.java
@@ -0,0 +1,26 @@
+/*
+ * 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 com.example.android.support.transition.widget;
+
+import androidx.core.animation.PathInterpolator;
+
+class FastOutSlowInInterpolator extends PathInterpolator {
+
+    FastOutSlowInInterpolator() {
+        super(0.4f, 0f, 0.2f, 1f);
+    }
+}
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java
index fa7016a..1d6a8b0 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java
@@ -25,7 +25,6 @@
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import androidx.transition.AutoTransition;
 import androidx.transition.Fade;
 import androidx.transition.Transition;
diff --git a/serialization/serialization-annotation/build.gradle b/serialization/serialization-annotation/build.gradle
index c0e7b22..2a82495 100644
--- a/serialization/serialization-annotation/build.gradle
+++ b/serialization/serialization-annotation/build.gradle
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+
+import androidx.build.LibraryVersions
+
 import static androidx.build.dependencies.DependenciesKt.*
 
 import androidx.build.CompilationTarget
@@ -34,7 +37,8 @@
 
 androidx {
     name = "AndroidX Serialization - Annotation"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
+    mavenVersion = LibraryVersions.SERIALIZATION
     compilationTarget = CompilationTarget.HOST
     mavenGroup = LibraryGroups.SERIALIZATION
     inceptionYear = "2020"
diff --git a/serialization/serialization-compiler/build.gradle b/serialization/serialization-compiler/build.gradle
index 76b14b0..b98b81f 100644
--- a/serialization/serialization-compiler/build.gradle
+++ b/serialization/serialization-compiler/build.gradle
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+
+import androidx.build.LibraryVersions
+
 import static androidx.build.dependencies.DependenciesKt.*
 
 import androidx.build.CompilationTarget
@@ -54,7 +57,8 @@
 
 androidx {
     name = "AndroidX Serialization - Compiler"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
+    mavenVersion = LibraryVersions.SERIALIZATION
     toolingProject = true
     compilationTarget = CompilationTarget.HOST
     mavenGroup = LibraryGroups.SERIALIZATION
diff --git a/serialization/serialization-runtime-parcel/build.gradle b/serialization/serialization-runtime-parcel/build.gradle
index dbd72a5..db2225a 100644
--- a/serialization/serialization-runtime-parcel/build.gradle
+++ b/serialization/serialization-runtime-parcel/build.gradle
@@ -15,6 +15,7 @@
  */
 
 import androidx.build.LibraryGroups
+import androidx.build.LibraryVersions
 import androidx.build.Publish
 
 plugins {
@@ -37,7 +38,8 @@
 
 androidx {
     name = "AndroidX Serialization - Parcel Runtime"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
+    mavenVersion = LibraryVersions.SERIALIZATION
     mavenGroup = LibraryGroups.SERIALIZATION
     inceptionYear = "2020"
     description = "Parcel runtime for AndroidX Serialization"
diff --git a/serialization/serialization-runtime-proto/build.gradle b/serialization/serialization-runtime-proto/build.gradle
index 89d560f..4dc0f62 100644
--- a/serialization/serialization-runtime-proto/build.gradle
+++ b/serialization/serialization-runtime-proto/build.gradle
@@ -33,7 +33,8 @@
 
 androidx {
     name = "AndroidX Serialization - Protocol Buffers Runtime"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
+    mavenVersion = LibraryVersions.SERIALIZATION
     compilationTarget = CompilationTarget.HOST
     mavenGroup = LibraryGroups.SERIALIZATION
     inceptionYear = "2020"
diff --git a/serialization/serialization-runtime/build.gradle b/serialization/serialization-runtime/build.gradle
index eb680b4..d742b73 100644
--- a/serialization/serialization-runtime/build.gradle
+++ b/serialization/serialization-runtime/build.gradle
@@ -16,6 +16,7 @@
 
 import androidx.build.CompilationTarget
 import androidx.build.LibraryGroups
+import androidx.build.LibraryVersions
 import androidx.build.Publish
 
 import static androidx.build.dependencies.DependenciesKt.*
@@ -37,7 +38,8 @@
 
 androidx {
     name = "AndroidX Serialization - Runtime"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
+    mavenVersion = LibraryVersions.SERIALIZATION
     compilationTarget = CompilationTarget.HOST
     mavenGroup = LibraryGroups.SERIALIZATION
     inceptionYear = "2020"
diff --git a/serialization/serialization-schema/build.gradle b/serialization/serialization-schema/build.gradle
index b120115..eb35759 100644
--- a/serialization/serialization-schema/build.gradle
+++ b/serialization/serialization-schema/build.gradle
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+
+import androidx.build.LibraryVersions
+
 import static androidx.build.dependencies.DependenciesKt.*
 
 import androidx.build.CompilationTarget
@@ -37,7 +40,8 @@
 
 androidx {
     name = "AndroidX Serialization - Schema"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
+    mavenVersion = LibraryVersions.SERIALIZATION
     toolingProject = true
     compilationTarget = CompilationTarget.HOST
     mavenGroup = LibraryGroups.SERIALIZATION
diff --git a/serialization/serialization/build.gradle b/serialization/serialization/build.gradle
index 9ddc2fd7..9b18f7a 100644
--- a/serialization/serialization/build.gradle
+++ b/serialization/serialization/build.gradle
@@ -15,6 +15,7 @@
  */
 
 import androidx.build.LibraryGroups
+import androidx.build.LibraryVersions
 import androidx.build.Publish
 
 plugins {
@@ -40,7 +41,8 @@
 
 androidx {
     name = "AndroidX Serialization"
-    publish = Publish.NONE
+    publish = Publish.SNAPSHOT_AND_RELEASE
+    mavenVersion = LibraryVersions.SERIALIZATION
     mavenGroup = LibraryGroups.SERIALIZATION
     inceptionYear = "2020"
     description = "A lightweight serialization solution for AndroidX libraries"
diff --git a/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java b/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
index 2ffdb63..f84891b 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/ListBuilder.java
@@ -534,7 +534,7 @@
         private SliceAction mPrimaryAction;
         private CharSequence mContentDescription;
         private int mLayoutDirection = -1;
-        private int mMode = 0;
+        private int mMode = RANGE_MODE_DETERMINATE;
         private IconCompat mTitleIcon;
         private int mTitleImageMode;
         private boolean mTitleItemLoading;
@@ -542,7 +542,9 @@
         /**
          * Builder to construct a range row which can be added to a {@link ListBuilder}.
          * <p>
-         * A range row supports displaying a horizontal progress indicator.
+         * A range row supports displaying a horizontal progress indicator. It supports two modes
+         * to represent progress: determinate and indeterminate, see {@link #setMode(int)}.
+         * Determinate mode is the default for progress indicator.
          *
          * @see ListBuilder#addRange(RangeBuilder)
          */
diff --git a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java
index 99c8173..6d411ce 100644
--- a/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java
+++ b/slices/builders/src/main/java/androidx/slice/builders/impl/ListBuilderImpl.java
@@ -40,6 +40,7 @@
 import static androidx.annotation.RestrictTo.Scope.LIBRARY;
 import static androidx.slice.Slice.SUBTYPE_RANGE_MODE;
 import static androidx.slice.builders.ListBuilder.INFINITY;
+import static androidx.slice.builders.ListBuilder.RANGE_MODE_DETERMINATE;
 import static androidx.slice.core.SliceHints.SUBTYPE_MILLIS;
 import static androidx.slice.core.SliceHints.SUBTYPE_MIN;
 import static androidx.slice.core.SliceHints.SUBTYPE_SELECTION;
@@ -315,7 +316,7 @@
         protected CharSequence mContentDescr;
         protected SliceAction mPrimaryAction;
         protected int mLayoutDir = -1;
-        private int mMode = 0;
+        private int mMode = RANGE_MODE_DETERMINATE;
         private Slice mStartItem;
 
         RangeBuilderImpl(Slice.Builder sb, RangeBuilder builder) {
diff --git a/slices/core/src/main/res/values-es/strings.xml b/slices/core/src/main/res/values-es/strings.xml
index 690a226..44283aa 100644
--- a/slices/core/src/main/res/values-es/strings.xml
+++ b/slices/core/src/main/res/values-es/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="abc_slices_permission_request" msgid="3604847235923472451">"<xliff:g id="APP_0">%1$s</xliff:g> quiere mostrar fragmentos de <xliff:g id="APP_2">%2$s</xliff:g>"</string>
-    <string name="abc_slice_permission_title" msgid="4175332421259324948">"¿Quieres permitir que <xliff:g id="APP_0">%1$s</xliff:g> muestre fragmentos de <xliff:g id="APP_2">%2$s</xliff:g>?"</string>
+    <string name="abc_slice_permission_title" msgid="4175332421259324948">"¿Permitir que <xliff:g id="APP_0">%1$s</xliff:g> muestre fragmentos de <xliff:g id="APP_2">%2$s</xliff:g>?"</string>
     <string name="abc_slice_permission_text_1" msgid="4525743640399572811">"- Puede leer información de <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="abc_slice_permission_text_2" msgid="7323565634860251794">"- Puede realizar acciones en <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="abc_slice_permission_checkbox" msgid="5696872682700058611">"Permitir que <xliff:g id="APP">%1$s</xliff:g> muestre fragmentos de cualquier aplicación"</string>
diff --git a/slices/core/src/main/res/values-ne/strings.xml b/slices/core/src/main/res/values-ne/strings.xml
index c5c9de3..0244857 100644
--- a/slices/core/src/main/res/values-ne/strings.xml
+++ b/slices/core/src/main/res/values-ne/strings.xml
@@ -23,5 +23,5 @@
     <string name="abc_slice_permission_text_2" msgid="7323565634860251794">"- यसले <xliff:g id="APP">%1$s</xliff:g> भित्र कारबाही गर्न सक्छ"</string>
     <string name="abc_slice_permission_checkbox" msgid="5696872682700058611">"<xliff:g id="APP">%1$s</xliff:g> लाई सबै अनुप्रयोगका स्लाइसहरू देखाउन अनुमति दिनुहोस्"</string>
     <string name="abc_slice_permission_allow" msgid="5024599872061409708">"अनुमति दिनुहोस्"</string>
-    <string name="abc_slice_permission_deny" msgid="3819478292430407705">"अस्वीकार गर्नु…"</string>
+    <string name="abc_slice_permission_deny" msgid="3819478292430407705">"नदिने"</string>
 </resources>
diff --git a/slices/core/src/main/res/values-pt-rPT/strings.xml b/slices/core/src/main/res/values-pt-rPT/strings.xml
index ea2a008..7740b87 100644
--- a/slices/core/src/main/res/values-pt-rPT/strings.xml
+++ b/slices/core/src/main/res/values-pt-rPT/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="abc_slices_permission_request" msgid="3604847235923472451">"A aplicação <xliff:g id="APP_0">%1$s</xliff:g> pretende mostrar partes da aplicação <xliff:g id="APP_2">%2$s</xliff:g>."</string>
-    <string name="abc_slice_permission_title" msgid="4175332421259324948">"Pretende permitir que a aplicação <xliff:g id="APP_0">%1$s</xliff:g> mostre partes da aplicação <xliff:g id="APP_2">%2$s</xliff:g>?"</string>
+    <string name="abc_slice_permission_title" msgid="4175332421259324948">"Permitir que a aplicação <xliff:g id="APP_0">%1$s</xliff:g> mostre partes da aplicação <xliff:g id="APP_2">%2$s</xliff:g>?"</string>
     <string name="abc_slice_permission_text_1" msgid="4525743640399572811">"- Pode ler informações da aplicação <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="abc_slice_permission_text_2" msgid="7323565634860251794">"- Pode realizar ações na aplicação <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="abc_slice_permission_checkbox" msgid="5696872682700058611">"Permitir que a aplicação <xliff:g id="APP">%1$s</xliff:g> mostre partes de qualquer aplicação"</string>
diff --git a/slices/view/src/main/res/values-da/strings.xml b/slices/view/src/main/res/values-da/strings.xml
index c7c2850..4cd3d27 100644
--- a/slices/view/src/main/res/values-da/strings.xml
+++ b/slices/view/src/main/res/values-da/strings.xml
@@ -22,8 +22,8 @@
     <string name="abc_slice_show_more" msgid="1567717014004692768">"Se mere"</string>
     <string name="abc_slice_updated" msgid="8155085405396453848">"Opdateret <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <plurals name="abc_slice_duration_min" formatted="false" msgid="6996334305156847955">
-      <item quantity="one">for <xliff:g id="ID_2">%d</xliff:g> min. siden</item>
-      <item quantity="other">for <xliff:g id="ID_2">%d</xliff:g> min. siden</item>
+      <item quantity="one"><xliff:g id="ID_2">%d</xliff:g> min. siden</item>
+      <item quantity="other"><xliff:g id="ID_2">%d</xliff:g> min. siden</item>
     </plurals>
     <plurals name="abc_slice_duration_years" formatted="false" msgid="6212691832333991589">
       <item quantity="one">for <xliff:g id="ID_2">%d</xliff:g> år siden</item>
diff --git a/slices/view/src/main/res/values-sq/strings.xml b/slices/view/src/main/res/values-sq/strings.xml
index 0359c86..aeb84d0 100644
--- a/slices/view/src/main/res/values-sq/strings.xml
+++ b/slices/view/src/main/res/values-sq/strings.xml
@@ -22,8 +22,8 @@
     <string name="abc_slice_show_more" msgid="1567717014004692768">"Shfaq më shumë"</string>
     <string name="abc_slice_updated" msgid="8155085405396453848">"Përditësuar <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <plurals name="abc_slice_duration_min" formatted="false" msgid="6996334305156847955">
-      <item quantity="other"><xliff:g id="ID_2">%d</xliff:g> minuta më parë</item>
-      <item quantity="one"><xliff:g id="ID_1">%d</xliff:g> minutë më parë</item>
+      <item quantity="other"><xliff:g id="ID_2">%d</xliff:g> min më parë</item>
+      <item quantity="one"><xliff:g id="ID_1">%d</xliff:g> min më parë</item>
     </plurals>
     <plurals name="abc_slice_duration_years" formatted="false" msgid="6212691832333991589">
       <item quantity="other"><xliff:g id="ID_2">%d</xliff:g> vite më parë</item>
diff --git a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/DatabaseExtensions.kt b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/DatabaseExtensions.kt
index 3b3d06b..6c536f0 100644
--- a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/DatabaseExtensions.kt
+++ b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/DatabaseExtensions.kt
@@ -25,6 +25,10 @@
 
 fun SQLiteDatabase.addTable(table: Table) = execSQL(table.toCreateString())
 
+val SQLiteDatabase.displayName: String
+    get() = if (path != ":memory:") path else
+        ":memory: {hashcode=0x${String.format("%x", this.hashCode())}}"
+
 fun SQLiteDatabase.insertValues(table: Table, vararg values: String) {
     assertThat(values).isNotEmpty()
     assertThat(values).hasLength(table.columns.size)
@@ -59,11 +63,11 @@
             .joinToString(prefix = ",PRIMARY KEY(", postfix = ")") { it.name }
 
     return columns.joinToString(
-        prefix = "CREATE TABLE $name (",
-        postfix = "$primaryKeyPart );"
+        prefix = "CREATE ${if (isView) "VIEW" else "TABLE"} $name (",
+        postfix = "$primaryKeyPart )${if (isView) " AS $viewQuery" else ""};"
     ) {
-        "${it.name} " +
-                "${it.type} " +
+        it.name +
+                "${if (isView) "" else " ${it.type}"} " +
                 (if (it.isNotNull) "NOT NULL " else "") +
                 (if (it.isUnique) "UNIQUE " else "")
     }
diff --git a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/GetSchemaTest.kt b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/GetSchemaTest.kt
index d27b9c9..aa6a260 100644
--- a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/GetSchemaTest.kt
+++ b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/GetSchemaTest.kt
@@ -126,6 +126,39 @@
     }
 
     @Test
+    fun test_get_schema_views() {
+        val c1 = Column("c1", "INT")
+        val c2 = Column("c2", "INT")
+        val c3 = Column("c3", "INT")
+        test_get_schema(
+            listOf(
+                Database(
+                    "db1",
+                    Table("t1", c1, c2),
+                    Table("t2", c1, c2, c3),
+                    Table(
+                        "v1", listOf(c1, c2), isView = true,
+                        viewQuery = "select t1.c1, t2.c2 from t1 inner join t2 on t1.c1 = t2.c2"
+                    )
+                )
+            )
+        )
+    }
+
+    @Test
+    fun test_get_schema_auto_increment() = runBlocking {
+        val databaseId = testEnvironment.inspectDatabase(
+            Database("db1").createInstance(temporaryFolder).also {
+                it.execSQL("CREATE TABLE t1 (c2 INTEGER PRIMARY KEY AUTOINCREMENT)")
+                it.execSQL("INSERT INTO t1 VALUES(3)")
+            })
+        testEnvironment.sendCommand(createGetSchemaCommand(databaseId)).let { response ->
+            val tableNames = response.getSchema.tablesList.map { it.name }
+            assertThat(tableNames).isEqualTo(listOf("t1"))
+        }
+    }
+
+    @Test
     fun test_get_schema_wrong_database_id() = runBlocking {
         val databaseId = 123456789
         testEnvironment.sendCommand(createGetSchemaCommand(databaseId)).let { response ->
@@ -168,6 +201,7 @@
                     .zipSameSize(actualTables)
                     .forEach { (expectedTable, actualTable) ->
                         assertThat(actualTable.name).isEqualTo(expectedTable.name)
+                        assertThat(actualTable.isView).isEqualTo(expectedTable.isView)
 
                         val expectedColumns = expectedTable.columns.sortedBy { it.name }
                         val actualColumns = actualTable.columnsList.sortedBy { it.name }
diff --git a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/Model.kt b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/Model.kt
index fb46d79..cdf7a8d 100644
--- a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/Model.kt
+++ b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/Model.kt
@@ -20,7 +20,12 @@
     constructor(name: String?, vararg tables: Table) : this(name, tables.toList())
 }
 
-data class Table(val name: String, val columns: List<Column>) {
+data class Table(
+    val name: String,
+    val columns: List<Column>,
+    val isView: Boolean = false, // true for a view, false for a regular table
+    val viewQuery: String = "" // only relevant if isView = true
+) {
     constructor(name: String, vararg columns: Column) : this(name, columns.toList())
 }
 
diff --git a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/QueryTest.kt b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/QueryTest.kt
index 4c9f6c9..fe8be48 100644
--- a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/QueryTest.kt
+++ b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/QueryTest.kt
@@ -542,7 +542,7 @@
             )
         )
         testEnvironment.sendCommand(createTrackDatabasesCommand())
-        return testEnvironment.awaitDatabaseOpenedEvent(databaseInstance.path).databaseId
+        return testEnvironment.awaitDatabaseOpenedEvent(databaseInstance.displayName).databaseId
     }
 
     private suspend fun issueQuery(
diff --git a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/SqliteInspectorTestEnvironment.kt b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/SqliteInspectorTestEnvironment.kt
index f53f32f..f3ba436 100644
--- a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/SqliteInspectorTestEnvironment.kt
+++ b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/SqliteInspectorTestEnvironment.kt
@@ -109,7 +109,7 @@
 ): Int {
     registerAlreadyOpenDatabases(listOf(databaseInstance))
     sendCommand(MessageFactory.createTrackDatabasesCommand())
-    return awaitDatabaseOpenedEvent(databaseInstance.path).databaseId
+    return awaitDatabaseOpenedEvent(databaseInstance.displayName).databaseId
 }
 
 /**
diff --git a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/TrackDatabasesTest.kt b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/TrackDatabasesTest.kt
index 77ec1e2..218323a 100644
--- a/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/TrackDatabasesTest.kt
+++ b/sqlite/sqlite-inspection/src/androidTest/java/androidx/sqlite/inspection/test/TrackDatabasesTest.kt
@@ -72,7 +72,7 @@
             testEnvironment.assertNoQueuedEvents()
             assertThat(actual.map { it.databaseId }.distinct()).hasSize(expected.size)
             expected.forEachIndexed { ix, _ ->
-                assertThat(actual[ix].path).isEqualTo(expected[ix].path)
+                assertThat(actual[ix].path).isEqualTo(expected[ix].displayName)
             }
         }
 
@@ -95,7 +95,7 @@
                 val database = Database("db3_$ix").createInstance(temporaryFolder)
                 assertThat(exitHook.onExit(database)).isSameInstanceAs(database)
                 testEnvironment.receiveEvent().let { event ->
-                    assertThat(event.databaseOpened.path).isEqualTo(database.path)
+                    assertThat(event.databaseOpened.path).isEqualTo(database.displayName)
                 }
             }
 
@@ -117,7 +117,7 @@
             assertThat(event.hasDatabaseOpened()).isEqualTo(true)
             val isNewId = seenDbIds.add(event.databaseOpened.databaseId)
             assertThat(isNewId).isEqualTo(true)
-            assertThat(event.databaseOpened.path).isEqualTo(database.path)
+            assertThat(event.databaseOpened.path).isEqualTo(database.displayName)
         }
 
         // file based db: first open
diff --git a/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/RequestCollapsingThrottler.java b/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/RequestCollapsingThrottler.java
index a1d5d4b..b6152e0 100644
--- a/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/RequestCollapsingThrottler.java
+++ b/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/RequestCollapsingThrottler.java
@@ -44,8 +44,8 @@
     @GuardedBy("mLock") private long mLastSubmitted = NEVER;
 
     RequestCollapsingThrottler(long minIntervalMs, Runnable action) {
-        // TODO: ensure Thread names meet Android Studio requirements
-        mExecutor = Executors.newSingleThreadScheduledExecutor();
+        mExecutor = Executors.newSingleThreadScheduledExecutor(
+                SqliteInspectionExecutors.threadFactory());
         mAction = action;
         mMinIntervalMs = minIntervalMs;
     }
diff --git a/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspectionExecutors.java b/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspectionExecutors.java
index 2636e32..7868582 100644
--- a/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspectionExecutors.java
+++ b/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspectionExecutors.java
@@ -18,9 +18,12 @@
 
 import androidx.annotation.NonNull;
 
+import java.util.Locale;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicLong;
 
 class SqliteInspectionExecutors {
 
@@ -35,10 +38,33 @@
         }
     }
 
+    private static final ThreadFactory sThreadFactory = new ThreadFactory() {
+        AtomicLong mNextId = new AtomicLong(0);
+
+        @Override
+        public Thread newThread(@NonNull Runnable target) {
+            Thread thread = new Thread(target, generateThreadName());
+            thread.setDaemon(true); // Don't prevent JVM from exiting
+            return thread;
+        }
+
+        private String generateThreadName() {
+            return String.format(Locale.ROOT, "Studio: SqliteInspector thread-%d",
+                    mNextId.getAndIncrement());
+        }
+    };
+
     static Executor directExecutor() {
         return DirectExecutor.INSTANCE;
     }
 
+    /**
+     * Thread factory satisfying required thread naming conventions.
+     */
+    static ThreadFactory threadFactory() {
+        return sThreadFactory;
+    }
+
     static Future<Void> submit(Executor executor, Runnable runnable) {
         FutureTask<Void> task = new FutureTask<>(runnable, null);
         executor.execute(task);
diff --git a/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspector.java b/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspector.java
index 5ded939..0d6e753c 100644
--- a/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspector.java
+++ b/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspector.java
@@ -98,6 +98,12 @@
             "executeInsert()J",
             "executeUpdateDelete()I");
 
+    private static final String sInMemoryDatabasePath = ":memory:";
+
+    /** Placeholder {@code %x} is for database's hashcode */
+    private static final String sInMemoryDatabaseNameFormat =
+            sInMemoryDatabasePath + " {hashcode=0x%x}";
+
     private static final int INVALIDATION_MIN_INTERVAL_MS = 1000;
 
     // Note: this only works on API26+ because of pragma_* functions
@@ -132,12 +138,11 @@
             + "  )\n"
             + "    as tci  -- tableName|columnName|unique : unique=1 and countOfColumnsInIndex=1\n"
             + "  on tci.tableName = m.name and tci.columnName = ti.name\n"
-            + "where m.type in ('table')\n"
+            + "where m.type in ('table', 'view')\n"
             + "order by type, tableName, ti.cid  -- cid = columnId";
 
-    // TODO: decide if to expose the 'android_metadata' table
-    private static final Set<String> sHiddenTables = new HashSet<>(Collections.singletonList(
-            "android_metadata"));
+    private static final Set<String> sHiddenTables = new HashSet<>(Arrays.asList(
+            "android_metadata", "sqlite_sequence"));
 
     private final DatabaseRegistry mDatabaseRegistry = new DatabaseRegistry();
     private final InspectorEnvironment mEnvironment;
@@ -474,6 +479,7 @@
             cursor = rawQuery(database, sQueryTableInfo, new String[0], null);
             GetSchemaResponse.Builder schemaBuilder = GetSchemaResponse.newBuilder();
 
+            int objectTypeIx = cursor.getColumnIndex("type"); // view or table
             int tableNameIx = cursor.getColumnIndex("tableName");
             int columnNameIx = cursor.getColumnIndex("columnName");
             int typeIx = cursor.getColumnIndex("columnType");
@@ -497,6 +503,7 @@
                     }
                     tableBuilder = Table.newBuilder();
                     tableBuilder.setName(tableName);
+                    tableBuilder.setIsView("view".equalsIgnoreCase(cursor.getString(objectTypeIx)));
                 }
 
                 // append column information to the current table info
@@ -531,12 +538,21 @@
         // TODO: replace with db open/closed tracking as this will keep the database open
         database.acquireReference();
 
-        String path = database.getPath();
-        response = createDatabaseOpenedEvent(id, path);
+        response = createDatabaseOpenedEvent(id, generateDatabaseName(database));
         mRoomInvalidationRegistry.invalidateCache();
         getConnection().sendEvent(response.toByteArray());
     }
 
+    private static String generateDatabaseName(@NonNull SQLiteDatabase database) {
+        return isInMemoryDatabase(database)
+                ? String.format(sInMemoryDatabaseNameFormat, database.hashCode())
+                : database.getPath();
+    }
+
+    private static boolean isInMemoryDatabase(@NonNull SQLiteDatabase database) {
+        return Objects.equals(sInMemoryDatabasePath, database.getPath());
+    }
+
     private Event createDatabaseOpenedEvent(int id, String path) {
         return Event.newBuilder().setDatabaseOpened(
                 DatabaseOpenedEvent.newBuilder()
@@ -600,7 +616,6 @@
     }
 
     static class DatabaseRegistry {
-        private static final String IN_MEMORY_DB_PATH = ":memory:";
         static final int ALREADY_TRACKED = -1;
 
         private final Object mLock = new Object();
@@ -628,9 +643,8 @@
                         return ALREADY_TRACKED;
                     }
                     // Path already tracked (and not an in-memory database)
-                    final String path = database.getPath();
-                    if (!Objects.equals(IN_MEMORY_DB_PATH, path)
-                            && Objects.equals(path, entry.getValue().getPath())) {
+                    if (!isInMemoryDatabase(database)
+                            && Objects.equals(database.getPath(), entry.getValue().getPath())) {
                         return ALREADY_TRACKED;
                     }
                 }
diff --git a/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspectorFactory.java b/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspectorFactory.java
index 07b0069..c2b5dd7 100644
--- a/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspectorFactory.java
+++ b/sqlite/sqlite-inspection/src/main/java/androidx/sqlite/inspection/SqliteInspectorFactory.java
@@ -40,7 +40,7 @@
 
     @SuppressWarnings("unused") // called by ServiceLoader
     public SqliteInspectorFactory() {
-        this(Executors.newCachedThreadPool());
+        this(Executors.newCachedThreadPool(SqliteInspectionExecutors.threadFactory()));
     }
 
     @NonNull
diff --git a/sqlite/sqlite-inspection/src/main/proto/live_sql_protocol.proto b/sqlite/sqlite-inspection/src/main/proto/live_sql_protocol.proto
index 4d7aa6f..fed6e16 100644
--- a/sqlite/sqlite-inspection/src/main/proto/live_sql_protocol.proto
+++ b/sqlite/sqlite-inspection/src/main/proto/live_sql_protocol.proto
@@ -87,10 +87,12 @@
   repeated Table tables = 1;
 }
 
-// Schema information for a table.
+// Schema information for a table or a view.
 message Table {
   string name = 1;
-  repeated Column columns = 2;
+  // True for a view; false for a regular table.
+  bool is_view = 2;
+  repeated Column columns = 3;
 }
 
 // Schema information for a table column.
diff --git a/textclassifier/textclassifier/src/main/res/values-af/strings.xml b/textclassifier/textclassifier/src/main/res/values-af/strings.xml
index 5811361..9bfe885 100644
--- a/textclassifier/textclassifier/src/main/res/values-af/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-af/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"E-pos"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Stuur e-pos aan gekose adres"</string>
-    <string name="dial" msgid="7317293545368448453">"Bel"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Bel gekose foonnommer"</string>
-    <string name="browse" msgid="3733970143542020945">"Maak oop"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Maak gekose URL oop"</string>
-    <string name="sms" msgid="5495416906312064886">"SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Stuur SMS aan gekose foonnommer"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Voeg by"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Voeg by kontakte"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Nog opsies"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Maak oorloop toe"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Deel"</string>
+    <string name="email" msgid="6099716515489216517">"E-pos"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Stuur e-pos aan gekose adres"</string>
+    <string name="dial" msgid="2101464860090311277">"Bel"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Bel gekose foonnommer"</string>
+    <string name="browse" msgid="4753676368851695348">"Maak oop"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Maak gekose URL oop"</string>
+    <string name="sms" msgid="2214738262605167054">"SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Stuur SMS aan gekose foonnommer"</string>
+    <string name="add_contact" msgid="386263007484061034">"Voeg by"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Voeg by kontakte"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Nog opsies"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Maak oorloop toe"</string>
+    <string name="abc_share" msgid="37557693057519685">"Deel"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-am/strings.xml b/textclassifier/textclassifier/src/main/res/values-am/strings.xml
index 831ac2b..ad9a475 100644
--- a/textclassifier/textclassifier/src/main/res/values-am/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-am/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ኢሜይል"</string>
-    <string name="email_desc" msgid="6941280589171810022">"ለተመረጡ አድራሻዎች ኢሜይል ላክ"</string>
-    <string name="dial" msgid="7317293545368448453">"ደውል"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"ወደ ተመረጠው ስልክ ቁጥር ደውል"</string>
-    <string name="browse" msgid="3733970143542020945">"ክፈት"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"የተመረጠውን ዩአርኤል ክፈት"</string>
-    <string name="sms" msgid="5495416906312064886">"መልዕክት"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"ለተመረጠው ስልክ ቁጥር መልዕክት ላክ"</string>
-    <string name="add_contact" msgid="9005634177208282449">"አክል"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"ወደ እውቂያዎች አክል"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"ተጨማሪ አማራጮች"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ትርፍ ፍሰትን ዝጋ"</string>
-    <string name="abc_share" msgid="7091841667818715717">"አጋራ"</string>
+    <string name="email" msgid="6099716515489216517">"ኢሜይል"</string>
+    <string name="email_desc" msgid="2189760120923982860">"ለተመረጡ አድራሻዎች ኢሜይል ላክ"</string>
+    <string name="dial" msgid="2101464860090311277">"ደውል"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"ወደ ተመረጠው ስልክ ቁጥር ደውል"</string>
+    <string name="browse" msgid="4753676368851695348">"ክፈት"</string>
+    <string name="browse_desc" msgid="728882176434276995">"የተመረጠውን ዩአርኤል ክፈት"</string>
+    <string name="sms" msgid="2214738262605167054">"መልዕክት"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"ለተመረጠው ስልክ ቁጥር መልዕክት ላክ"</string>
+    <string name="add_contact" msgid="386263007484061034">"አክል"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"ወደ እውቂያዎች አክል"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"ተጨማሪ አማራጮች"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ትርፍ ፍሰትን ዝጋ"</string>
+    <string name="abc_share" msgid="37557693057519685">"አጋራ"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ar/strings.xml b/textclassifier/textclassifier/src/main/res/values-ar/strings.xml
index 52fb7d7..a17b6b0f 100644
--- a/textclassifier/textclassifier/src/main/res/values-ar/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ar/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"إرسال بريد إلكتروني"</string>
-    <string name="email_desc" msgid="6941280589171810022">"مراسلة العنوان المحدد عبر البريد الإلكتروني"</string>
-    <string name="dial" msgid="7317293545368448453">"اتصال"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"الاتصال برقم الهاتف المحدد"</string>
-    <string name="browse" msgid="3733970143542020945">"فتح"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"‏فتح عنوان URL المحدد"</string>
-    <string name="sms" msgid="5495416906312064886">"إرسال رسائل قصيرة"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"مراسلة رقم الهاتف المحدد"</string>
-    <string name="add_contact" msgid="9005634177208282449">"إضافة"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"إضافة إلى جهات الاتصال"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"خيارات أكثر"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"إغلاق التجاوز"</string>
-    <string name="abc_share" msgid="7091841667818715717">"مشاركة"</string>
+    <string name="email" msgid="6099716515489216517">"إرسال بريد إلكتروني"</string>
+    <string name="email_desc" msgid="2189760120923982860">"مراسلة العنوان المحدد عبر البريد الإلكتروني"</string>
+    <string name="dial" msgid="2101464860090311277">"اتصال"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"الاتصال برقم الهاتف المحدد"</string>
+    <string name="browse" msgid="4753676368851695348">"فتح"</string>
+    <string name="browse_desc" msgid="728882176434276995">"‏فتح عنوان URL المحدد"</string>
+    <string name="sms" msgid="2214738262605167054">"إرسال رسائل قصيرة"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"مراسلة رقم الهاتف المحدد"</string>
+    <string name="add_contact" msgid="386263007484061034">"إضافة"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"إضافة إلى جهات الاتصال"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"خيارات أكثر"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"إغلاق التجاوز"</string>
+    <string name="abc_share" msgid="37557693057519685">"مشاركة"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-as/strings.xml b/textclassifier/textclassifier/src/main/res/values-as/strings.xml
index 7f52871..61f7fa2 100644
--- a/textclassifier/textclassifier/src/main/res/values-as/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-as/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ইমেইল কৰক"</string>
-    <string name="email_desc" msgid="6941280589171810022">"বাছনি কৰা ঠিকনালৈ ইমেইল পঠিয়াওক"</string>
-    <string name="dial" msgid="7317293545368448453">"কল কৰক"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"বাছনি কৰা ফ\'ন নম্বৰত কল কৰক"</string>
-    <string name="browse" msgid="3733970143542020945">"খোলক"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"বাছনি কৰা URL খোলক"</string>
-    <string name="sms" msgid="5495416906312064886">"বাৰ্তা পঠিয়াওক"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"বাছনি কৰা ফ’ন নম্বৰলৈ বাৰ্তা পঠিয়াওক"</string>
-    <string name="add_contact" msgid="9005634177208282449">"যোগ কৰক"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"সর্ম্পকসূচীত যোগ কৰক"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"অধিক বিকল্প"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"অভাৰফ্ল\' বন্ধ কৰক"</string>
-    <string name="abc_share" msgid="7091841667818715717">"শ্বেয়াৰ কৰক"</string>
+    <string name="email" msgid="6099716515489216517">"ইমেইল কৰক"</string>
+    <string name="email_desc" msgid="2189760120923982860">"বাছনি কৰা ঠিকনালৈ ইমেইল পঠিয়াওক"</string>
+    <string name="dial" msgid="2101464860090311277">"কল কৰক"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"বাছনি কৰা ফ\'ন নম্বৰত কল কৰক"</string>
+    <string name="browse" msgid="4753676368851695348">"খোলক"</string>
+    <string name="browse_desc" msgid="728882176434276995">"বাছনি কৰা URL খোলক"</string>
+    <string name="sms" msgid="2214738262605167054">"বাৰ্তা পঠিয়াওক"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"বাছনি কৰা ফ’ন নম্বৰলৈ বাৰ্তা পঠিয়াওক"</string>
+    <string name="add_contact" msgid="386263007484061034">"যোগ কৰক"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"সর্ম্পকসূচীত যোগ কৰক"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"অধিক বিকল্প"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"অভাৰফ্ল\' বন্ধ কৰক"</string>
+    <string name="abc_share" msgid="37557693057519685">"শ্বেয়াৰ কৰক"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-az/strings.xml b/textclassifier/textclassifier/src/main/res/values-az/strings.xml
index b8de8f8..a11b541 100644
--- a/textclassifier/textclassifier/src/main/res/values-az/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-az/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"E-poçt yazın"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Seçilmiş ünvana e-məktub yazın"</string>
-    <string name="dial" msgid="7317293545368448453">"Zəng edin"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Seçilmiş telefon nömrəsinə zəng edin"</string>
-    <string name="browse" msgid="3733970143542020945">"Açın"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Seçilmiş linki açın"</string>
-    <string name="sms" msgid="5495416906312064886">"Mesaj yazın"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Seçilmiş telefon nömrəsinə mesaj göndərin"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Əlavə edin"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Kontakta əlavə edin"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Digər seçimlər"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Paneli bağlayın"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Paylaşın"</string>
+    <string name="email" msgid="6099716515489216517">"E-poçt yazın"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Seçilmiş ünvana e-məktub yazın"</string>
+    <string name="dial" msgid="2101464860090311277">"Zəng edin"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Seçilmiş telefon nömrəsinə zəng edin"</string>
+    <string name="browse" msgid="4753676368851695348">"Açın"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Seçilmiş linki açın"</string>
+    <string name="sms" msgid="2214738262605167054">"Mesaj yazın"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Seçilmiş telefon nömrəsinə mesaj göndərin"</string>
+    <string name="add_contact" msgid="386263007484061034">"Əlavə edin"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Kontakta əlavə edin"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Digər seçimlər"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Paneli bağlayın"</string>
+    <string name="abc_share" msgid="37557693057519685">"Paylaşın"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-b+sr+Latn/strings.xml b/textclassifier/textclassifier/src/main/res/values-b+sr+Latn/strings.xml
index 1b125bd..c8f70e2 100644
--- a/textclassifier/textclassifier/src/main/res/values-b+sr+Latn/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-b+sr+Latn/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Pošalji imejl"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Pošaljite imejl na izabranu adresu"</string>
-    <string name="dial" msgid="7317293545368448453">"Pozovi"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Pozovite izabrani broj telefona"</string>
-    <string name="browse" msgid="3733970143542020945">"Otvori"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Otvorite izabrani URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Pošalji SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Pošaljite SMS na izabrani broj telefona"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Dodaj"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Dodajte u kontakte"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Još opcija"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Zatvorite preklopni meni"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Deli"</string>
+    <string name="email" msgid="6099716515489216517">"Pošalji imejl"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Pošaljite imejl na izabranu adresu"</string>
+    <string name="dial" msgid="2101464860090311277">"Pozovi"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Pozovite izabrani broj telefona"</string>
+    <string name="browse" msgid="4753676368851695348">"Otvori"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Otvorite izabrani URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Pošalji SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Pošaljite SMS na izabrani broj telefona"</string>
+    <string name="add_contact" msgid="386263007484061034">"Dodaj"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Dodajte u kontakte"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Još opcija"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Zatvorite preklopni meni"</string>
+    <string name="abc_share" msgid="37557693057519685">"Deli"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-be/strings.xml b/textclassifier/textclassifier/src/main/res/values-be/strings.xml
index edb39a5..7b4953d 100644
--- a/textclassifier/textclassifier/src/main/res/values-be/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-be/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Адправіць электронны ліст"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Адправіць электронны ліст на выбраны адрас"</string>
-    <string name="dial" msgid="7317293545368448453">"Выклікаць"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Пазваніць па выбраным нумары тэлефона"</string>
-    <string name="browse" msgid="3733970143542020945">"Адкрыць"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Адкрыць выбраны URL-адрас"</string>
-    <string name="sms" msgid="5495416906312064886">"Даслаць паведамленне"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Адправіць паведамленне на выбраны нумар тэлефона"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Дадаць"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Дадаць у кантакты"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Дадатковыя параметры"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Закрыць пашырэнне"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Абагуліць"</string>
+    <string name="email" msgid="6099716515489216517">"Адправіць электронны ліст"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Адправіць электронны ліст на выбраны адрас"</string>
+    <string name="dial" msgid="2101464860090311277">"Выклікаць"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Пазваніць па выбраным нумары тэлефона"</string>
+    <string name="browse" msgid="4753676368851695348">"Адкрыць"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Адкрыць выбраны URL-адрас"</string>
+    <string name="sms" msgid="2214738262605167054">"Даслаць паведамленне"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Адправіць паведамленне на выбраны нумар тэлефона"</string>
+    <string name="add_contact" msgid="386263007484061034">"Дадаць"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Дадаць у кантакты"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Дадатковыя параметры"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Закрыць пашырэнне"</string>
+    <string name="abc_share" msgid="37557693057519685">"Абагуліць"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-bg/strings.xml b/textclassifier/textclassifier/src/main/res/values-bg/strings.xml
index deac559..2f22081 100644
--- a/textclassifier/textclassifier/src/main/res/values-bg/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-bg/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Изпращане на имейл"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Изпращане на имейл до избрания адрес"</string>
-    <string name="dial" msgid="7317293545368448453">"Обаждане"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Обаждане на избрания телефонен номер"</string>
-    <string name="browse" msgid="3733970143542020945">"Отваряне"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Отваряне на избрания URL адрес"</string>
-    <string name="sms" msgid="5495416906312064886">"Съобщение"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Изпращане на съобщение до избрания телефонен номер"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Добавяне"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Добавяне към контактите"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Още опции"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Затваряне на менюто при препълване"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Споделяне"</string>
+    <string name="email" msgid="6099716515489216517">"Изпращане на имейл"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Изпращане на имейл до избрания адрес"</string>
+    <string name="dial" msgid="2101464860090311277">"Обаждане"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Обаждане на избрания телефонен номер"</string>
+    <string name="browse" msgid="4753676368851695348">"Отваряне"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Отваряне на избрания URL адрес"</string>
+    <string name="sms" msgid="2214738262605167054">"Съобщение"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Изпращане на съобщение до избрания телефонен номер"</string>
+    <string name="add_contact" msgid="386263007484061034">"Добавяне"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Добавяне към контактите"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Още опции"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Затваряне на менюто при препълване"</string>
+    <string name="abc_share" msgid="37557693057519685">"Споделяне"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-bn/strings.xml b/textclassifier/textclassifier/src/main/res/values-bn/strings.xml
index 59540a2..7152c29 100644
--- a/textclassifier/textclassifier/src/main/res/values-bn/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-bn/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ইমেল করুন"</string>
-    <string name="email_desc" msgid="6941280589171810022">"বেছে নেওয়া আইডিতে ইমেল করুন"</string>
-    <string name="dial" msgid="7317293545368448453">"কল করুন"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"বেছে নেওয়া ফোন নম্বরে কল করুন"</string>
-    <string name="browse" msgid="3733970143542020945">"খুলুন"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"বেছে নেওয়া ইউআরএল খুলুন"</string>
-    <string name="sms" msgid="5495416906312064886">"মেসেজ করুন"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"বেছে নেওয়া ফোন নম্বরে মেসেজ করুন"</string>
-    <string name="add_contact" msgid="9005634177208282449">"যোগ করুন"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"পরিচিতিতে যোগ করুন"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"আরও বিকল্প"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ওভারফ্লো বন্ধ করুন"</string>
-    <string name="abc_share" msgid="7091841667818715717">"শেয়ার করুন"</string>
+    <string name="email" msgid="6099716515489216517">"ইমেল করুন"</string>
+    <string name="email_desc" msgid="2189760120923982860">"বেছে নেওয়া আইডিতে ইমেল করুন"</string>
+    <string name="dial" msgid="2101464860090311277">"কল করুন"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"বেছে নেওয়া ফোন নম্বরে কল করুন"</string>
+    <string name="browse" msgid="4753676368851695348">"খুলুন"</string>
+    <string name="browse_desc" msgid="728882176434276995">"বেছে নেওয়া ইউআরএল খুলুন"</string>
+    <string name="sms" msgid="2214738262605167054">"মেসেজ করুন"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"বেছে নেওয়া ফোন নম্বরে মেসেজ করুন"</string>
+    <string name="add_contact" msgid="386263007484061034">"যোগ করুন"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"পরিচিতিতে যোগ করুন"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"আরও বিকল্প"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ওভারফ্লো বন্ধ করুন"</string>
+    <string name="abc_share" msgid="37557693057519685">"শেয়ার করুন"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-bs/strings.xml b/textclassifier/textclassifier/src/main/res/values-bs/strings.xml
index 0ad050a..56d70be 100644
--- a/textclassifier/textclassifier/src/main/res/values-bs/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-bs/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Pošalji e-poruku"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Pošalji e-poruku na odabranu adresu"</string>
-    <string name="dial" msgid="7317293545368448453">"Pozovi"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Pozovi odabrani broj telefona"</string>
-    <string name="browse" msgid="3733970143542020945">"Otvori"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Otvori odabrani URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Pošalji SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Pošalji SMS odabranom broju telefona"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Dodaj"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Dodaj u kontakte"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Više opcija"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Zatvori preklopni meni"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Dijeli"</string>
+    <string name="email" msgid="6099716515489216517">"Pošalji e-poruku"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Pošalji e-poruku na odabranu adresu"</string>
+    <string name="dial" msgid="2101464860090311277">"Pozovi"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Pozovi odabrani broj telefona"</string>
+    <string name="browse" msgid="4753676368851695348">"Otvori"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Otvori odabrani URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Pošalji SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Pošalji SMS odabranom broju telefona"</string>
+    <string name="add_contact" msgid="386263007484061034">"Dodaj"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Dodaj u kontakte"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Više opcija"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Zatvori preklopni meni"</string>
+    <string name="abc_share" msgid="37557693057519685">"Dijeli"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ca/strings.xml b/textclassifier/textclassifier/src/main/res/values-ca/strings.xml
index e4932cb..ae6f45f 100644
--- a/textclassifier/textclassifier/src/main/res/values-ca/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ca/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Correu electrònic"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Envia un correu electrònic a l\'adreça seleccionada"</string>
-    <string name="dial" msgid="7317293545368448453">"Truca"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Truca al número de telèfon seleccionat"</string>
-    <string name="browse" msgid="3733970143542020945">"Obre"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Obre l\'URL seleccionat"</string>
-    <string name="sms" msgid="5495416906312064886">"Envia un SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Envia un missatge al número de telèfon seleccionat"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Afegeix"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Afegeix als contactes"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Més opcions"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Tanca el menú addicional"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Comparteix"</string>
+    <string name="email" msgid="6099716515489216517">"Correu electrònic"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Envia un correu electrònic a l\'adreça seleccionada"</string>
+    <string name="dial" msgid="2101464860090311277">"Truca"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Truca al número de telèfon seleccionat"</string>
+    <string name="browse" msgid="4753676368851695348">"Obre"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Obre l\'URL seleccionat"</string>
+    <string name="sms" msgid="2214738262605167054">"Envia un SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Envia un missatge al número de telèfon seleccionat"</string>
+    <string name="add_contact" msgid="386263007484061034">"Afegeix"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Afegeix als contactes"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Més opcions"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Tanca el menú addicional"</string>
+    <string name="abc_share" msgid="37557693057519685">"Comparteix"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-cs/strings.xml b/textclassifier/textclassifier/src/main/res/values-cs/strings.xml
index 757a68d..2d1c5d2 100644
--- a/textclassifier/textclassifier/src/main/res/values-cs/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-cs/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Poslat e-mail"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Napsat na vybranou e‑mailovou adresu"</string>
-    <string name="dial" msgid="7317293545368448453">"Zavolat"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Zavolat na vybrané telefonní číslo"</string>
-    <string name="browse" msgid="3733970143542020945">"Otevřít"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Otevřít vybranou adresu URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Napsat zprávu"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Napsat SMS na vybrané telefonní číslo"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Přidat"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Přidat do kontaktů"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Více možností"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Zavřít rozbalovací nabídku"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Sdílet"</string>
+    <string name="email" msgid="6099716515489216517">"Poslat e-mail"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Napsat na vybranou e‑mailovou adresu"</string>
+    <string name="dial" msgid="2101464860090311277">"Zavolat"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Zavolat na vybrané telefonní číslo"</string>
+    <string name="browse" msgid="4753676368851695348">"Otevřít"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Otevřít vybranou adresu URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Napsat zprávu"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Napsat SMS na vybrané telefonní číslo"</string>
+    <string name="add_contact" msgid="386263007484061034">"Přidat"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Přidat do kontaktů"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Více možností"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Zavřít rozbalovací nabídku"</string>
+    <string name="abc_share" msgid="37557693057519685">"Sdílet"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-da/strings.xml b/textclassifier/textclassifier/src/main/res/values-da/strings.xml
index d519fc9..cdd4785 100644
--- a/textclassifier/textclassifier/src/main/res/values-da/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-da/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Send mail"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Send en mail til den valgte adresse"</string>
-    <string name="dial" msgid="7317293545368448453">"Ring op"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Ring til det valgte telefonnummer"</string>
-    <string name="browse" msgid="3733970143542020945">"Åbn"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Åbn den valgte webadresse"</string>
-    <string name="sms" msgid="5495416906312064886">"Send besked"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Send en besked til det valgte telefonnummer"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Tilføj"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Føj til kontakter"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Flere valgmuligheder"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Luk prikmenu"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Del"</string>
+    <string name="email" msgid="6099716515489216517">"Send mail"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Send en mail til den valgte adresse"</string>
+    <string name="dial" msgid="2101464860090311277">"Ring op"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Ring til det valgte telefonnummer"</string>
+    <string name="browse" msgid="4753676368851695348">"Åbn"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Åbn den valgte webadresse"</string>
+    <string name="sms" msgid="2214738262605167054">"Send besked"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Send en besked til det valgte telefonnummer"</string>
+    <string name="add_contact" msgid="386263007484061034">"Tilføj"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Føj til kontakter"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Flere valgmuligheder"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Luk prikmenu"</string>
+    <string name="abc_share" msgid="37557693057519685">"Del"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-de/strings.xml b/textclassifier/textclassifier/src/main/res/values-de/strings.xml
index 463609c..3aaf592 100644
--- a/textclassifier/textclassifier/src/main/res/values-de/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-de/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"E-Mail senden"</string>
-    <string name="email_desc" msgid="6941280589171810022">"E-Mail an ausgewählte Adresse senden"</string>
-    <string name="dial" msgid="7317293545368448453">"Anruf"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Ausgewählte Telefonnummer anrufen"</string>
-    <string name="browse" msgid="3733970143542020945">"Öffnen"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Ausgewählte URL öffnen"</string>
-    <string name="sms" msgid="5495416906312064886">"SMS senden"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"SMS an ausgewählte Telefonnummer senden"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Hinzufügen"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Zu Kontakten hinzufügen"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Weitere Optionen"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Dreipunkt-Menü schließen"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Teilen"</string>
+    <string name="email" msgid="6099716515489216517">"E-Mail senden"</string>
+    <string name="email_desc" msgid="2189760120923982860">"E-Mail an ausgewählte Adresse senden"</string>
+    <string name="dial" msgid="2101464860090311277">"Anruf"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Ausgewählte Telefonnummer anrufen"</string>
+    <string name="browse" msgid="4753676368851695348">"Öffnen"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Ausgewählte URL öffnen"</string>
+    <string name="sms" msgid="2214738262605167054">"SMS senden"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"SMS an ausgewählte Telefonnummer senden"</string>
+    <string name="add_contact" msgid="386263007484061034">"Hinzufügen"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Zu Kontakten hinzufügen"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Weitere Optionen"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Dreipunkt-Menü schließen"</string>
+    <string name="abc_share" msgid="37557693057519685">"Teilen"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-el/strings.xml b/textclassifier/textclassifier/src/main/res/values-el/strings.xml
index 68bca46..8274c7e 100644
--- a/textclassifier/textclassifier/src/main/res/values-el/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-el/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Ηλεκτρ. ταχυδρομείο"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου στην επιλεγμένη διεύθυνση"</string>
-    <string name="dial" msgid="7317293545368448453">"Κλήση"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Κλήση επιλεγμένου αριθμού τηλεφώνου"</string>
-    <string name="browse" msgid="3733970143542020945">"Άνοιγμα"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Άνοιγμα επιλεγμένου URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Μήνυμα"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Αποστολή μηνύματος στον επιλεγμένο αριθμό τηλεφώνου"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Προσθήκη"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Προσθήκη στις επαφές"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Άλλες επιλογές"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Κλείσιμο υπερχείλισης"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Κοινοπ."</string>
+    <string name="email" msgid="6099716515489216517">"Ηλεκτρ. ταχυδρομείο"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου στην επιλεγμένη διεύθυνση"</string>
+    <string name="dial" msgid="2101464860090311277">"Κλήση"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Κλήση επιλεγμένου αριθμού τηλεφώνου"</string>
+    <string name="browse" msgid="4753676368851695348">"Άνοιγμα"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Άνοιγμα επιλεγμένου URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Μήνυμα"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Αποστολή μηνύματος στον επιλεγμένο αριθμό τηλεφώνου"</string>
+    <string name="add_contact" msgid="386263007484061034">"Προσθήκη"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Προσθήκη στις επαφές"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Άλλες επιλογές"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Κλείσιμο υπερχείλισης"</string>
+    <string name="abc_share" msgid="37557693057519685">"Κοινοπ."</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-en-rAU/strings.xml b/textclassifier/textclassifier/src/main/res/values-en-rAU/strings.xml
index 9a0f9f3..3ee16cf 100644
--- a/textclassifier/textclassifier/src/main/res/values-en-rAU/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-en-rAU/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Email selected address"</string>
-    <string name="dial" msgid="7317293545368448453">"Call"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Call selected phone number"</string>
-    <string name="browse" msgid="3733970143542020945">"Open"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Open selected URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Message"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Message selected phone number"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Add"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Add to contacts"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"More options"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Close overflow"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Share"</string>
+    <string name="email" msgid="6099716515489216517">"Email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Email selected address"</string>
+    <string name="dial" msgid="2101464860090311277">"Call"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Call selected phone number"</string>
+    <string name="browse" msgid="4753676368851695348">"Open"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Open selected URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Message"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Message selected phone number"</string>
+    <string name="add_contact" msgid="386263007484061034">"Add"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Add to contacts"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"More options"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Close overflow"</string>
+    <string name="abc_share" msgid="37557693057519685">"Share"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-en-rCA/strings.xml b/textclassifier/textclassifier/src/main/res/values-en-rCA/strings.xml
index 9a0f9f3..3ee16cf 100644
--- a/textclassifier/textclassifier/src/main/res/values-en-rCA/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-en-rCA/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Email selected address"</string>
-    <string name="dial" msgid="7317293545368448453">"Call"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Call selected phone number"</string>
-    <string name="browse" msgid="3733970143542020945">"Open"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Open selected URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Message"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Message selected phone number"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Add"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Add to contacts"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"More options"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Close overflow"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Share"</string>
+    <string name="email" msgid="6099716515489216517">"Email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Email selected address"</string>
+    <string name="dial" msgid="2101464860090311277">"Call"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Call selected phone number"</string>
+    <string name="browse" msgid="4753676368851695348">"Open"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Open selected URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Message"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Message selected phone number"</string>
+    <string name="add_contact" msgid="386263007484061034">"Add"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Add to contacts"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"More options"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Close overflow"</string>
+    <string name="abc_share" msgid="37557693057519685">"Share"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-en-rGB/strings.xml b/textclassifier/textclassifier/src/main/res/values-en-rGB/strings.xml
index 9a0f9f3..3ee16cf 100644
--- a/textclassifier/textclassifier/src/main/res/values-en-rGB/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-en-rGB/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Email selected address"</string>
-    <string name="dial" msgid="7317293545368448453">"Call"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Call selected phone number"</string>
-    <string name="browse" msgid="3733970143542020945">"Open"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Open selected URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Message"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Message selected phone number"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Add"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Add to contacts"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"More options"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Close overflow"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Share"</string>
+    <string name="email" msgid="6099716515489216517">"Email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Email selected address"</string>
+    <string name="dial" msgid="2101464860090311277">"Call"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Call selected phone number"</string>
+    <string name="browse" msgid="4753676368851695348">"Open"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Open selected URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Message"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Message selected phone number"</string>
+    <string name="add_contact" msgid="386263007484061034">"Add"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Add to contacts"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"More options"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Close overflow"</string>
+    <string name="abc_share" msgid="37557693057519685">"Share"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-en-rIN/strings.xml b/textclassifier/textclassifier/src/main/res/values-en-rIN/strings.xml
index 9a0f9f3..3ee16cf 100644
--- a/textclassifier/textclassifier/src/main/res/values-en-rIN/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-en-rIN/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Email selected address"</string>
-    <string name="dial" msgid="7317293545368448453">"Call"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Call selected phone number"</string>
-    <string name="browse" msgid="3733970143542020945">"Open"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Open selected URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Message"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Message selected phone number"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Add"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Add to contacts"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"More options"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Close overflow"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Share"</string>
+    <string name="email" msgid="6099716515489216517">"Email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Email selected address"</string>
+    <string name="dial" msgid="2101464860090311277">"Call"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Call selected phone number"</string>
+    <string name="browse" msgid="4753676368851695348">"Open"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Open selected URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Message"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Message selected phone number"</string>
+    <string name="add_contact" msgid="386263007484061034">"Add"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Add to contacts"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"More options"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Close overflow"</string>
+    <string name="abc_share" msgid="37557693057519685">"Share"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-en-rXC/strings.xml b/textclassifier/textclassifier/src/main/res/values-en-rXC/strings.xml
index 565c75c..4555a2d 100644
--- a/textclassifier/textclassifier/src/main/res/values-en-rXC/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-en-rXC/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎Email‎‏‎‎‏‎"</string>
-    <string name="email_desc" msgid="6941280589171810022">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎Email selected address‎‏‎‎‏‎"</string>
-    <string name="dial" msgid="7317293545368448453">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎Call‎‏‎‎‏‎"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‎Call selected phone number‎‏‎‎‏‎"</string>
-    <string name="browse" msgid="3733970143542020945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎Open‎‏‎‎‏‎"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎Open selected URL‎‏‎‎‏‎"</string>
-    <string name="sms" msgid="5495416906312064886">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎Message‎‏‎‎‏‎"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎Message selected phone number‎‏‎‎‏‎"</string>
-    <string name="add_contact" msgid="9005634177208282449">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎Add‎‏‎‎‏‎"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎Add to contacts‎‏‎‎‏‎"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎More options‎‏‎‎‏‎"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎Close overflow‎‏‎‎‏‎"</string>
-    <string name="abc_share" msgid="7091841667818715717">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎Share‎‏‎‎‏‎"</string>
+    <string name="email" msgid="6099716515489216517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎Email‎‏‎‎‏‎"</string>
+    <string name="email_desc" msgid="2189760120923982860">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎Email selected address‎‏‎‎‏‎"</string>
+    <string name="dial" msgid="2101464860090311277">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎Call‎‏‎‎‏‎"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎Call selected phone number‎‏‎‎‏‎"</string>
+    <string name="browse" msgid="4753676368851695348">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎Open‎‏‎‎‏‎"</string>
+    <string name="browse_desc" msgid="728882176434276995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‏‎Open selected URL‎‏‎‎‏‎"</string>
+    <string name="sms" msgid="2214738262605167054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎Message‎‏‎‎‏‎"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎Message selected phone number‎‏‎‎‏‎"</string>
+    <string name="add_contact" msgid="386263007484061034">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎Add‎‏‎‎‏‎"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎Add to contacts‎‏‎‎‏‎"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‎More options‎‏‎‎‏‎"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎Close overflow‎‏‎‎‏‎"</string>
+    <string name="abc_share" msgid="37557693057519685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎Share‎‏‎‎‏‎"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-es-rUS/strings.xml b/textclassifier/textclassifier/src/main/res/values-es-rUS/strings.xml
index 60d9067..5355082 100644
--- a/textclassifier/textclassifier/src/main/res/values-es-rUS/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-es-rUS/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Correo electrónico"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Enviar un correo electrónico a la dirección seleccionada"</string>
-    <string name="dial" msgid="7317293545368448453">"Llamar"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Llamar al número de teléfono seleccionado"</string>
-    <string name="browse" msgid="3733970143542020945">"Abrir"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Abrir URL seleccionada"</string>
-    <string name="sms" msgid="5495416906312064886">"Enviar un mensaje"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Enviar un mensaje al número de teléfono seleccionado"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Agregar"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Agregar a contactos"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Más opciones"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Cerrar menú ampliado"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Compartir"</string>
+    <string name="email" msgid="6099716515489216517">"Correo electrónico"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Enviar un correo electrónico a la dirección seleccionada"</string>
+    <string name="dial" msgid="2101464860090311277">"Llamar"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Llamar al número de teléfono seleccionado"</string>
+    <string name="browse" msgid="4753676368851695348">"Abrir"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Abrir URL seleccionada"</string>
+    <string name="sms" msgid="2214738262605167054">"Enviar un mensaje"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Enviar un mensaje al número de teléfono seleccionado"</string>
+    <string name="add_contact" msgid="386263007484061034">"Agregar"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Agregar a contactos"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Más opciones"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Cerrar menú ampliado"</string>
+    <string name="abc_share" msgid="37557693057519685">"Compartir"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-es/strings.xml b/textclassifier/textclassifier/src/main/res/values-es/strings.xml
index dd4c644..75a208e 100644
--- a/textclassifier/textclassifier/src/main/res/values-es/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-es/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Enviar correo"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Enviar un correo electrónico a la dirección seleccionada"</string>
-    <string name="dial" msgid="7317293545368448453">"Llamar"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Llamar al número de teléfono seleccionado"</string>
-    <string name="browse" msgid="3733970143542020945">"Abrir"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Abrir la URL seleccionada"</string>
-    <string name="sms" msgid="5495416906312064886">"Enviar SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Enviar SMS al teléfono seleccionado"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Añadir"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Añadir a contactos"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Más opciones"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Cerrar menú adicional"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Compartir"</string>
+    <string name="email" msgid="6099716515489216517">"Enviar correo"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Enviar un correo electrónico a la dirección seleccionada"</string>
+    <string name="dial" msgid="2101464860090311277">"Llamar"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Llamar al número de teléfono seleccionado"</string>
+    <string name="browse" msgid="4753676368851695348">"Abrir"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Abrir la URL seleccionada"</string>
+    <string name="sms" msgid="2214738262605167054">"Enviar SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Enviar SMS al teléfono seleccionado"</string>
+    <string name="add_contact" msgid="386263007484061034">"Añadir"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Añadir a contactos"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Más opciones"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Cerrar menú adicional"</string>
+    <string name="abc_share" msgid="37557693057519685">"Compartir"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-et/strings.xml b/textclassifier/textclassifier/src/main/res/values-et/strings.xml
index b4b2e29..c465a5e 100644
--- a/textclassifier/textclassifier/src/main/res/values-et/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-et/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Saada meil"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Saada valitud aadressile meil"</string>
-    <string name="dial" msgid="7317293545368448453">"Helista"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Helista valitud telefoninumbrile"</string>
-    <string name="browse" msgid="3733970143542020945">"Ava"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Ava valitud URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Saada sõnum"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Saada valitud telefoninumbrile sõnum"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Lisa"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Lisa kontaktidesse"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Rohkem valikuid"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Ületäite sulgemine"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Jaga"</string>
+    <string name="email" msgid="6099716515489216517">"Saada meil"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Saada valitud aadressile meil"</string>
+    <string name="dial" msgid="2101464860090311277">"Helista"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Helista valitud telefoninumbrile"</string>
+    <string name="browse" msgid="4753676368851695348">"Ava"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Ava valitud URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Saada sõnum"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Saada valitud telefoninumbrile sõnum"</string>
+    <string name="add_contact" msgid="386263007484061034">"Lisa"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Lisa kontaktidesse"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Rohkem valikuid"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Ületäite sulgemine"</string>
+    <string name="abc_share" msgid="37557693057519685">"Jaga"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-eu/strings.xml b/textclassifier/textclassifier/src/main/res/values-eu/strings.xml
index 5b98777..bc7b99a 100644
--- a/textclassifier/textclassifier/src/main/res/values-eu/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-eu/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Bidali mezu bat"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Bidali mezu elektroniko bat hautatutako helbidera"</string>
-    <string name="dial" msgid="7317293545368448453">"Deitu"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Deitu hautatutako telefono-zenbakira"</string>
-    <string name="browse" msgid="3733970143542020945">"Ireki"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Ireki hautatutako URLa"</string>
-    <string name="sms" msgid="5495416906312064886">"Bidali SMS bat"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Bidali testu-mezu bat hautatutako telefono-zenbakira"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Gehitu"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Gehitu kontaktuetan"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Aukera gehiago"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Itxi luzapena"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Partekatu"</string>
+    <string name="email" msgid="6099716515489216517">"Bidali mezu bat"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Bidali mezu elektroniko bat hautatutako helbidera"</string>
+    <string name="dial" msgid="2101464860090311277">"Deitu"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Deitu hautatutako telefono-zenbakira"</string>
+    <string name="browse" msgid="4753676368851695348">"Ireki"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Ireki hautatutako URLa"</string>
+    <string name="sms" msgid="2214738262605167054">"Bidali SMS bat"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Bidali testu-mezu bat hautatutako telefono-zenbakira"</string>
+    <string name="add_contact" msgid="386263007484061034">"Gehitu"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Gehitu kontaktuetan"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Aukera gehiago"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Itxi luzapena"</string>
+    <string name="abc_share" msgid="37557693057519685">"Partekatu"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-fa/strings.xml b/textclassifier/textclassifier/src/main/res/values-fa/strings.xml
index 0c01dc6..9c01a6a 100644
--- a/textclassifier/textclassifier/src/main/res/values-fa/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-fa/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"فرستادن ایمیل"</string>
-    <string name="email_desc" msgid="6941280589171810022">"ارسال ایمیل به نشانی انتخابی"</string>
-    <string name="dial" msgid="7317293545368448453">"تماس گرفتن"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"تماس با شماره تلفن انتخابی"</string>
-    <string name="browse" msgid="3733970143542020945">"باز کردن"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"باز کردن نشانی وب انتخابی"</string>
-    <string name="sms" msgid="5495416906312064886">"فرستادن پیام"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"ارسال پیام به شماره تلفن انتخابی"</string>
-    <string name="add_contact" msgid="9005634177208282449">"افزودن"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"افزودن به مخاطبین"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"گزینه‌های بیشتر"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"بستن منوی سرریز"</string>
-    <string name="abc_share" msgid="7091841667818715717">"هم‌رسانی"</string>
+    <string name="email" msgid="6099716515489216517">"فرستادن ایمیل"</string>
+    <string name="email_desc" msgid="2189760120923982860">"ارسال ایمیل به نشانی انتخابی"</string>
+    <string name="dial" msgid="2101464860090311277">"تماس گرفتن"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"تماس با شماره تلفن انتخابی"</string>
+    <string name="browse" msgid="4753676368851695348">"باز کردن"</string>
+    <string name="browse_desc" msgid="728882176434276995">"باز کردن نشانی وب انتخابی"</string>
+    <string name="sms" msgid="2214738262605167054">"فرستادن پیام"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"ارسال پیام به شماره تلفن انتخابی"</string>
+    <string name="add_contact" msgid="386263007484061034">"افزودن"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"افزودن به مخاطبین"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"گزینه‌های بیشتر"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"بستن منوی سرریز"</string>
+    <string name="abc_share" msgid="37557693057519685">"هم‌رسانی"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-fi/strings.xml b/textclassifier/textclassifier/src/main/res/values-fi/strings.xml
index fdc0b83..30904ac 100644
--- a/textclassifier/textclassifier/src/main/res/values-fi/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-fi/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Sähköposti"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Lähetä sähköposti valittuun osoitteeseen"</string>
-    <string name="dial" msgid="7317293545368448453">"Soita"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Soita valittuun puhelinnumeroon"</string>
-    <string name="browse" msgid="3733970143542020945">"Avaa"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Avaa valittu URL-osoite"</string>
-    <string name="sms" msgid="5495416906312064886">"Viesti"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Lähetä viesti valittuun puhelinnumeroon"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Lisää"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Lisää yhteystietoihin"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Lisäasetukset"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Sulje ylivuoto"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Jaa"</string>
+    <string name="email" msgid="6099716515489216517">"Sähköposti"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Lähetä sähköposti valittuun osoitteeseen"</string>
+    <string name="dial" msgid="2101464860090311277">"Soita"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Soita valittuun puhelinnumeroon"</string>
+    <string name="browse" msgid="4753676368851695348">"Avaa"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Avaa valittu URL-osoite"</string>
+    <string name="sms" msgid="2214738262605167054">"Viesti"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Lähetä viesti valittuun puhelinnumeroon"</string>
+    <string name="add_contact" msgid="386263007484061034">"Lisää"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Lisää yhteystietoihin"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Lisäasetukset"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Sulje ylivuoto"</string>
+    <string name="abc_share" msgid="37557693057519685">"Jaa"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-fr-rCA/strings.xml b/textclassifier/textclassifier/src/main/res/values-fr-rCA/strings.xml
index d56c13f..57e5d76 100644
--- a/textclassifier/textclassifier/src/main/res/values-fr-rCA/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-fr-rCA/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Envoyer un courriel"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Envoyer un courriel à l\'adresse sélectionnée"</string>
-    <string name="dial" msgid="7317293545368448453">"Appeler"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Téléphoner au numéro sélectionné"</string>
-    <string name="browse" msgid="3733970143542020945">"Ouvrir"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Ouvrir l\'adresse URL sélectionnée"</string>
-    <string name="sms" msgid="5495416906312064886">"Envoyer un texto"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Envoyer un message texte au numéro de téléphone sélectionné"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Ajouter"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Ajouter aux contacts"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Autres options"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Fermer la barre d\'outils en superposition"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Partager"</string>
+    <string name="email" msgid="6099716515489216517">"Envoyer un courriel"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Envoyer un courriel à l\'adresse sélectionnée"</string>
+    <string name="dial" msgid="2101464860090311277">"Appeler"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Téléphoner au numéro sélectionné"</string>
+    <string name="browse" msgid="4753676368851695348">"Ouvrir"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Ouvrir l\'adresse URL sélectionnée"</string>
+    <string name="sms" msgid="2214738262605167054">"Envoyer un texto"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Envoyer un message texte au numéro de téléphone sélectionné"</string>
+    <string name="add_contact" msgid="386263007484061034">"Ajouter"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Ajouter aux contacts"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Autres options"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Fermer la barre d\'outils en superposition"</string>
+    <string name="abc_share" msgid="37557693057519685">"Partager"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-fr/strings.xml b/textclassifier/textclassifier/src/main/res/values-fr/strings.xml
index 8fc7a9a..cb876c2 100644
--- a/textclassifier/textclassifier/src/main/res/values-fr/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-fr/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Envoyer un e-mail"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Envoyer un e-mail à l\'adresse sélectionnée"</string>
-    <string name="dial" msgid="7317293545368448453">"Appeler"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Appeler le numéro de téléphone sélectionné"</string>
-    <string name="browse" msgid="3733970143542020945">"Ouvrir"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Ouvrir l\'URL sélectionnée"</string>
-    <string name="sms" msgid="5495416906312064886">"Envoyer un SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Envoyer un SMS au numéro de téléphone sélectionné"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Ajouter"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Ajouter aux contacts"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Autres options"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Fermer la barre d\'outils en superposition"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Partager"</string>
+    <string name="email" msgid="6099716515489216517">"Envoyer un e-mail"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Envoyer un e-mail à l\'adresse sélectionnée"</string>
+    <string name="dial" msgid="2101464860090311277">"Appeler"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Appeler le numéro de téléphone sélectionné"</string>
+    <string name="browse" msgid="4753676368851695348">"Ouvrir"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Ouvrir l\'URL sélectionnée"</string>
+    <string name="sms" msgid="2214738262605167054">"Envoyer un SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Envoyer un SMS au numéro de téléphone sélectionné"</string>
+    <string name="add_contact" msgid="386263007484061034">"Ajouter"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Ajouter aux contacts"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Autres options"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Fermer la barre d\'outils en superposition"</string>
+    <string name="abc_share" msgid="37557693057519685">"Partager"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-gl/strings.xml b/textclassifier/textclassifier/src/main/res/values-gl/strings.xml
index 92be078..f31052c 100644
--- a/textclassifier/textclassifier/src/main/res/values-gl/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-gl/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Enviar correo e."</string>
-    <string name="email_desc" msgid="6941280589171810022">"Enviar un correo electrónico ao enderezo seleccionado"</string>
-    <string name="dial" msgid="7317293545368448453">"Chamar"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Chamar ao número de teléfono seleccionado"</string>
-    <string name="browse" msgid="3733970143542020945">"Abrir"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Abrir o URL seleccionado"</string>
-    <string name="sms" msgid="5495416906312064886">"Enviar SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Enviar unha mensaxe ao número de teléfono seleccionado"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Engadir"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Engadir o elemento aos contactos"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Máis opcións"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Pecha o menú adicional"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Compartir"</string>
+    <string name="email" msgid="6099716515489216517">"Enviar correo e."</string>
+    <string name="email_desc" msgid="2189760120923982860">"Enviar un correo electrónico ao enderezo seleccionado"</string>
+    <string name="dial" msgid="2101464860090311277">"Chamar"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Chamar ao número de teléfono seleccionado"</string>
+    <string name="browse" msgid="4753676368851695348">"Abrir"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Abrir o URL seleccionado"</string>
+    <string name="sms" msgid="2214738262605167054">"Enviar SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Enviar unha mensaxe ao número de teléfono seleccionado"</string>
+    <string name="add_contact" msgid="386263007484061034">"Engadir"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Engadir o elemento aos contactos"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Máis opcións"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Pecha o menú adicional"</string>
+    <string name="abc_share" msgid="37557693057519685">"Compartir"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-gu/strings.xml b/textclassifier/textclassifier/src/main/res/values-gu/strings.xml
index c92cbd17..47cd392 100644
--- a/textclassifier/textclassifier/src/main/res/values-gu/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-gu/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ઇમેઇલ કરો"</string>
-    <string name="email_desc" msgid="6941280589171810022">"પસંદ કરેલા ઍડ્રેસ પર ઇમેઇલ મોકલો"</string>
-    <string name="dial" msgid="7317293545368448453">"કૉલ કરો"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"પસંદ કરેલા ફોન નંબર પર કૉલ કરો"</string>
-    <string name="browse" msgid="3733970143542020945">"ખોલો"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"પસંદ કરેલું URL ખોલો"</string>
-    <string name="sms" msgid="5495416906312064886">"સંદેશ મોકલો"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"પસંદ કરેલા ફોન નંબર પર સંદેશ મોકલો"</string>
-    <string name="add_contact" msgid="9005634177208282449">"ઉમેરો"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"સંપર્કોમાં ઉમેરો"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"વધુ વિકલ્પો"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ઓવરફ્લો બંધ કરો"</string>
-    <string name="abc_share" msgid="7091841667818715717">"શેર કરો"</string>
+    <string name="email" msgid="6099716515489216517">"ઇમેઇલ કરો"</string>
+    <string name="email_desc" msgid="2189760120923982860">"પસંદ કરેલા ઍડ્રેસ પર ઇમેઇલ મોકલો"</string>
+    <string name="dial" msgid="2101464860090311277">"કૉલ કરો"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"પસંદ કરેલા ફોન નંબર પર કૉલ કરો"</string>
+    <string name="browse" msgid="4753676368851695348">"ખોલો"</string>
+    <string name="browse_desc" msgid="728882176434276995">"પસંદ કરેલું URL ખોલો"</string>
+    <string name="sms" msgid="2214738262605167054">"સંદેશ મોકલો"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"પસંદ કરેલા ફોન નંબર પર સંદેશ મોકલો"</string>
+    <string name="add_contact" msgid="386263007484061034">"ઉમેરો"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"સંપર્કોમાં ઉમેરો"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"વધુ વિકલ્પો"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ઓવરફ્લો બંધ કરો"</string>
+    <string name="abc_share" msgid="37557693057519685">"શેર કરો"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-hi/strings.xml b/textclassifier/textclassifier/src/main/res/values-hi/strings.xml
index e9cf510..6efa36d 100644
--- a/textclassifier/textclassifier/src/main/res/values-hi/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-hi/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ईमेल करें"</string>
-    <string name="email_desc" msgid="6941280589171810022">"चुने गए पते पर ईमेल भेजें"</string>
-    <string name="dial" msgid="7317293545368448453">"कॉल करें"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"चुने गए फ़ोन नंबर पर कॉल करें"</string>
-    <string name="browse" msgid="3733970143542020945">"खोलें"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"चुना गया यूआरएल खोलें"</string>
-    <string name="sms" msgid="5495416906312064886">"मैसेज करें"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"चुने गए फ़ोन नंबर को मैसेज करें"</string>
-    <string name="add_contact" msgid="9005634177208282449">"जोड़ें"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"संपर्क सूची में जोड़ें"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"ज़्यादा विकल्प"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ओवरफ़्लो बंद करें"</string>
-    <string name="abc_share" msgid="7091841667818715717">"शेयर करें"</string>
+    <string name="email" msgid="6099716515489216517">"ईमेल करें"</string>
+    <string name="email_desc" msgid="2189760120923982860">"चुने गए पते पर ईमेल भेजें"</string>
+    <string name="dial" msgid="2101464860090311277">"कॉल करें"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"चुने गए फ़ोन नंबर पर कॉल करें"</string>
+    <string name="browse" msgid="4753676368851695348">"खोलें"</string>
+    <string name="browse_desc" msgid="728882176434276995">"चुना गया यूआरएल खोलें"</string>
+    <string name="sms" msgid="2214738262605167054">"मैसेज करें"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"चुने गए फ़ोन नंबर को मैसेज करें"</string>
+    <string name="add_contact" msgid="386263007484061034">"जोड़ें"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"संपर्क सूची में जोड़ें"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"ज़्यादा विकल्प"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ओवरफ़्लो बंद करें"</string>
+    <string name="abc_share" msgid="37557693057519685">"शेयर करें"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-hr/strings.xml b/textclassifier/textclassifier/src/main/res/values-hr/strings.xml
index 0a05d23..147d78c 100644
--- a/textclassifier/textclassifier/src/main/res/values-hr/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-hr/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Pošalji e-poštu"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Pošalji e-poštu na odabranu adresu"</string>
-    <string name="dial" msgid="7317293545368448453">"Nazovi"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Nazovi odabrani telefonski broj"</string>
-    <string name="browse" msgid="3733970143542020945">"Otvori"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Otvori odabrani URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Pošalji poruku"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Pošalji poruku na odabrani telefonski broj"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Dodaj"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Dodaj u kontakte"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Više opcija"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Zatvori dodatni izbornik"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Dijeli"</string>
+    <string name="email" msgid="6099716515489216517">"Pošalji e-poštu"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Pošalji e-poštu na odabranu adresu"</string>
+    <string name="dial" msgid="2101464860090311277">"Nazovi"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Nazovi odabrani telefonski broj"</string>
+    <string name="browse" msgid="4753676368851695348">"Otvori"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Otvori odabrani URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Pošalji poruku"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Pošalji poruku na odabrani telefonski broj"</string>
+    <string name="add_contact" msgid="386263007484061034">"Dodaj"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Dodaj u kontakte"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Više opcija"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Zatvori dodatni izbornik"</string>
+    <string name="abc_share" msgid="37557693057519685">"Dijeli"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-hu/strings.xml b/textclassifier/textclassifier/src/main/res/values-hu/strings.xml
index 59d8bf4..835db5d 100644
--- a/textclassifier/textclassifier/src/main/res/values-hu/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-hu/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"E-mail"</string>
-    <string name="email_desc" msgid="6941280589171810022">"E-mail küldése a kiválasztott címre"</string>
-    <string name="dial" msgid="7317293545368448453">"Hívás"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Kiválasztott telefonszám hívása"</string>
-    <string name="browse" msgid="3733970143542020945">"Megnyitás"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Kiválasztott URL megnyitása"</string>
-    <string name="sms" msgid="5495416906312064886">"Üzenet"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Üzenet küldése a kiválasztott telefonszámra"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Hozzáadás"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Névjegyekhez"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"További lehetőségek"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"További elemeket tartalmazó eszköztár bezárása"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Megosztás"</string>
+    <string name="email" msgid="6099716515489216517">"E-mail"</string>
+    <string name="email_desc" msgid="2189760120923982860">"E-mail küldése a kiválasztott címre"</string>
+    <string name="dial" msgid="2101464860090311277">"Hívás"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Kiválasztott telefonszám hívása"</string>
+    <string name="browse" msgid="4753676368851695348">"Megnyitás"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Kiválasztott URL megnyitása"</string>
+    <string name="sms" msgid="2214738262605167054">"Üzenet"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Üzenet küldése a kiválasztott telefonszámra"</string>
+    <string name="add_contact" msgid="386263007484061034">"Hozzáadás"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Névjegyekhez"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"További lehetőségek"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"További elemeket tartalmazó eszköztár bezárása"</string>
+    <string name="abc_share" msgid="37557693057519685">"Megosztás"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-hy/strings.xml b/textclassifier/textclassifier/src/main/res/values-hy/strings.xml
index d7317e8..2478c52 100644
--- a/textclassifier/textclassifier/src/main/res/values-hy/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-hy/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Էլփոստ"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Նամակ ուղարկել ընտրված հասցեին"</string>
-    <string name="dial" msgid="7317293545368448453">"Զանգել"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Զանգել ընտրված հեռախոսահամարին"</string>
-    <string name="browse" msgid="3733970143542020945">"Բացել"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Բացել ընտրված URL-ը"</string>
-    <string name="sms" msgid="5495416906312064886">"SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"SMS ուղարկել ընտրված հեռախոսահամարին"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Ավելացնել"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Ավելացնել կոնտակտներում"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Այլ ընտրանքներ"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Փակել ավելորդ տեղեկությունները"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Կիսվել"</string>
+    <string name="email" msgid="6099716515489216517">"Էլփոստ"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Նամակ ուղարկել ընտրված հասցեին"</string>
+    <string name="dial" msgid="2101464860090311277">"Զանգել"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Զանգել ընտրված հեռախոսահամարին"</string>
+    <string name="browse" msgid="4753676368851695348">"Բացել"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Բացել ընտրված URL-ը"</string>
+    <string name="sms" msgid="2214738262605167054">"SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"SMS ուղարկել ընտրված հեռախոսահամարին"</string>
+    <string name="add_contact" msgid="386263007484061034">"Ավելացնել"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Ավելացնել կոնտակտներում"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Այլ ընտրանքներ"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Փակել ավելորդ տեղեկությունները"</string>
+    <string name="abc_share" msgid="37557693057519685">"Կիսվել"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-in/strings.xml b/textclassifier/textclassifier/src/main/res/values-in/strings.xml
index 85dbb52..2fa8571 100644
--- a/textclassifier/textclassifier/src/main/res/values-in/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-in/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Kirim email ke alamat yang dipilih"</string>
-    <string name="dial" msgid="7317293545368448453">"Panggil"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Panggil nomor telepon yang dipilih"</string>
-    <string name="browse" msgid="3733970143542020945">"Buka"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Buka URL yang dipilih"</string>
-    <string name="sms" msgid="5495416906312064886">"Pesan"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Kirim SMS ke nomor telepon yang dipilih"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Tambahkan"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Tambahkan ke kontak"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Opsi lain"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Tutup toolbar mengambang tambahan"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Bagikan"</string>
+    <string name="email" msgid="6099716515489216517">"Email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Kirim email ke alamat yang dipilih"</string>
+    <string name="dial" msgid="2101464860090311277">"Panggil"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Panggil nomor telepon yang dipilih"</string>
+    <string name="browse" msgid="4753676368851695348">"Buka"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Buka URL yang dipilih"</string>
+    <string name="sms" msgid="2214738262605167054">"Pesan"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Kirim SMS ke nomor telepon yang dipilih"</string>
+    <string name="add_contact" msgid="386263007484061034">"Tambahkan"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Tambahkan ke kontak"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Opsi lain"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Tutup toolbar mengambang tambahan"</string>
+    <string name="abc_share" msgid="37557693057519685">"Bagikan"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-is/strings.xml b/textclassifier/textclassifier/src/main/res/values-is/strings.xml
index 6aa7685..2312664 100644
--- a/textclassifier/textclassifier/src/main/res/values-is/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-is/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Senda tölvupóst"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Senda á valið netfang"</string>
-    <string name="dial" msgid="7317293545368448453">"Símtal"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Hringja í valið símanúmer"</string>
-    <string name="browse" msgid="3733970143542020945">"Opna"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Opna valda vefslóð"</string>
-    <string name="sms" msgid="5495416906312064886">"Skilaboð"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Senda skilaboð í valið símanúmer"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Bæta við"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Bæta við tengiliði"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Fleiri valkostir"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Loka viðbótaratriðum"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Deila"</string>
+    <string name="email" msgid="6099716515489216517">"Senda tölvupóst"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Senda á valið netfang"</string>
+    <string name="dial" msgid="2101464860090311277">"Símtal"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Hringja í valið símanúmer"</string>
+    <string name="browse" msgid="4753676368851695348">"Opna"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Opna valda vefslóð"</string>
+    <string name="sms" msgid="2214738262605167054">"Skilaboð"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Senda skilaboð í valið símanúmer"</string>
+    <string name="add_contact" msgid="386263007484061034">"Bæta við"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Bæta við tengiliði"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Fleiri valkostir"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Loka viðbótaratriðum"</string>
+    <string name="abc_share" msgid="37557693057519685">"Deila"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-it/strings.xml b/textclassifier/textclassifier/src/main/res/values-it/strings.xml
index 2bc88b9..28d8de7 100644
--- a/textclassifier/textclassifier/src/main/res/values-it/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-it/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Invia email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Invia un\'email all\'indirizzo selezionato"</string>
-    <string name="dial" msgid="7317293545368448453">"Chiama"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Chiama il numero di telefono selezionato"</string>
-    <string name="browse" msgid="3733970143542020945">"Apri"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Apri l\'URL selezionato"</string>
-    <string name="sms" msgid="5495416906312064886">"Invia SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Invia un SMS al numero di telefono selezionato"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Aggiungi"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Aggiungi ai contatti"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Altre opzioni"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Chiudi menu extra"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Condividi"</string>
+    <string name="email" msgid="6099716515489216517">"Invia email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Invia un\'email all\'indirizzo selezionato"</string>
+    <string name="dial" msgid="2101464860090311277">"Chiama"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Chiama il numero di telefono selezionato"</string>
+    <string name="browse" msgid="4753676368851695348">"Apri"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Apri l\'URL selezionato"</string>
+    <string name="sms" msgid="2214738262605167054">"Invia SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Invia un SMS al numero di telefono selezionato"</string>
+    <string name="add_contact" msgid="386263007484061034">"Aggiungi"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Aggiungi ai contatti"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Altre opzioni"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Chiudi menu extra"</string>
+    <string name="abc_share" msgid="37557693057519685">"Condividi"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-iw/strings.xml b/textclassifier/textclassifier/src/main/res/values-iw/strings.xml
index b577732..df4b5d1 100644
--- a/textclassifier/textclassifier/src/main/res/values-iw/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-iw/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"התכתבות באימייל"</string>
-    <string name="email_desc" msgid="6941280589171810022">"שליחת אימייל לכתובת שנבחרה"</string>
-    <string name="dial" msgid="7317293545368448453">"ביצוע שיחה"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"התקשרות למספר הטלפון שנבחר"</string>
-    <string name="browse" msgid="3733970143542020945">"פתיחה"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"פתיחה של כתובת האתר שנבחרה"</string>
-    <string name="sms" msgid="5495416906312064886">"התכתבות בהודעות"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"שליחת הודעה למספר הטלפון שנבחר"</string>
-    <string name="add_contact" msgid="9005634177208282449">"הוספה"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"הוספה לאנשי הקשר"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"עוד אפשרויות"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"סגירת האפשרויות הנוספות"</string>
-    <string name="abc_share" msgid="7091841667818715717">"שיתוף"</string>
+    <string name="email" msgid="6099716515489216517">"התכתבות באימייל"</string>
+    <string name="email_desc" msgid="2189760120923982860">"שליחת אימייל לכתובת שנבחרה"</string>
+    <string name="dial" msgid="2101464860090311277">"ביצוע שיחה"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"התקשרות למספר הטלפון שנבחר"</string>
+    <string name="browse" msgid="4753676368851695348">"פתיחה"</string>
+    <string name="browse_desc" msgid="728882176434276995">"פתיחה של כתובת האתר שנבחרה"</string>
+    <string name="sms" msgid="2214738262605167054">"התכתבות בהודעות"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"שליחת הודעה למספר הטלפון שנבחר"</string>
+    <string name="add_contact" msgid="386263007484061034">"הוספה"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"הוספה לאנשי הקשר"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"עוד אפשרויות"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"סגירת האפשרויות הנוספות"</string>
+    <string name="abc_share" msgid="37557693057519685">"שיתוף"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ja/strings.xml b/textclassifier/textclassifier/src/main/res/values-ja/strings.xml
index eac63e6..781469e 100644
--- a/textclassifier/textclassifier/src/main/res/values-ja/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ja/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"メール"</string>
-    <string name="email_desc" msgid="6941280589171810022">"選択したメールアドレスにメールを送信します"</string>
-    <string name="dial" msgid="7317293545368448453">"電話"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"選択した電話番号に電話をかけます"</string>
-    <string name="browse" msgid="3733970143542020945">"開く"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"選択した URL を開きます"</string>
-    <string name="sms" msgid="5495416906312064886">"SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"選択した電話番号に SMS を送信します"</string>
-    <string name="add_contact" msgid="9005634177208282449">"追加"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"連絡先に追加"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"その他のオプション"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"オーバーフローを閉じる"</string>
-    <string name="abc_share" msgid="7091841667818715717">"共有"</string>
+    <string name="email" msgid="6099716515489216517">"メール"</string>
+    <string name="email_desc" msgid="2189760120923982860">"選択したメールアドレスにメールを送信します"</string>
+    <string name="dial" msgid="2101464860090311277">"電話"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"選択した電話番号に電話をかけます"</string>
+    <string name="browse" msgid="4753676368851695348">"開く"</string>
+    <string name="browse_desc" msgid="728882176434276995">"選択した URL を開きます"</string>
+    <string name="sms" msgid="2214738262605167054">"SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"選択した電話番号に SMS を送信します"</string>
+    <string name="add_contact" msgid="386263007484061034">"追加"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"連絡先に追加"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"その他のオプション"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"オーバーフローを閉じる"</string>
+    <string name="abc_share" msgid="37557693057519685">"共有"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ka/strings.xml b/textclassifier/textclassifier/src/main/res/values-ka/strings.xml
index 4c5edbb..312ebbe 100644
--- a/textclassifier/textclassifier/src/main/res/values-ka/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ka/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ელფოსტის გაგზავნა"</string>
-    <string name="email_desc" msgid="6941280589171810022">"არჩეულ მისამართზე ელფოსტის გაგზავნა"</string>
-    <string name="dial" msgid="7317293545368448453">"დარეკვა"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"არჩეულ ტელეფონის ნომერზე დარეკვა"</string>
-    <string name="browse" msgid="3733970143542020945">"გახსნა"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"არჩეული URL-ის გახსნა"</string>
-    <string name="sms" msgid="5495416906312064886">"შეტყობინების გაგზ."</string>
-    <string name="sms_desc" msgid="8293660783374489324">"არჩეულ ტელეფონის ნომერზე შეტყობინების გაგზავნა"</string>
-    <string name="add_contact" msgid="9005634177208282449">"დამატება"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"კონტაქტებში დამატება"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"სხვა ვარიანტები"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"გადავსების დახურვა"</string>
-    <string name="abc_share" msgid="7091841667818715717">"გაზიარება"</string>
+    <string name="email" msgid="6099716515489216517">"ელფოსტის გაგზავნა"</string>
+    <string name="email_desc" msgid="2189760120923982860">"არჩეულ მისამართზე ელფოსტის გაგზავნა"</string>
+    <string name="dial" msgid="2101464860090311277">"დარეკვა"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"არჩეულ ტელეფონის ნომერზე დარეკვა"</string>
+    <string name="browse" msgid="4753676368851695348">"გახსნა"</string>
+    <string name="browse_desc" msgid="728882176434276995">"არჩეული URL-ის გახსნა"</string>
+    <string name="sms" msgid="2214738262605167054">"შეტყობინების გაგზ."</string>
+    <string name="sms_desc" msgid="7733202356868441148">"არჩეულ ტელეფონის ნომერზე შეტყობინების გაგზავნა"</string>
+    <string name="add_contact" msgid="386263007484061034">"დამატება"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"კონტაქტებში დამატება"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"სხვა ვარიანტები"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"გადავსების დახურვა"</string>
+    <string name="abc_share" msgid="37557693057519685">"გაზიარება"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-kk/strings.xml b/textclassifier/textclassifier/src/main/res/values-kk/strings.xml
index 70a0090..0b831e7 100644
--- a/textclassifier/textclassifier/src/main/res/values-kk/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-kk/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Эл. поштаны ашу"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Таңдалған мекенжайға хабар жіберу"</string>
-    <string name="dial" msgid="7317293545368448453">"Қоңырау шалу"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Таңдалған телефон нөміріне қоңырау шалу"</string>
-    <string name="browse" msgid="3733970143542020945">"Ашу"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Таңдалған URL мекенжайын ашу"</string>
-    <string name="sms" msgid="5495416906312064886">"Хабар жіберу"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Таңдалған телефон нөміріне хабар жіберу"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Енгізу"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Контактілер тізіміне енгізу"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Басқа опциялар"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Қосымша мәзірді жабу"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Бөлісу"</string>
+    <string name="email" msgid="6099716515489216517">"Эл. поштаны ашу"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Таңдалған мекенжайға хабар жіберу"</string>
+    <string name="dial" msgid="2101464860090311277">"Қоңырау шалу"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Таңдалған телефон нөміріне қоңырау шалу"</string>
+    <string name="browse" msgid="4753676368851695348">"Ашу"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Таңдалған URL мекенжайын ашу"</string>
+    <string name="sms" msgid="2214738262605167054">"Хабар жіберу"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Таңдалған телефон нөміріне хабар жіберу"</string>
+    <string name="add_contact" msgid="386263007484061034">"Енгізу"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Контактілер тізіміне енгізу"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Басқа опциялар"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Қосымша мәзірді жабу"</string>
+    <string name="abc_share" msgid="37557693057519685">"Бөлісу"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-km/strings.xml b/textclassifier/textclassifier/src/main/res/values-km/strings.xml
index e71c64b5..bc03625 100644
--- a/textclassifier/textclassifier/src/main/res/values-km/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-km/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ផ្ញើអ៊ីមែល"</string>
-    <string name="email_desc" msgid="6941280589171810022">"ផ្ញើ​អ៊ីមែល​ទៅ​អាសយដ្ឋាន​ដែល​បាន​ជ្រើសរើស"</string>
-    <string name="dial" msgid="7317293545368448453">"ហៅទូរសព្ទ"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"ហៅ​ទូរសព្ទ​ទៅ​លេខ​ដែល​បាន​ជ្រើសរើស"</string>
-    <string name="browse" msgid="3733970143542020945">"បើក"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"បើក URL ដែល​បាន​ជ្រើសរើស"</string>
-    <string name="sms" msgid="5495416906312064886">"ផ្ញើសារ"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"ផ្ញើសារ​ទៅ​លេខ​ទូរសព្ទ​ដែល​បាន​ជ្រើសរើស"</string>
-    <string name="add_contact" msgid="9005634177208282449">"បញ្ចូល"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"បញ្ចូល​ទៅ​ក្នុង​ទំនាក់ទំនង"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"ជម្រើសច្រើនទៀត"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"បិទរបារ​លើសចំណុះ"</string>
-    <string name="abc_share" msgid="7091841667818715717">"ចែករំលែក"</string>
+    <string name="email" msgid="6099716515489216517">"ផ្ញើអ៊ីមែល"</string>
+    <string name="email_desc" msgid="2189760120923982860">"ផ្ញើ​អ៊ីមែល​ទៅ​អាសយដ្ឋាន​ដែល​បាន​ជ្រើសរើស"</string>
+    <string name="dial" msgid="2101464860090311277">"ហៅទូរសព្ទ"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"ហៅ​ទូរសព្ទ​ទៅ​លេខ​ដែល​បាន​ជ្រើសរើស"</string>
+    <string name="browse" msgid="4753676368851695348">"បើក"</string>
+    <string name="browse_desc" msgid="728882176434276995">"បើក URL ដែល​បាន​ជ្រើសរើស"</string>
+    <string name="sms" msgid="2214738262605167054">"ផ្ញើសារ"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"ផ្ញើសារ​ទៅ​លេខ​ទូរសព្ទ​ដែល​បាន​ជ្រើសរើស"</string>
+    <string name="add_contact" msgid="386263007484061034">"បញ្ចូល"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"បញ្ចូល​ទៅ​ក្នុង​ទំនាក់ទំនង"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"ជម្រើសច្រើនទៀត"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"បិទរបារ​លើសចំណុះ"</string>
+    <string name="abc_share" msgid="37557693057519685">"ចែករំលែក"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-kn/strings.xml b/textclassifier/textclassifier/src/main/res/values-kn/strings.xml
index 14dfb18..5877200 100644
--- a/textclassifier/textclassifier/src/main/res/values-kn/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-kn/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ಇಮೇಲ್ ಮಾಡಿ"</string>
-    <string name="email_desc" msgid="6941280589171810022">"ಆಯ್ಕೆಮಾಡಿದ ವಿಳಾಸಕ್ಕೆ ಇಮೇಲ್‌ ಮಾಡಿ"</string>
-    <string name="dial" msgid="7317293545368448453">"ಕರೆ ಮಾಡಿ"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"ಆಯ್ಕೆಮಾಡಿದ ಫೋನ್ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="browse" msgid="3733970143542020945">"ತೆರೆಯಿರಿ"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"ಆಯ್ಕೆ ಮಾಡಿದ URL ತೆರೆಯಿರಿ"</string>
-    <string name="sms" msgid="5495416906312064886">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"ಆಯ್ಕೆಮಾಡಿದ ಫೋನ್ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
-    <string name="add_contact" msgid="9005634177208282449">"ಸೇರಿಸಿ"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಿ"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ಓವರ್‌ಫ್ಲೋ ಮುಚ್ಚಿ"</string>
-    <string name="abc_share" msgid="7091841667818715717">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
+    <string name="email" msgid="6099716515489216517">"ಇಮೇಲ್ ಮಾಡಿ"</string>
+    <string name="email_desc" msgid="2189760120923982860">"ಆಯ್ಕೆಮಾಡಿದ ವಿಳಾಸಕ್ಕೆ ಇಮೇಲ್‌ ಮಾಡಿ"</string>
+    <string name="dial" msgid="2101464860090311277">"ಕರೆ ಮಾಡಿ"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"ಆಯ್ಕೆಮಾಡಿದ ಫೋನ್ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಿ"</string>
+    <string name="browse" msgid="4753676368851695348">"ತೆರೆಯಿರಿ"</string>
+    <string name="browse_desc" msgid="728882176434276995">"ಆಯ್ಕೆ ಮಾಡಿದ URL ತೆರೆಯಿರಿ"</string>
+    <string name="sms" msgid="2214738262605167054">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"ಆಯ್ಕೆಮಾಡಿದ ಫೋನ್ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
+    <string name="add_contact" msgid="386263007484061034">"ಸೇರಿಸಿ"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಿ"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ಓವರ್‌ಫ್ಲೋ ಮುಚ್ಚಿ"</string>
+    <string name="abc_share" msgid="37557693057519685">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ko/strings.xml b/textclassifier/textclassifier/src/main/res/values-ko/strings.xml
index b2b8793..177bfbe 100644
--- a/textclassifier/textclassifier/src/main/res/values-ko/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ko/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"이메일"</string>
-    <string name="email_desc" msgid="6941280589171810022">"선택한 주소로 이메일 보내기"</string>
-    <string name="dial" msgid="7317293545368448453">"전화"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"선택한 전화번호로 전화 걸기"</string>
-    <string name="browse" msgid="3733970143542020945">"열기"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"선택한 URL 열기"</string>
-    <string name="sms" msgid="5495416906312064886">"메시지"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"선택한 전화번호로 메시지 전송"</string>
-    <string name="add_contact" msgid="9005634177208282449">"추가"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"연락처에 추가"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"추가 옵션"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"더보기 메뉴 닫기"</string>
-    <string name="abc_share" msgid="7091841667818715717">"공유"</string>
+    <string name="email" msgid="6099716515489216517">"이메일"</string>
+    <string name="email_desc" msgid="2189760120923982860">"선택한 주소로 이메일 보내기"</string>
+    <string name="dial" msgid="2101464860090311277">"전화"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"선택한 전화번호로 전화 걸기"</string>
+    <string name="browse" msgid="4753676368851695348">"열기"</string>
+    <string name="browse_desc" msgid="728882176434276995">"선택한 URL 열기"</string>
+    <string name="sms" msgid="2214738262605167054">"메시지"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"선택한 전화번호로 메시지 전송"</string>
+    <string name="add_contact" msgid="386263007484061034">"추가"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"연락처에 추가"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"추가 옵션"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"더보기 메뉴 닫기"</string>
+    <string name="abc_share" msgid="37557693057519685">"공유"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ky/strings.xml b/textclassifier/textclassifier/src/main/res/values-ky/strings.xml
index 1ae09c4..ea93fd3 100644
--- a/textclassifier/textclassifier/src/main/res/values-ky/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ky/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Электрондук кат жөнөтүү"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Тандалган дарекке электрондук кат жөнөтүү"</string>
-    <string name="dial" msgid="7317293545368448453">"Чалуу"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Тандалган телефон номерине чалуу"</string>
-    <string name="browse" msgid="3733970143542020945">"Ачуу"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Тандалган URL\'ди ачуу"</string>
-    <string name="sms" msgid="5495416906312064886">"Билдирүү жөнөтүү"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Тандалган телефон номерине билдирүү жөнөтүү"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Кошуу"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Байланыштарга кошуу"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Дагы параметрлер"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Кошумча куралдар тилкесин жабуу"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Бөлүшүү"</string>
+    <string name="email" msgid="6099716515489216517">"Электрондук кат жөнөтүү"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Тандалган дарекке электрондук кат жөнөтүү"</string>
+    <string name="dial" msgid="2101464860090311277">"Чалуу"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Тандалган телефон номерине чалуу"</string>
+    <string name="browse" msgid="4753676368851695348">"Ачуу"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Тандалган URL\'ди ачуу"</string>
+    <string name="sms" msgid="2214738262605167054">"Билдирүү жөнөтүү"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Тандалган телефон номерине билдирүү жөнөтүү"</string>
+    <string name="add_contact" msgid="386263007484061034">"Кошуу"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Байланыштарга кошуу"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Дагы параметрлер"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Кошумча куралдар тилкесин жабуу"</string>
+    <string name="abc_share" msgid="37557693057519685">"Бөлүшүү"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-lo/strings.xml b/textclassifier/textclassifier/src/main/res/values-lo/strings.xml
index bce488a..16a48d6 100644
--- a/textclassifier/textclassifier/src/main/res/values-lo/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-lo/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ອີເມວ"</string>
-    <string name="email_desc" msgid="6941280589171810022">"ສົ່ງອີເມວຫາທີ່ຢູ່ທີ່ເລືອກ"</string>
-    <string name="dial" msgid="7317293545368448453">"ໂທ"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"ໂທຫາເບີໂທລະສັບທີ່ເລືອກ"</string>
-    <string name="browse" msgid="3733970143542020945">"ເປີດ"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"ເປີດ URL ທີ່ເລືອກ"</string>
-    <string name="sms" msgid="5495416906312064886">"ຂໍ້ຄວາມ"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"ສົ່ງຂໍ້ຄວາມຫາເບີໂທລະສັບທີ່ເລືອກ"</string>
-    <string name="add_contact" msgid="9005634177208282449">"ເພີ່ມ"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"ເພີ່ມໃສ່ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"ຕົວເລືອກເພີ່ມເຕີມ"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ປິດ​ການ​ໄຫຼ​ລົ້ນ​ອອກ​ມາ"</string>
-    <string name="abc_share" msgid="7091841667818715717">"ແບ່ງປັນ"</string>
+    <string name="email" msgid="6099716515489216517">"ອີເມວ"</string>
+    <string name="email_desc" msgid="2189760120923982860">"ສົ່ງອີເມວຫາທີ່ຢູ່ທີ່ເລືອກ"</string>
+    <string name="dial" msgid="2101464860090311277">"ໂທ"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"ໂທຫາເບີໂທລະສັບທີ່ເລືອກ"</string>
+    <string name="browse" msgid="4753676368851695348">"ເປີດ"</string>
+    <string name="browse_desc" msgid="728882176434276995">"ເປີດ URL ທີ່ເລືອກ"</string>
+    <string name="sms" msgid="2214738262605167054">"ຂໍ້ຄວາມ"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"ສົ່ງຂໍ້ຄວາມຫາເບີໂທລະສັບທີ່ເລືອກ"</string>
+    <string name="add_contact" msgid="386263007484061034">"ເພີ່ມ"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"ເພີ່ມໃສ່ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"ຕົວເລືອກເພີ່ມເຕີມ"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ປິດ​ການ​ໄຫຼ​ລົ້ນ​ອອກ​ມາ"</string>
+    <string name="abc_share" msgid="37557693057519685">"ແບ່ງປັນ"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-lt/strings.xml b/textclassifier/textclassifier/src/main/res/values-lt/strings.xml
index 8055d7e..88a0865 100644
--- a/textclassifier/textclassifier/src/main/res/values-lt/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-lt/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Rašyti el. laišką"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Siųsti el. laišką pasirinktu adresu"</string>
-    <string name="dial" msgid="7317293545368448453">"Skambinti"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Skambinti pasirinktu telefono numeriu"</string>
-    <string name="browse" msgid="3733970143542020945">"Atidaryti"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Atidaryti pasirinktą URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Rašyti pranešimą"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Siųsti pranešimą pasirinktu telefono numeriu"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Pridėti"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Pridėti prie kontaktų"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Daugiau parinkčių"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Uždaryti perpildymo sritį"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Bendrinti"</string>
+    <string name="email" msgid="6099716515489216517">"Rašyti el. laišką"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Siųsti el. laišką pasirinktu adresu"</string>
+    <string name="dial" msgid="2101464860090311277">"Skambinti"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Skambinti pasirinktu telefono numeriu"</string>
+    <string name="browse" msgid="4753676368851695348">"Atidaryti"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Atidaryti pasirinktą URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Rašyti pranešimą"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Siųsti pranešimą pasirinktu telefono numeriu"</string>
+    <string name="add_contact" msgid="386263007484061034">"Pridėti"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Pridėti prie kontaktų"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Daugiau parinkčių"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Uždaryti perpildymo sritį"</string>
+    <string name="abc_share" msgid="37557693057519685">"Bendrinti"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-lv/strings.xml b/textclassifier/textclassifier/src/main/res/values-lv/strings.xml
index 01b7230..ecc3220 100644
--- a/textclassifier/textclassifier/src/main/res/values-lv/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-lv/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"E-pasts"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Nosūtīt e-pasta ziņojumu uz atlasīto adresi"</string>
-    <string name="dial" msgid="7317293545368448453">"Zvans"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Zvanīt uz atlasīto tālruņa numuru"</string>
-    <string name="browse" msgid="3733970143542020945">"Atvērt"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Atvērt atlasīto URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Īsziņa"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Nosūtīt īsziņu uz atlasīto tālruņa numuru"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Pievienot"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Pievienot kontaktpersonām"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Citas opcijas"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Aizvērt pārpildes izvēlni"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Kopīgot"</string>
+    <string name="email" msgid="6099716515489216517">"E-pasts"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Nosūtīt e-pasta ziņojumu uz atlasīto adresi"</string>
+    <string name="dial" msgid="2101464860090311277">"Zvans"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Zvanīt uz atlasīto tālruņa numuru"</string>
+    <string name="browse" msgid="4753676368851695348">"Atvērt"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Atvērt atlasīto URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Īsziņa"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Nosūtīt īsziņu uz atlasīto tālruņa numuru"</string>
+    <string name="add_contact" msgid="386263007484061034">"Pievienot"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Pievienot kontaktpersonām"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Citas opcijas"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Aizvērt pārpildes izvēlni"</string>
+    <string name="abc_share" msgid="37557693057519685">"Kopīgot"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-mk/strings.xml b/textclassifier/textclassifier/src/main/res/values-mk/strings.xml
index 39235db..4bc3950 100644
--- a/textclassifier/textclassifier/src/main/res/values-mk/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-mk/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Испрати е-пошта"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Испрати е-порака до избраната адреса"</string>
-    <string name="dial" msgid="7317293545368448453">"Повикај"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Повикај го избраниот телефонски број"</string>
-    <string name="browse" msgid="3733970143542020945">"Отвори"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Отвори ја избраната URL-адреса"</string>
-    <string name="sms" msgid="5495416906312064886">"Испрати порака"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Испрати порака до избраниот телефонски број"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Додај"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Додај во контакти"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Повеќе опции"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Затвори прелевање"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Сподели"</string>
+    <string name="email" msgid="6099716515489216517">"Испрати е-пошта"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Испрати е-порака до избраната адреса"</string>
+    <string name="dial" msgid="2101464860090311277">"Повикај"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Повикај го избраниот телефонски број"</string>
+    <string name="browse" msgid="4753676368851695348">"Отвори"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Отвори ја избраната URL-адреса"</string>
+    <string name="sms" msgid="2214738262605167054">"Испрати порака"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Испрати порака до избраниот телефонски број"</string>
+    <string name="add_contact" msgid="386263007484061034">"Додај"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Додај во контакти"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Повеќе опции"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Затвори прелевање"</string>
+    <string name="abc_share" msgid="37557693057519685">"Сподели"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ml/strings.xml b/textclassifier/textclassifier/src/main/res/values-ml/strings.xml
index b8726a9..0ad1275 100644
--- a/textclassifier/textclassifier/src/main/res/values-ml/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ml/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ഇമെയിൽ അയയ്ക്കൂ"</string>
-    <string name="email_desc" msgid="6941280589171810022">"തിരഞ്ഞെടുത്ത വിലാസത്തിലേക്ക് ഇമെയിൽ അയയ്ക്കുക"</string>
-    <string name="dial" msgid="7317293545368448453">"വിളിക്കുക"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"തിരഞ്ഞെടുത്ത ഫോൺ നമ്പറിലേക്ക് വിളിക്കുക"</string>
-    <string name="browse" msgid="3733970143542020945">"തുറക്കുക"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"തിരഞ്ഞെടുത്ത URL തുറക്കുക"</string>
-    <string name="sms" msgid="5495416906312064886">"സന്ദേശം അയയ്ക്കൂ"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"തിരഞ്ഞെടുത്ത ഫോൺ നമ്പറിലേക്ക് സന്ദേശം അയയ്ക്കുക"</string>
-    <string name="add_contact" msgid="9005634177208282449">"ചേർക്കുക"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"കോൺടാക്‌റ്റുകളിലേക്ക് ചേർക്കുക"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"കൂടുതൽ ഓപ്ഷനുകൾ"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ഓവർഫ്ലോ അവസാനിപ്പിക്കുക"</string>
-    <string name="abc_share" msgid="7091841667818715717">"പങ്കിടുക"</string>
+    <string name="email" msgid="6099716515489216517">"ഇമെയിൽ അയയ്ക്കൂ"</string>
+    <string name="email_desc" msgid="2189760120923982860">"തിരഞ്ഞെടുത്ത വിലാസത്തിലേക്ക് ഇമെയിൽ അയയ്ക്കുക"</string>
+    <string name="dial" msgid="2101464860090311277">"വിളിക്കുക"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"തിരഞ്ഞെടുത്ത ഫോൺ നമ്പറിലേക്ക് വിളിക്കുക"</string>
+    <string name="browse" msgid="4753676368851695348">"തുറക്കുക"</string>
+    <string name="browse_desc" msgid="728882176434276995">"തിരഞ്ഞെടുത്ത URL തുറക്കുക"</string>
+    <string name="sms" msgid="2214738262605167054">"സന്ദേശം അയയ്ക്കൂ"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"തിരഞ്ഞെടുത്ത ഫോൺ നമ്പറിലേക്ക് സന്ദേശം അയയ്ക്കുക"</string>
+    <string name="add_contact" msgid="386263007484061034">"ചേർക്കുക"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"കോൺടാക്‌റ്റുകളിലേക്ക് ചേർക്കുക"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"കൂടുതൽ ഓപ്ഷനുകൾ"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ഓവർഫ്ലോ അവസാനിപ്പിക്കുക"</string>
+    <string name="abc_share" msgid="37557693057519685">"പങ്കിടുക"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-mn/strings.xml b/textclassifier/textclassifier/src/main/res/values-mn/strings.xml
index 9dfd17b..a30d5b5 100644
--- a/textclassifier/textclassifier/src/main/res/values-mn/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-mn/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Имэйл бичих"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Сонгосон хаяг руу имэйл илгээх"</string>
-    <string name="dial" msgid="7317293545368448453">"Залгах"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Сонгосон утасны дугаар руу залгах"</string>
-    <string name="browse" msgid="3733970143542020945">"Нээх"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Сонгосон URL-г нээх"</string>
-    <string name="sms" msgid="5495416906312064886">"Мессеж бичих"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Сонгосон утасны дугаар руу мессеж илгээх"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Нэмэх"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Харилцагчид нэмэх"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Бусад сонголт"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Илүү зүйлсийг хаах"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Хуваалцах"</string>
+    <string name="email" msgid="6099716515489216517">"Имэйл бичих"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Сонгосон хаяг руу имэйл илгээх"</string>
+    <string name="dial" msgid="2101464860090311277">"Залгах"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Сонгосон утасны дугаар руу залгах"</string>
+    <string name="browse" msgid="4753676368851695348">"Нээх"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Сонгосон URL-г нээх"</string>
+    <string name="sms" msgid="2214738262605167054">"Мессеж бичих"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Сонгосон утасны дугаар руу мессеж илгээх"</string>
+    <string name="add_contact" msgid="386263007484061034">"Нэмэх"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Харилцагчид нэмэх"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Бусад сонголт"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Илүү зүйлсийг хаах"</string>
+    <string name="abc_share" msgid="37557693057519685">"Хуваалцах"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-mr/strings.xml b/textclassifier/textclassifier/src/main/res/values-mr/strings.xml
index a656460..15c6680 100644
--- a/textclassifier/textclassifier/src/main/res/values-mr/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-mr/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ईमेल करा"</string>
-    <string name="email_desc" msgid="6941280589171810022">"निवडलेल्या ॲड्रेसवर ईमेल करा"</string>
-    <string name="dial" msgid="7317293545368448453">"कॉल करा"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"निवडलेल्या फोन नंबरवर कॉल करा"</string>
-    <string name="browse" msgid="3733970143542020945">"उघडा"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"निवडलेली URL उघडा"</string>
-    <string name="sms" msgid="5495416906312064886">"मेसेज करा"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"निवडलेल्या फोन नंबरवर मेसेज करा"</string>
-    <string name="add_contact" msgid="9005634177208282449">"जोडा"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"संपर्कांमध्ये जोडा"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"आणखी पर्याय"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ओव्हरफ्लो बंद करा"</string>
-    <string name="abc_share" msgid="7091841667818715717">"शेअर करा"</string>
+    <string name="email" msgid="6099716515489216517">"ईमेल करा"</string>
+    <string name="email_desc" msgid="2189760120923982860">"निवडलेल्या ॲड्रेसवर ईमेल करा"</string>
+    <string name="dial" msgid="2101464860090311277">"कॉल करा"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"निवडलेल्या फोन नंबरवर कॉल करा"</string>
+    <string name="browse" msgid="4753676368851695348">"उघडा"</string>
+    <string name="browse_desc" msgid="728882176434276995">"निवडलेली URL उघडा"</string>
+    <string name="sms" msgid="2214738262605167054">"मेसेज करा"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"निवडलेल्या फोन नंबरवर मेसेज करा"</string>
+    <string name="add_contact" msgid="386263007484061034">"जोडा"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"संपर्कांमध्ये जोडा"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"आणखी पर्याय"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ओव्हरफ्लो बंद करा"</string>
+    <string name="abc_share" msgid="37557693057519685">"शेअर करा"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ms/strings.xml b/textclassifier/textclassifier/src/main/res/values-ms/strings.xml
index 532aa75..d38b057 100644
--- a/textclassifier/textclassifier/src/main/res/values-ms/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ms/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"E-mel"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Hantar e-mel ke alamat yang dipilih"</string>
-    <string name="dial" msgid="7317293545368448453">"Panggil"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Panggil nombor telefon yang dipilih"</string>
-    <string name="browse" msgid="3733970143542020945">"Buka"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Buka URL yang dipilih"</string>
-    <string name="sms" msgid="5495416906312064886">"Mesej"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Hantar mesej kepada nombor telefon yang dipilih"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Tambah"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Tambahkan pada kenalan"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Lagi pilihan"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Tutup limpahan"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Kongsi"</string>
+    <string name="email" msgid="6099716515489216517">"E-mel"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Hantar e-mel ke alamat yang dipilih"</string>
+    <string name="dial" msgid="2101464860090311277">"Panggil"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Panggil nombor telefon yang dipilih"</string>
+    <string name="browse" msgid="4753676368851695348">"Buka"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Buka URL yang dipilih"</string>
+    <string name="sms" msgid="2214738262605167054">"Mesej"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Hantar mesej kepada nombor telefon yang dipilih"</string>
+    <string name="add_contact" msgid="386263007484061034">"Tambah"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Tambahkan pada kenalan"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Lagi pilihan"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Tutup limpahan"</string>
+    <string name="abc_share" msgid="37557693057519685">"Kongsi"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-my/strings.xml b/textclassifier/textclassifier/src/main/res/values-my/strings.xml
index 78edba2..a806453 100644
--- a/textclassifier/textclassifier/src/main/res/values-my/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-my/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"အီးမေးလ်ပို့ရန်"</string>
-    <string name="email_desc" msgid="6941280589171810022">"ရွေးထားသည့် လိပ်စာသို့ အီးမေးလ်ပို့ရန်"</string>
-    <string name="dial" msgid="7317293545368448453">"ခေါ်ဆိုရန်"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"ရွေးထားသည့် ဖုန်းနံပါတ်ကို ခေါ်ရန်"</string>
-    <string name="browse" msgid="3733970143542020945">"ဖွင့်ရန်"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"ရွေးထားသည့် URL ကို ဖွင့်ရန်"</string>
-    <string name="sms" msgid="5495416906312064886">"မက်ဆေ့ဂျ်ပို့ရန်"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"ရွေးထားသည့် ဖုန်းနံပါတ်ကို မက်ဆေ့ဂျ်ပို့ရန်"</string>
-    <string name="add_contact" msgid="9005634177208282449">"ထည့်ရန်"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"အဆက်အသွယ်များသို့ ထည့်ရန်"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"နောက်ထပ် ရွေးစရာများ"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"အပိုမီနူးကို ပိတ်ရန်"</string>
-    <string name="abc_share" msgid="7091841667818715717">"မျှဝေရန်"</string>
+    <string name="email" msgid="6099716515489216517">"အီးမေးလ်ပို့ရန်"</string>
+    <string name="email_desc" msgid="2189760120923982860">"ရွေးထားသည့် လိပ်စာသို့ အီးမေးလ်ပို့ရန်"</string>
+    <string name="dial" msgid="2101464860090311277">"ခေါ်ဆိုရန်"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"ရွေးထားသည့် ဖုန်းနံပါတ်ကို ခေါ်ရန်"</string>
+    <string name="browse" msgid="4753676368851695348">"ဖွင့်ရန်"</string>
+    <string name="browse_desc" msgid="728882176434276995">"ရွေးထားသည့် URL ကို ဖွင့်ရန်"</string>
+    <string name="sms" msgid="2214738262605167054">"မက်ဆေ့ဂျ်ပို့ရန်"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"ရွေးထားသည့် ဖုန်းနံပါတ်ကို မက်ဆေ့ဂျ်ပို့ရန်"</string>
+    <string name="add_contact" msgid="386263007484061034">"ထည့်ရန်"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"အဆက်အသွယ်များသို့ ထည့်ရန်"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"နောက်ထပ် ရွေးစရာများ"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"အပိုမီနူးကို ပိတ်ရန်"</string>
+    <string name="abc_share" msgid="37557693057519685">"မျှဝေရန်"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-nb/strings.xml b/textclassifier/textclassifier/src/main/res/values-nb/strings.xml
index 1959f52..13d2c5b 100644
--- a/textclassifier/textclassifier/src/main/res/values-nb/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-nb/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Send e-post"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Send e-post til den valgte adressen"</string>
-    <string name="dial" msgid="7317293545368448453">"Ring"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Ring det valgte telefonnummeret"</string>
-    <string name="browse" msgid="3733970143542020945">"Åpne"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Åpne den valgte nettadressen"</string>
-    <string name="sms" msgid="5495416906312064886">"Send melding"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Send melding til det valgte telefonnummeret"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Legg til"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Legg til i kontakter"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Flere alternativer"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Lukk overflytsmenyen"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Del"</string>
+    <string name="email" msgid="6099716515489216517">"Send e-post"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Send e-post til den valgte adressen"</string>
+    <string name="dial" msgid="2101464860090311277">"Ring"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Ring det valgte telefonnummeret"</string>
+    <string name="browse" msgid="4753676368851695348">"Åpne"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Åpne den valgte nettadressen"</string>
+    <string name="sms" msgid="2214738262605167054">"Send melding"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Send melding til det valgte telefonnummeret"</string>
+    <string name="add_contact" msgid="386263007484061034">"Legg til"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Legg til i kontakter"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Flere alternativer"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Lukk overflytsmenyen"</string>
+    <string name="abc_share" msgid="37557693057519685">"Del"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ne/strings.xml b/textclassifier/textclassifier/src/main/res/values-ne/strings.xml
index 34325fe..4e70755 100644
--- a/textclassifier/textclassifier/src/main/res/values-ne/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ne/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"इमेल गर्नुहोस्"</string>
-    <string name="email_desc" msgid="6941280589171810022">"चयन गरिएको ठेगानामा इमेल पठाउनुहोस्"</string>
-    <string name="dial" msgid="7317293545368448453">"कल गर्नुहोस्"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"चयन गरिएको फोन नम्बरमा कल गर्नुहोस्"</string>
-    <string name="browse" msgid="3733970143542020945">"खोल्नुहोस्"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"चयन गरिएको URL खोल्नुहोस्"</string>
-    <string name="sms" msgid="5495416906312064886">"सन्देश पठाउनुहोस्"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"चयन गरिएको फोन नम्बरमा सन्देश पठाउनुहोस्‌"</string>
-    <string name="add_contact" msgid="9005634177208282449">"थप्नुहोस्"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"सम्पर्कहरूमा थप्नुहोस्"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"थप विकल्पहरू"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ओभरफ्लो बन्द गर्नुहोस्"</string>
-    <string name="abc_share" msgid="7091841667818715717">"साझा गर्नु…"</string>
+    <string name="email" msgid="6099716515489216517">"इमेल गर्नुहोस्"</string>
+    <string name="email_desc" msgid="2189760120923982860">"चयन गरिएको ठेगानामा इमेल पठाउनुहोस्"</string>
+    <string name="dial" msgid="2101464860090311277">"कल गर्नुहोस्"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"चयन गरिएको फोन नम्बरमा कल गर्नुहोस्"</string>
+    <string name="browse" msgid="4753676368851695348">"खोल्नुहोस्"</string>
+    <string name="browse_desc" msgid="728882176434276995">"चयन गरिएको URL खोल्नुहोस्"</string>
+    <string name="sms" msgid="2214738262605167054">"सन्देश पठाउनुहोस्"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"चयन गरिएको फोन नम्बरमा सन्देश पठाउनुहोस्‌"</string>
+    <string name="add_contact" msgid="386263007484061034">"थप्नुहोस्"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"सम्पर्कहरूमा थप्नुहोस्"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"थप विकल्पहरू"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ओभरफ्लो बन्द गर्नुहोस्"</string>
+    <string name="abc_share" msgid="37557693057519685">"साझा गर्नु…"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-nl/strings.xml b/textclassifier/textclassifier/src/main/res/values-nl/strings.xml
index 74af681..5cc1ceb 100644
--- a/textclassifier/textclassifier/src/main/res/values-nl/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-nl/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"E-mailen"</string>
-    <string name="email_desc" msgid="6941280589171810022">"E-mail sturen aan geselecteerd e-mailadres"</string>
-    <string name="dial" msgid="7317293545368448453">"Bellen"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Geselecteerd telefoonnummer bellen"</string>
-    <string name="browse" msgid="3733970143542020945">"Openen"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Geselecteerde URL openen"</string>
-    <string name="sms" msgid="5495416906312064886">"Bericht verzenden"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Sms sturen aan geselecteerd telefoonnummer"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Toevoegen"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Toevoegen aan contacten"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Meer opties"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Overloop sluiten"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Delen"</string>
+    <string name="email" msgid="6099716515489216517">"E-mailen"</string>
+    <string name="email_desc" msgid="2189760120923982860">"E-mail sturen aan geselecteerd e-mailadres"</string>
+    <string name="dial" msgid="2101464860090311277">"Bellen"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Geselecteerd telefoonnummer bellen"</string>
+    <string name="browse" msgid="4753676368851695348">"Openen"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Geselecteerde URL openen"</string>
+    <string name="sms" msgid="2214738262605167054">"Bericht verzenden"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Sms sturen aan geselecteerd telefoonnummer"</string>
+    <string name="add_contact" msgid="386263007484061034">"Toevoegen"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Toevoegen aan contacten"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Meer opties"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Overloop sluiten"</string>
+    <string name="abc_share" msgid="37557693057519685">"Delen"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-or/strings.xml b/textclassifier/textclassifier/src/main/res/values-or/strings.xml
index 4b3aa2c9..86dfeef 100644
--- a/textclassifier/textclassifier/src/main/res/values-or/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-or/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ଇମେଲ୍"</string>
-    <string name="email_desc" msgid="6941280589171810022">"ଚୟନିତ ଠିକଣାକୁ ଇମେଲ୍‌ ପଠାନ୍ତୁ"</string>
-    <string name="dial" msgid="7317293545368448453">"କଲ୍‍"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"ଚୟନିତ ଫୋନ୍‌ ନମ୍ବର୍‌କୁ କଲ୍‌ କରନ୍ତୁ"</string>
-    <string name="browse" msgid="3733970143542020945">"ଖୋଲନ୍ତୁ"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"ଚୟନିତ URL ଖୋଲନ୍ତୁ"</string>
-    <string name="sms" msgid="5495416906312064886">"ମେସେଜ୍"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"ଚୟନିତ ଫୋନ୍‌ ନମ୍ବର୍‌କୁ ମେସେଜ୍‌ ପଠାନ୍ତୁ"</string>
-    <string name="add_contact" msgid="9005634177208282449">"ଯୋଗ କରନ୍ତୁ"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"ଯୋଗାଯୋଗରେ ଯୋଗ କରନ୍ତୁ"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"ଅଧିକ ବିକଳ୍ପ"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ଓଭରଫ୍ଲୋ ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="abc_share" msgid="7091841667818715717">"ସେୟାର୍ କରନ୍ତୁ"</string>
+    <string name="email" msgid="6099716515489216517">"ଇମେଲ୍"</string>
+    <string name="email_desc" msgid="2189760120923982860">"ଚୟନିତ ଠିକଣାକୁ ଇମେଲ୍‌ ପଠାନ୍ତୁ"</string>
+    <string name="dial" msgid="2101464860090311277">"କଲ୍‍"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"ଚୟନିତ ଫୋନ୍‌ ନମ୍ବର୍‌କୁ କଲ୍‌ କରନ୍ତୁ"</string>
+    <string name="browse" msgid="4753676368851695348">"ଖୋଲନ୍ତୁ"</string>
+    <string name="browse_desc" msgid="728882176434276995">"ଚୟନିତ URL ଖୋଲନ୍ତୁ"</string>
+    <string name="sms" msgid="2214738262605167054">"ମେସେଜ୍"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"ଚୟନିତ ଫୋନ୍‌ ନମ୍ବର୍‌କୁ ମେସେଜ୍‌ ପଠାନ୍ତୁ"</string>
+    <string name="add_contact" msgid="386263007484061034">"ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"ଯୋଗାଯୋଗରେ ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"ଅଧିକ ବିକଳ୍ପ"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ଓଭରଫ୍ଲୋ ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="abc_share" msgid="37557693057519685">"ସେୟାର୍ କରନ୍ତୁ"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-pa/strings.xml b/textclassifier/textclassifier/src/main/res/values-pa/strings.xml
index 004bc9c..5ebe087 100644
--- a/textclassifier/textclassifier/src/main/res/values-pa/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-pa/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ਈਮੇਲ ਖੋਲ੍ਹੋ"</string>
-    <string name="email_desc" msgid="6941280589171810022">"ਚੁਣੇ ਹੋਏ ਪਤੇ \'ਤੇ ਈਮੇਲ ਭੇਜੋ"</string>
-    <string name="dial" msgid="7317293545368448453">"ਕਾਲ ਕਰੋ"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"ਚੁਣੇ ਗਏ ਫ਼ੋਨ ਨੰਬਰ \'ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="browse" msgid="3733970143542020945">"ਖੋਲ੍ਹੋ"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"ਚੁਣਿਆ ਗਿਆ URL ਖੋਲ੍ਹੋ"</string>
-    <string name="sms" msgid="5495416906312064886">"ਸੁਨੇਹਾ ਖੋਲ੍ਹੋ"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"ਚੁਣੇ ਗਏ ਫ਼ੋਨ ਨੰਬਰ \'ਤੇ ਸੁਨੇਹਾ ਭੇਜੋ"</string>
-    <string name="add_contact" msgid="9005634177208282449">"ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"ਹੋਰ ਵਿਕਲਪ"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ਓਵਰਫਲੋ ਬੰਦ ਕਰੋ"</string>
-    <string name="abc_share" msgid="7091841667818715717">"ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="email" msgid="6099716515489216517">"ਈਮੇਲ ਖੋਲ੍ਹੋ"</string>
+    <string name="email_desc" msgid="2189760120923982860">"ਚੁਣੇ ਹੋਏ ਪਤੇ \'ਤੇ ਈਮੇਲ ਭੇਜੋ"</string>
+    <string name="dial" msgid="2101464860090311277">"ਕਾਲ ਕਰੋ"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"ਚੁਣੇ ਗਏ ਫ਼ੋਨ ਨੰਬਰ \'ਤੇ ਕਾਲ ਕਰੋ"</string>
+    <string name="browse" msgid="4753676368851695348">"ਖੋਲ੍ਹੋ"</string>
+    <string name="browse_desc" msgid="728882176434276995">"ਚੁਣਿਆ ਗਿਆ URL ਖੋਲ੍ਹੋ"</string>
+    <string name="sms" msgid="2214738262605167054">"ਸੁਨੇਹਾ ਖੋਲ੍ਹੋ"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"ਚੁਣੇ ਗਏ ਫ਼ੋਨ ਨੰਬਰ \'ਤੇ ਸੁਨੇਹਾ ਭੇਜੋ"</string>
+    <string name="add_contact" msgid="386263007484061034">"ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"ਹੋਰ ਵਿਕਲਪ"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ਓਵਰਫਲੋ ਬੰਦ ਕਰੋ"</string>
+    <string name="abc_share" msgid="37557693057519685">"ਸਾਂਝਾ ਕਰੋ"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-pl/strings.xml b/textclassifier/textclassifier/src/main/res/values-pl/strings.xml
index 226a98d..974dd4d 100644
--- a/textclassifier/textclassifier/src/main/res/values-pl/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-pl/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Wyślij e-maila"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Wyślij e-maila na wybrany adres"</string>
-    <string name="dial" msgid="7317293545368448453">"Zadzwoń"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Zadzwoń pod wybrany numer telefonu"</string>
-    <string name="browse" msgid="3733970143542020945">"Otwórz"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Otwórz wybrany adres URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Wyślij SMS-a"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Wyślij SMS-a pod wybrany numer telefonu"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Dodaj"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Dodaj do kontaktów"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Więcej opcji"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Zamknij rozszerzony pasek"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Udostępnij"</string>
+    <string name="email" msgid="6099716515489216517">"Wyślij e-maila"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Wyślij e-maila na wybrany adres"</string>
+    <string name="dial" msgid="2101464860090311277">"Zadzwoń"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Zadzwoń pod wybrany numer telefonu"</string>
+    <string name="browse" msgid="4753676368851695348">"Otwórz"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Otwórz wybrany adres URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Wyślij SMS-a"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Wyślij SMS-a pod wybrany numer telefonu"</string>
+    <string name="add_contact" msgid="386263007484061034">"Dodaj"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Dodaj do kontaktów"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Więcej opcji"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Zamknij rozszerzony pasek"</string>
+    <string name="abc_share" msgid="37557693057519685">"Udostępnij"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-pt-rBR/strings.xml b/textclassifier/textclassifier/src/main/res/values-pt-rBR/strings.xml
index 11396b6..dd99fd5 100644
--- a/textclassifier/textclassifier/src/main/res/values-pt-rBR/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-pt-rBR/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"E-mail"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Enviar e-mail para o endereço selecionado"</string>
-    <string name="dial" msgid="7317293545368448453">"Ligar"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Ligar para o número de telefone selecionado"</string>
-    <string name="browse" msgid="3733970143542020945">"Abrir"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Abrir URL selecionado"</string>
-    <string name="sms" msgid="5495416906312064886">"Mensagem"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Enviar mensagem para o número de telefone selecionado"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Adicionar"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Adicionar aos contatos"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Mais opções"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Fechar menu flutuante"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Compart."</string>
+    <string name="email" msgid="6099716515489216517">"E-mail"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Enviar e-mail para o endereço selecionado"</string>
+    <string name="dial" msgid="2101464860090311277">"Ligar"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Ligar para o número de telefone selecionado"</string>
+    <string name="browse" msgid="4753676368851695348">"Abrir"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Abrir URL selecionado"</string>
+    <string name="sms" msgid="2214738262605167054">"Mensagem"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Enviar mensagem para o número de telefone selecionado"</string>
+    <string name="add_contact" msgid="386263007484061034">"Adicionar"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Adicionar aos contatos"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Mais opções"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Fechar menu flutuante"</string>
+    <string name="abc_share" msgid="37557693057519685">"Compart."</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-pt-rPT/strings.xml b/textclassifier/textclassifier/src/main/res/values-pt-rPT/strings.xml
index c1ff32b..26c210e 100644
--- a/textclassifier/textclassifier/src/main/res/values-pt-rPT/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-pt-rPT/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Enviar um email para o endereço selecionado"</string>
-    <string name="dial" msgid="7317293545368448453">"Ligar"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Ligar para o número de telefone selecionado"</string>
-    <string name="browse" msgid="3733970143542020945">"Abrir"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Abrir o URL selecionado"</string>
-    <string name="sms" msgid="5495416906312064886">"Enviar mensagem"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Enviar uma mensagem para o número de telefone selecionado"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Adicionar"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Adicionar aos contactos"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Mais opções"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Fechar menu adicional"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Partilhar"</string>
+    <string name="email" msgid="6099716515489216517">"Email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Enviar um email para o endereço selecionado"</string>
+    <string name="dial" msgid="2101464860090311277">"Ligar"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Ligar para o número de telefone selecionado"</string>
+    <string name="browse" msgid="4753676368851695348">"Abrir"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Abrir o URL selecionado"</string>
+    <string name="sms" msgid="2214738262605167054">"Enviar mensagem"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Enviar uma mensagem para o número de telefone selecionado"</string>
+    <string name="add_contact" msgid="386263007484061034">"Adicionar"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Adicionar aos contactos"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Mais opções"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Fechar menu adicional"</string>
+    <string name="abc_share" msgid="37557693057519685">"Partilhar"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-pt/strings.xml b/textclassifier/textclassifier/src/main/res/values-pt/strings.xml
index 11396b6..dd99fd5 100644
--- a/textclassifier/textclassifier/src/main/res/values-pt/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-pt/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"E-mail"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Enviar e-mail para o endereço selecionado"</string>
-    <string name="dial" msgid="7317293545368448453">"Ligar"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Ligar para o número de telefone selecionado"</string>
-    <string name="browse" msgid="3733970143542020945">"Abrir"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Abrir URL selecionado"</string>
-    <string name="sms" msgid="5495416906312064886">"Mensagem"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Enviar mensagem para o número de telefone selecionado"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Adicionar"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Adicionar aos contatos"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Mais opções"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Fechar menu flutuante"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Compart."</string>
+    <string name="email" msgid="6099716515489216517">"E-mail"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Enviar e-mail para o endereço selecionado"</string>
+    <string name="dial" msgid="2101464860090311277">"Ligar"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Ligar para o número de telefone selecionado"</string>
+    <string name="browse" msgid="4753676368851695348">"Abrir"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Abrir URL selecionado"</string>
+    <string name="sms" msgid="2214738262605167054">"Mensagem"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Enviar mensagem para o número de telefone selecionado"</string>
+    <string name="add_contact" msgid="386263007484061034">"Adicionar"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Adicionar aos contatos"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Mais opções"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Fechar menu flutuante"</string>
+    <string name="abc_share" msgid="37557693057519685">"Compart."</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ro/strings.xml b/textclassifier/textclassifier/src/main/res/values-ro/strings.xml
index 3656640..63aae92 100644
--- a/textclassifier/textclassifier/src/main/res/values-ro/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ro/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Trimiteți un e-mail"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Trimiteți un e-mail la adresa selectată"</string>
-    <string name="dial" msgid="7317293545368448453">"Sunați"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Sunați la numărul de telefon selectat"</string>
-    <string name="browse" msgid="3733970143542020945">"Deschideți"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Deschideți adresa URL selectată"</string>
-    <string name="sms" msgid="5495416906312064886">"Trimiteți mesaj"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Trimiteți un mesaj la numărul de telefon selectat"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Adăugați"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Adăugați în agendă"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Mai multe opțiuni"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Închideți meniul suplimentar"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Trimiteți"</string>
+    <string name="email" msgid="6099716515489216517">"Trimiteți un e-mail"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Trimiteți un e-mail la adresa selectată"</string>
+    <string name="dial" msgid="2101464860090311277">"Sunați"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Sunați la numărul de telefon selectat"</string>
+    <string name="browse" msgid="4753676368851695348">"Deschideți"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Deschideți adresa URL selectată"</string>
+    <string name="sms" msgid="2214738262605167054">"Trimiteți mesaj"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Trimiteți un mesaj la numărul de telefon selectat"</string>
+    <string name="add_contact" msgid="386263007484061034">"Adăugați"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Adăugați în agendă"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Mai multe opțiuni"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Închideți meniul suplimentar"</string>
+    <string name="abc_share" msgid="37557693057519685">"Trimiteți"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ru/strings.xml b/textclassifier/textclassifier/src/main/res/values-ru/strings.xml
index c3e4610..9272a51 100644
--- a/textclassifier/textclassifier/src/main/res/values-ru/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ru/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Написать письмо"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Отправить письмо выбранному адресату"</string>
-    <string name="dial" msgid="7317293545368448453">"Позвонить"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Позвонить по выбранному номеру"</string>
-    <string name="browse" msgid="3733970143542020945">"Открыть"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Открыть выбранный URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Отправить SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Отправить SMS на выбранный номер"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Добавить"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Добавить в контакты"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Ещё"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Закрыть дополнительное меню"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Поделиться"</string>
+    <string name="email" msgid="6099716515489216517">"Написать письмо"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Отправить письмо выбранному адресату"</string>
+    <string name="dial" msgid="2101464860090311277">"Позвонить"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Позвонить по выбранному номеру"</string>
+    <string name="browse" msgid="4753676368851695348">"Открыть"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Открыть выбранный URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Отправить SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Отправить SMS на выбранный номер"</string>
+    <string name="add_contact" msgid="386263007484061034">"Добавить"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Добавить в контакты"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Ещё"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Закрыть дополнительное меню"</string>
+    <string name="abc_share" msgid="37557693057519685">"Поделиться"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-si/strings.xml b/textclassifier/textclassifier/src/main/res/values-si/strings.xml
index 7fe0a90..536ce32 100644
--- a/textclassifier/textclassifier/src/main/res/values-si/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-si/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ඊ-තැපෑල"</string>
-    <string name="email_desc" msgid="6941280589171810022">"තෝරා ගත් ලිපිනයට ඊ-තැපැල් කරන්න"</string>
-    <string name="dial" msgid="7317293545368448453">"අමතන්න"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"තෝරා ගත් දුරකථන අංකය අමතන්න"</string>
-    <string name="browse" msgid="3733970143542020945">"විවෘතයි"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"තෝරා ගත් URL විවෘත කරන්න"</string>
-    <string name="sms" msgid="5495416906312064886">"පණිවුඩය"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"තෝරා ගත් දුරකථන අංකයට පණිවිඩයක් යවන්න"</string>
-    <string name="add_contact" msgid="9005634177208282449">"එක් කරන්න"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"සම්බන්ධතාවලට එක් කරන්න"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"තවත් විකල්ප"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ඉතිරී යාම වසන්න"</string>
-    <string name="abc_share" msgid="7091841667818715717">"බෙදාගන්න"</string>
+    <string name="email" msgid="6099716515489216517">"ඊ-තැපෑල"</string>
+    <string name="email_desc" msgid="2189760120923982860">"තෝරා ගත් ලිපිනයට ඊ-තැපැල් කරන්න"</string>
+    <string name="dial" msgid="2101464860090311277">"අමතන්න"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"තෝරා ගත් දුරකථන අංකය අමතන්න"</string>
+    <string name="browse" msgid="4753676368851695348">"විවෘතයි"</string>
+    <string name="browse_desc" msgid="728882176434276995">"තෝරා ගත් URL විවෘත කරන්න"</string>
+    <string name="sms" msgid="2214738262605167054">"පණිවුඩය"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"තෝරා ගත් දුරකථන අංකයට පණිවිඩයක් යවන්න"</string>
+    <string name="add_contact" msgid="386263007484061034">"එක් කරන්න"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"සම්බන්ධතාවලට එක් කරන්න"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"තවත් විකල්ප"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ඉතිරී යාම වසන්න"</string>
+    <string name="abc_share" msgid="37557693057519685">"බෙදාගන්න"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-sk/strings.xml b/textclassifier/textclassifier/src/main/res/values-sk/strings.xml
index 067fcd5..27c3a25 100644
--- a/textclassifier/textclassifier/src/main/res/values-sk/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-sk/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Poslať e‑mail"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Napísať na vybranú e‑mailovú adresu"</string>
-    <string name="dial" msgid="7317293545368448453">"Volať"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Zavolať na vybrané telefónne číslo"</string>
-    <string name="browse" msgid="3733970143542020945">"Otvoriť"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Otvoriť vybranú webovú adresu"</string>
-    <string name="sms" msgid="5495416906312064886">"Poslať SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Poslať SMS na vybrané telefónne číslo"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Pridať"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Pridať do kontaktov"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Ďalšie možnosti"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Zatvoriť rozšírenú ponuku"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Zdieľať"</string>
+    <string name="email" msgid="6099716515489216517">"Poslať e‑mail"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Napísať na vybranú e‑mailovú adresu"</string>
+    <string name="dial" msgid="2101464860090311277">"Volať"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Zavolať na vybrané telefónne číslo"</string>
+    <string name="browse" msgid="4753676368851695348">"Otvoriť"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Otvoriť vybranú webovú adresu"</string>
+    <string name="sms" msgid="2214738262605167054">"Poslať SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Poslať SMS na vybrané telefónne číslo"</string>
+    <string name="add_contact" msgid="386263007484061034">"Pridať"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Pridať do kontaktov"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Ďalšie možnosti"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Zatvoriť rozšírenú ponuku"</string>
+    <string name="abc_share" msgid="37557693057519685">"Zdieľať"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-sl/strings.xml b/textclassifier/textclassifier/src/main/res/values-sl/strings.xml
index 9cf16f6..e048a4c 100644
--- a/textclassifier/textclassifier/src/main/res/values-sl/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-sl/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Odpri e-pošto"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Pošlji e-poštno sporočilo na izbrani naslov"</string>
-    <string name="dial" msgid="7317293545368448453">"Pokliči"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Pokliči izbrano telefonsko številko"</string>
-    <string name="browse" msgid="3733970143542020945">"Odpri"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Odpri izbrani URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Pošlji SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Pošlji SMS na izbrano telefonsko številko"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Dodaj"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Dodaj med stike"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Več možnosti"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Zapiranje dodatnih elementov"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Skup. raba"</string>
+    <string name="email" msgid="6099716515489216517">"Odpri e-pošto"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Pošlji e-poštno sporočilo na izbrani naslov"</string>
+    <string name="dial" msgid="2101464860090311277">"Pokliči"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Pokliči izbrano telefonsko številko"</string>
+    <string name="browse" msgid="4753676368851695348">"Odpri"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Odpri izbrani URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Pošlji SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Pošlji SMS na izbrano telefonsko številko"</string>
+    <string name="add_contact" msgid="386263007484061034">"Dodaj"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Dodaj med stike"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Več možnosti"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Zapiranje dodatnih elementov"</string>
+    <string name="abc_share" msgid="37557693057519685">"Skup. raba"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-sq/strings.xml b/textclassifier/textclassifier/src/main/res/values-sq/strings.xml
index 90f6619..2e8caaa 100644
--- a/textclassifier/textclassifier/src/main/res/values-sq/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-sq/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Dërgo email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Dërgo email tek adresa e zgjedhur"</string>
-    <string name="dial" msgid="7317293545368448453">"Telefono"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Telefono në numrin e zgjedhur të telefonit"</string>
-    <string name="browse" msgid="3733970143542020945">"Hap"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Hap URL-në e zgjedhur"</string>
-    <string name="sms" msgid="5495416906312064886">"Dërgo mesazh"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Dërgo mesazh te numri i zgjedhur i telefonit"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Shto"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Shto te kontaktet"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Opsione të tjera"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Mbylle tejkalimin"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Ndaj"</string>
+    <string name="email" msgid="6099716515489216517">"Dërgo email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Dërgo email tek adresa e zgjedhur"</string>
+    <string name="dial" msgid="2101464860090311277">"Telefono"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Telefono në numrin e zgjedhur të telefonit"</string>
+    <string name="browse" msgid="4753676368851695348">"Hap"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Hap URL-në e zgjedhur"</string>
+    <string name="sms" msgid="2214738262605167054">"Dërgo mesazh"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Dërgo mesazh te numri i zgjedhur i telefonit"</string>
+    <string name="add_contact" msgid="386263007484061034">"Shto"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Shto te kontaktet"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Opsione të tjera"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Mbylle tejkalimin"</string>
+    <string name="abc_share" msgid="37557693057519685">"Ndaj"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-sr/strings.xml b/textclassifier/textclassifier/src/main/res/values-sr/strings.xml
index e78986b..d8aa2c3 100644
--- a/textclassifier/textclassifier/src/main/res/values-sr/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-sr/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Пошаљи имејл"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Пошаљите имејл на изабрану адресу"</string>
-    <string name="dial" msgid="7317293545368448453">"Позови"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Позовите изабрани број телефона"</string>
-    <string name="browse" msgid="3733970143542020945">"Отвори"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Отворите изабрани URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Пошаљи SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Пошаљите SMS на изабрани број телефона"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Додај"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Додајте у контакте"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Још опција"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Затворите преклопни мени"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Дели"</string>
+    <string name="email" msgid="6099716515489216517">"Пошаљи имејл"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Пошаљите имејл на изабрану адресу"</string>
+    <string name="dial" msgid="2101464860090311277">"Позови"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Позовите изабрани број телефона"</string>
+    <string name="browse" msgid="4753676368851695348">"Отвори"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Отворите изабрани URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Пошаљи SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Пошаљите SMS на изабрани број телефона"</string>
+    <string name="add_contact" msgid="386263007484061034">"Додај"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Додајте у контакте"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Још опција"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Затворите преклопни мени"</string>
+    <string name="abc_share" msgid="37557693057519685">"Дели"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-sv/strings.xml b/textclassifier/textclassifier/src/main/res/values-sv/strings.xml
index 8a677c4..8fa44b4 100644
--- a/textclassifier/textclassifier/src/main/res/values-sv/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-sv/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Skicka e-post"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Skicka e-post till vald adress"</string>
-    <string name="dial" msgid="7317293545368448453">"Ring"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Ring valt telefonnummer"</string>
-    <string name="browse" msgid="3733970143542020945">"Öppna"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Öppna vald webbadress"</string>
-    <string name="sms" msgid="5495416906312064886">"Sms:a"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Skicka meddelande till valt telefonnummer"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Lägg till"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Lägg till i Kontakter"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Fler alternativ"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Dölj utökat verktygsfält"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Dela"</string>
+    <string name="email" msgid="6099716515489216517">"Skicka e-post"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Skicka e-post till vald adress"</string>
+    <string name="dial" msgid="2101464860090311277">"Ring"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Ring valt telefonnummer"</string>
+    <string name="browse" msgid="4753676368851695348">"Öppna"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Öppna vald webbadress"</string>
+    <string name="sms" msgid="2214738262605167054">"Sms:a"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Skicka meddelande till valt telefonnummer"</string>
+    <string name="add_contact" msgid="386263007484061034">"Lägg till"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Lägg till i Kontakter"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Fler alternativ"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Dölj utökat verktygsfält"</string>
+    <string name="abc_share" msgid="37557693057519685">"Dela"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-sw/strings.xml b/textclassifier/textclassifier/src/main/res/values-sw/strings.xml
index e940614..a54d1f0 100644
--- a/textclassifier/textclassifier/src/main/res/values-sw/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-sw/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Tuma barua pepe"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Tuma barua pepe kwa anwani uliyochagua"</string>
-    <string name="dial" msgid="7317293545368448453">"Piga simu"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Piga simu kwa nambari uliyochagua"</string>
-    <string name="browse" msgid="3733970143542020945">"Fungua"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Fungua URL uliyochagua"</string>
-    <string name="sms" msgid="5495416906312064886">"SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Tuma SMS kwa nambari ya simu uliyochagua"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Ongeza"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Ongeza kwenye anwani"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Chaguo zaidi"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Funga vipengee vya ziada"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Shiriki"</string>
+    <string name="email" msgid="6099716515489216517">"Tuma barua pepe"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Tuma barua pepe kwa anwani uliyochagua"</string>
+    <string name="dial" msgid="2101464860090311277">"Piga simu"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Piga simu kwa nambari uliyochagua"</string>
+    <string name="browse" msgid="4753676368851695348">"Fungua"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Fungua URL uliyochagua"</string>
+    <string name="sms" msgid="2214738262605167054">"SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Tuma SMS kwa nambari ya simu uliyochagua"</string>
+    <string name="add_contact" msgid="386263007484061034">"Ongeza"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Ongeza kwenye anwani"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Chaguo zaidi"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Funga vipengee vya ziada"</string>
+    <string name="abc_share" msgid="37557693057519685">"Shiriki"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ta/strings.xml b/textclassifier/textclassifier/src/main/res/values-ta/strings.xml
index c90ac79..73399a3 100644
--- a/textclassifier/textclassifier/src/main/res/values-ta/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ta/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"மின்னஞ்சல் அனுப்பு"</string>
-    <string name="email_desc" msgid="6941280589171810022">"தேர்ந்தெடுத்த முகவரிக்கு மின்னஞ்சலை அனுப்பும்"</string>
-    <string name="dial" msgid="7317293545368448453">"அழை"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"தேர்ந்தெடுத்த ஃபோன் எண்ணை அழைக்கும்"</string>
-    <string name="browse" msgid="3733970143542020945">"திற"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"தேர்ந்தெடுத்த URLலைத் திறக்கும்"</string>
-    <string name="sms" msgid="5495416906312064886">"செய்தி அனுப்பு"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"தேர்ந்தெடுத்த ஃபோன் எண்ணிற்கு மெசேஜ் அனுப்பும்"</string>
-    <string name="add_contact" msgid="9005634177208282449">"சேர்"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"தொடர்புகளில் சேர்க்கும்"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"மேலும் விருப்பங்கள்"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"மேல்தோன்றலை மூடும் பட்டன்"</string>
-    <string name="abc_share" msgid="7091841667818715717">"பகிர்"</string>
+    <string name="email" msgid="6099716515489216517">"மின்னஞ்சல் அனுப்பு"</string>
+    <string name="email_desc" msgid="2189760120923982860">"தேர்ந்தெடுத்த முகவரிக்கு மின்னஞ்சலை அனுப்பும்"</string>
+    <string name="dial" msgid="2101464860090311277">"அழை"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"தேர்ந்தெடுத்த ஃபோன் எண்ணை அழைக்கும்"</string>
+    <string name="browse" msgid="4753676368851695348">"திற"</string>
+    <string name="browse_desc" msgid="728882176434276995">"தேர்ந்தெடுத்த URLலைத் திறக்கும்"</string>
+    <string name="sms" msgid="2214738262605167054">"செய்தி அனுப்பு"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"தேர்ந்தெடுத்த ஃபோன் எண்ணிற்கு மெசேஜ் அனுப்பும்"</string>
+    <string name="add_contact" msgid="386263007484061034">"சேர்"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"தொடர்புகளில் சேர்க்கும்"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"மேலும் விருப்பங்கள்"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"மேல்தோன்றலை மூடும் பட்டன்"</string>
+    <string name="abc_share" msgid="37557693057519685">"பகிர்"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-te/strings.xml b/textclassifier/textclassifier/src/main/res/values-te/strings.xml
index 25e41ff..1585af8 100644
--- a/textclassifier/textclassifier/src/main/res/values-te/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-te/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ఇమెయిల్ పంపు"</string>
-    <string name="email_desc" msgid="6941280589171810022">"ఎంచుకున్న చిరునామాకు ఇమెయిల్‌ను పంపుతుంది"</string>
-    <string name="dial" msgid="7317293545368448453">"కాల్ చేయి"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"ఎంచుకున్న ఫోన్ నంబర్‌కు కాల్ చేస్తుంది"</string>
-    <string name="browse" msgid="3733970143542020945">"తెరువు"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"ఎంచుకున్న URLని తెరుస్తుంది"</string>
-    <string name="sms" msgid="5495416906312064886">"సందేశం పంపు"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"ఎంచుకున్న ఫోన్ నంబర్‌కి సందేశం పంపుతుంది"</string>
-    <string name="add_contact" msgid="9005634177208282449">"జోడించు"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"పరిచయాలకు జోడిస్తుంది"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"మరిన్ని ఎంపికలు"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"అతివ్యాప్తిని మూసివేస్తుంది"</string>
-    <string name="abc_share" msgid="7091841667818715717">"షేర్ చేయి"</string>
+    <string name="email" msgid="6099716515489216517">"ఇమెయిల్ పంపు"</string>
+    <string name="email_desc" msgid="2189760120923982860">"ఎంచుకున్న చిరునామాకు ఇమెయిల్‌ను పంపుతుంది"</string>
+    <string name="dial" msgid="2101464860090311277">"కాల్ చేయి"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"ఎంచుకున్న ఫోన్ నంబర్‌కు కాల్ చేస్తుంది"</string>
+    <string name="browse" msgid="4753676368851695348">"తెరువు"</string>
+    <string name="browse_desc" msgid="728882176434276995">"ఎంచుకున్న URLని తెరుస్తుంది"</string>
+    <string name="sms" msgid="2214738262605167054">"సందేశం పంపు"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"ఎంచుకున్న ఫోన్ నంబర్‌కి సందేశం పంపుతుంది"</string>
+    <string name="add_contact" msgid="386263007484061034">"జోడించు"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"పరిచయాలకు జోడిస్తుంది"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"మరిన్ని ఎంపికలు"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"అతివ్యాప్తిని మూసివేస్తుంది"</string>
+    <string name="abc_share" msgid="37557693057519685">"షేర్ చేయి"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-th/strings.xml b/textclassifier/textclassifier/src/main/res/values-th/strings.xml
index 27bcd84..76488e0 100644
--- a/textclassifier/textclassifier/src/main/res/values-th/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-th/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"อีเมล"</string>
-    <string name="email_desc" msgid="6941280589171810022">"ส่งอีเมลไปยังที่อยู่ที่เลือก"</string>
-    <string name="dial" msgid="7317293545368448453">"โทร"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"โทรหาหมายเลขโทรศัพท์ที่เลือก"</string>
-    <string name="browse" msgid="3733970143542020945">"เปิด"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"เปิด URL ที่เลือก"</string>
-    <string name="sms" msgid="5495416906312064886">"ข้อความ"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"ส่งข้อความไปยังหมายเลขโทรศัพท์ที่เลือก"</string>
-    <string name="add_contact" msgid="9005634177208282449">"เพิ่ม"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"เพิ่มในรายชื่อติดต่อ"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"ตัวเลือกอื่น"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"ปิดรายการเพิ่มเติม"</string>
-    <string name="abc_share" msgid="7091841667818715717">"แชร์"</string>
+    <string name="email" msgid="6099716515489216517">"อีเมล"</string>
+    <string name="email_desc" msgid="2189760120923982860">"ส่งอีเมลไปยังที่อยู่ที่เลือก"</string>
+    <string name="dial" msgid="2101464860090311277">"โทร"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"โทรหาหมายเลขโทรศัพท์ที่เลือก"</string>
+    <string name="browse" msgid="4753676368851695348">"เปิด"</string>
+    <string name="browse_desc" msgid="728882176434276995">"เปิด URL ที่เลือก"</string>
+    <string name="sms" msgid="2214738262605167054">"ข้อความ"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"ส่งข้อความไปยังหมายเลขโทรศัพท์ที่เลือก"</string>
+    <string name="add_contact" msgid="386263007484061034">"เพิ่ม"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"เพิ่มในรายชื่อติดต่อ"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"ตัวเลือกอื่น"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"ปิดรายการเพิ่มเติม"</string>
+    <string name="abc_share" msgid="37557693057519685">"แชร์"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-tl/strings.xml b/textclassifier/textclassifier/src/main/res/values-tl/strings.xml
index f75b004..b6fb943 100644
--- a/textclassifier/textclassifier/src/main/res/values-tl/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-tl/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Mag-email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Mag-email sa piniling address"</string>
-    <string name="dial" msgid="7317293545368448453">"Tumawag"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Tawagan ang piniling numero ng telepono"</string>
-    <string name="browse" msgid="3733970143542020945">"Buksan"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Buksan ang piniling URL"</string>
-    <string name="sms" msgid="5495416906312064886">"Magmensahe"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Padalhan ng mensahe ang piniling numero ng telepono"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Magdagdag"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Idagdag sa mga contact"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Higit pang opsyon"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Isara ang overflow"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Ibahagi"</string>
+    <string name="email" msgid="6099716515489216517">"Mag-email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Mag-email sa piniling address"</string>
+    <string name="dial" msgid="2101464860090311277">"Tumawag"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Tawagan ang piniling numero ng telepono"</string>
+    <string name="browse" msgid="4753676368851695348">"Buksan"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Buksan ang piniling URL"</string>
+    <string name="sms" msgid="2214738262605167054">"Magmensahe"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Padalhan ng mensahe ang piniling numero ng telepono"</string>
+    <string name="add_contact" msgid="386263007484061034">"Magdagdag"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Idagdag sa mga contact"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Higit pang opsyon"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Isara ang overflow"</string>
+    <string name="abc_share" msgid="37557693057519685">"Ibahagi"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-tr/strings.xml b/textclassifier/textclassifier/src/main/res/values-tr/strings.xml
index 044d43f..1f5cf82 100644
--- a/textclassifier/textclassifier/src/main/res/values-tr/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-tr/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"E-posta"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Seçilen adrese e-posta gönder"</string>
-    <string name="dial" msgid="7317293545368448453">"Telefon et"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Seçilen telefon numarasını ara"</string>
-    <string name="browse" msgid="3733970143542020945">"Aç"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Seçilen URL\'yi aç"</string>
-    <string name="sms" msgid="5495416906312064886">"Kısa mesaj gönder"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Seçilen telefon numarasına kısa mesaj gönder"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Ekle"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Kişilere ekle"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Diğer seçenekler"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Taşan araç çubuğunu kapat"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Paylaş"</string>
+    <string name="email" msgid="6099716515489216517">"E-posta"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Seçilen adrese e-posta gönder"</string>
+    <string name="dial" msgid="2101464860090311277">"Telefon et"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Seçilen telefon numarasını ara"</string>
+    <string name="browse" msgid="4753676368851695348">"Aç"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Seçilen URL\'yi aç"</string>
+    <string name="sms" msgid="2214738262605167054">"Kısa mesaj gönder"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Seçilen telefon numarasına kısa mesaj gönder"</string>
+    <string name="add_contact" msgid="386263007484061034">"Ekle"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Kişilere ekle"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Diğer seçenekler"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Taşan araç çubuğunu kapat"</string>
+    <string name="abc_share" msgid="37557693057519685">"Paylaş"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-uk/strings.xml b/textclassifier/textclassifier/src/main/res/values-uk/strings.xml
index a40df77..16696f9 100644
--- a/textclassifier/textclassifier/src/main/res/values-uk/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-uk/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Написати лист"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Надіслати електронний лист на вибрану адресу"</string>
-    <string name="dial" msgid="7317293545368448453">"Телефонувати"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Телефонувати за вибраним номером"</string>
-    <string name="browse" msgid="3733970143542020945">"Відкрити"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Відкрити вибрану URL-адресу"</string>
-    <string name="sms" msgid="5495416906312064886">"Написати SMS"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Надіслати повідомлення за вибраним номером телефону"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Додати"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Додати в контакти"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Більше опцій"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Закрити розширені інструменти"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Поділитися"</string>
+    <string name="email" msgid="6099716515489216517">"Написати лист"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Надіслати електронний лист на вибрану адресу"</string>
+    <string name="dial" msgid="2101464860090311277">"Телефонувати"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Телефонувати за вибраним номером"</string>
+    <string name="browse" msgid="4753676368851695348">"Відкрити"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Відкрити вибрану URL-адресу"</string>
+    <string name="sms" msgid="2214738262605167054">"Написати SMS"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Надіслати повідомлення за вибраним номером телефону"</string>
+    <string name="add_contact" msgid="386263007484061034">"Додати"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Додати в контакти"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Більше опцій"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Закрити розширені інструменти"</string>
+    <string name="abc_share" msgid="37557693057519685">"Поділитися"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-ur/strings.xml b/textclassifier/textclassifier/src/main/res/values-ur/strings.xml
index acdb424..cf29c7b 100644
--- a/textclassifier/textclassifier/src/main/res/values-ur/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-ur/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"ای میل بھیجیں"</string>
-    <string name="email_desc" msgid="6941280589171810022">"منتخب کردہ پتے پر ای میل کریں"</string>
-    <string name="dial" msgid="7317293545368448453">"کال کریں"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"منتخب کردہ فون نمبر پر کال کریں"</string>
-    <string name="browse" msgid="3733970143542020945">"کھولیں"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"‏منتخب کردہ URL کھولیں"</string>
-    <string name="sms" msgid="5495416906312064886">"پیغام بھیجیں"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"منتخب کردہ فون نمبر پر پیغام بھیجیں"</string>
-    <string name="add_contact" msgid="9005634177208282449">"شامل کریں"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"رابطوں میں شامل کریں"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"مزید اختیارات"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"اوورفلو بند کریں"</string>
-    <string name="abc_share" msgid="7091841667818715717">"شیئر کریں"</string>
+    <string name="email" msgid="6099716515489216517">"ای میل بھیجیں"</string>
+    <string name="email_desc" msgid="2189760120923982860">"منتخب کردہ پتے پر ای میل کریں"</string>
+    <string name="dial" msgid="2101464860090311277">"کال کریں"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"منتخب کردہ فون نمبر پر کال کریں"</string>
+    <string name="browse" msgid="4753676368851695348">"کھولیں"</string>
+    <string name="browse_desc" msgid="728882176434276995">"‏منتخب کردہ URL کھولیں"</string>
+    <string name="sms" msgid="2214738262605167054">"پیغام بھیجیں"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"منتخب کردہ فون نمبر پر پیغام بھیجیں"</string>
+    <string name="add_contact" msgid="386263007484061034">"شامل کریں"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"رابطوں میں شامل کریں"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"مزید اختیارات"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"اوورفلو بند کریں"</string>
+    <string name="abc_share" msgid="37557693057519685">"شیئر کریں"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-uz/strings.xml b/textclassifier/textclassifier/src/main/res/values-uz/strings.xml
index 9e31f76..20a0964 100644
--- a/textclassifier/textclassifier/src/main/res/values-uz/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-uz/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Belgilangan e-pochta manziliga xat yuborish"</string>
-    <string name="dial" msgid="7317293545368448453">"Chaqiruv"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Belgilangan raqamga telefon qilish"</string>
-    <string name="browse" msgid="3733970143542020945">"Ochish"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Belgilangan URL manzilini ochish"</string>
-    <string name="sms" msgid="5495416906312064886">"SMS yozish"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Belgilangan telefon raqamiga SMS yuborish"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Saqlab olish"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Kontaktlarga saqlash"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Yana"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Qalqib turuvchi asboblar panelini yopish"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Ulashish"</string>
+    <string name="email" msgid="6099716515489216517">"Email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Belgilangan e-pochta manziliga xat yuborish"</string>
+    <string name="dial" msgid="2101464860090311277">"Chaqiruv"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Belgilangan raqamga telefon qilish"</string>
+    <string name="browse" msgid="4753676368851695348">"Ochish"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Belgilangan URL manzilini ochish"</string>
+    <string name="sms" msgid="2214738262605167054">"SMS yozish"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Belgilangan telefon raqamiga SMS yuborish"</string>
+    <string name="add_contact" msgid="386263007484061034">"Saqlab olish"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Kontaktlarga saqlash"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Yana"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Qalqib turuvchi asboblar panelini yopish"</string>
+    <string name="abc_share" msgid="37557693057519685">"Ulashish"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-vi/strings.xml b/textclassifier/textclassifier/src/main/res/values-vi/strings.xml
index b06218c..9f7e529 100644
--- a/textclassifier/textclassifier/src/main/res/values-vi/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-vi/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"Gửi email"</string>
-    <string name="email_desc" msgid="6941280589171810022">"Gửi email đến địa chỉ đã chọn"</string>
-    <string name="dial" msgid="7317293545368448453">"Gọi điện"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Gọi đến số điện thoại đã chọn"</string>
-    <string name="browse" msgid="3733970143542020945">"Mở"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Mở URL đã chọn"</string>
-    <string name="sms" msgid="5495416906312064886">"Nhắn tin"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Nhắn tin đến số điện thoại đã chọn"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Thêm"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Thêm vào danh bạ"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Tùy chọn khác"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Đóng tràn"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Chia sẻ"</string>
+    <string name="email" msgid="6099716515489216517">"Gửi email"</string>
+    <string name="email_desc" msgid="2189760120923982860">"Gửi email đến địa chỉ đã chọn"</string>
+    <string name="dial" msgid="2101464860090311277">"Gọi điện"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Gọi đến số điện thoại đã chọn"</string>
+    <string name="browse" msgid="4753676368851695348">"Mở"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Mở URL đã chọn"</string>
+    <string name="sms" msgid="2214738262605167054">"Nhắn tin"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Nhắn tin đến số điện thoại đã chọn"</string>
+    <string name="add_contact" msgid="386263007484061034">"Thêm"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Thêm vào danh bạ"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Tùy chọn khác"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Đóng tràn"</string>
+    <string name="abc_share" msgid="37557693057519685">"Chia sẻ"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-zh-rCN/strings.xml b/textclassifier/textclassifier/src/main/res/values-zh-rCN/strings.xml
index afa89ca..3af9ef0 100644
--- a/textclassifier/textclassifier/src/main/res/values-zh-rCN/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-zh-rCN/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"发送电子邮件"</string>
-    <string name="email_desc" msgid="6941280589171810022">"将电子邮件发送至所选地址"</string>
-    <string name="dial" msgid="7317293545368448453">"通话"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"拨打所选电话号码"</string>
-    <string name="browse" msgid="3733970143542020945">"打开"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"打开所选网址"</string>
-    <string name="sms" msgid="5495416906312064886">"发短信"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"将短信发送至所选电话号码"</string>
-    <string name="add_contact" msgid="9005634177208282449">"添加"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"添加到通讯录"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"更多选项"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"关闭工具栏溢出"</string>
-    <string name="abc_share" msgid="7091841667818715717">"分享"</string>
+    <string name="email" msgid="6099716515489216517">"发送电子邮件"</string>
+    <string name="email_desc" msgid="2189760120923982860">"将电子邮件发送至所选地址"</string>
+    <string name="dial" msgid="2101464860090311277">"通话"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"拨打所选电话号码"</string>
+    <string name="browse" msgid="4753676368851695348">"打开"</string>
+    <string name="browse_desc" msgid="728882176434276995">"打开所选网址"</string>
+    <string name="sms" msgid="2214738262605167054">"发短信"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"将短信发送至所选电话号码"</string>
+    <string name="add_contact" msgid="386263007484061034">"添加"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"添加到通讯录"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"更多选项"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"关闭工具栏溢出"</string>
+    <string name="abc_share" msgid="37557693057519685">"分享"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-zh-rHK/strings.xml b/textclassifier/textclassifier/src/main/res/values-zh-rHK/strings.xml
index 2ada5ec..a9b893d 100644
--- a/textclassifier/textclassifier/src/main/res/values-zh-rHK/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-zh-rHK/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"電郵"</string>
-    <string name="email_desc" msgid="6941280589171810022">"寄電郵去指定地址"</string>
-    <string name="dial" msgid="7317293545368448453">"撥號"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"打指定嘅電話號碼"</string>
-    <string name="browse" msgid="3733970143542020945">"開啟"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"打開指定網址"</string>
-    <string name="sms" msgid="5495416906312064886">"發短訊"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"傳短訊去指定電話號碼"</string>
-    <string name="add_contact" msgid="9005634177208282449">"新增"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"加入聯絡人"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"更多選項"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"關閉展開模式"</string>
-    <string name="abc_share" msgid="7091841667818715717">"分享"</string>
+    <string name="email" msgid="6099716515489216517">"電郵"</string>
+    <string name="email_desc" msgid="2189760120923982860">"寄電郵去指定地址"</string>
+    <string name="dial" msgid="2101464860090311277">"撥號"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"打指定嘅電話號碼"</string>
+    <string name="browse" msgid="4753676368851695348">"開啟"</string>
+    <string name="browse_desc" msgid="728882176434276995">"打開指定網址"</string>
+    <string name="sms" msgid="2214738262605167054">"發短訊"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"傳短訊去指定電話號碼"</string>
+    <string name="add_contact" msgid="386263007484061034">"新增"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"加入聯絡人"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"更多選項"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"關閉展開模式"</string>
+    <string name="abc_share" msgid="37557693057519685">"分享"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-zh-rTW/strings.xml b/textclassifier/textclassifier/src/main/res/values-zh-rTW/strings.xml
index d2bd3ab..8240f2c 100644
--- a/textclassifier/textclassifier/src/main/res/values-zh-rTW/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-zh-rTW/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"發送電子郵件"</string>
-    <string name="email_desc" msgid="6941280589171810022">"將電子郵件寄到選取的地址"</string>
-    <string name="dial" msgid="7317293545368448453">"撥號通話"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"撥打選取的電話號碼"</string>
-    <string name="browse" msgid="3733970143542020945">"開啟"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"開啟選取的網址"</string>
-    <string name="sms" msgid="5495416906312064886">"發送訊息"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"將訊息傳送到選取的電話號碼"</string>
-    <string name="add_contact" msgid="9005634177208282449">"新增"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"新增至聯絡人"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"更多選項"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"關閉溢出模式"</string>
-    <string name="abc_share" msgid="7091841667818715717">"分享"</string>
+    <string name="email" msgid="6099716515489216517">"發送電子郵件"</string>
+    <string name="email_desc" msgid="2189760120923982860">"將電子郵件寄到選取的地址"</string>
+    <string name="dial" msgid="2101464860090311277">"撥號通話"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"撥打選取的電話號碼"</string>
+    <string name="browse" msgid="4753676368851695348">"開啟"</string>
+    <string name="browse_desc" msgid="728882176434276995">"開啟選取的網址"</string>
+    <string name="sms" msgid="2214738262605167054">"發送訊息"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"將訊息傳送到選取的電話號碼"</string>
+    <string name="add_contact" msgid="386263007484061034">"新增"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"新增至聯絡人"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"更多選項"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"關閉溢出模式"</string>
+    <string name="abc_share" msgid="37557693057519685">"分享"</string>
 </resources>
diff --git a/textclassifier/textclassifier/src/main/res/values-zu/strings.xml b/textclassifier/textclassifier/src/main/res/values-zu/strings.xml
index ec31991..18256c7 100644
--- a/textclassifier/textclassifier/src/main/res/values-zu/strings.xml
+++ b/textclassifier/textclassifier/src/main/res/values-zu/strings.xml
@@ -16,17 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="email" msgid="5568050657313893478">"I-imeyili"</string>
-    <string name="email_desc" msgid="6941280589171810022">"I-imeyili ikhethe amakheli"</string>
-    <string name="dial" msgid="7317293545368448453">"Shaya"</string>
-    <string name="dial_desc" msgid="5129451396208040332">"Ikholi ikhethe inombolo yefoni"</string>
-    <string name="browse" msgid="3733970143542020945">"Vula"</string>
-    <string name="browse_desc" msgid="3898254913938219011">"Vula i-URL ekhethiwe"</string>
-    <string name="sms" msgid="5495416906312064886">"Umlayezo"</string>
-    <string name="sms_desc" msgid="8293660783374489324">"Thumela umlayezo kunombolo yefoni ekhethiwe"</string>
-    <string name="add_contact" msgid="9005634177208282449">"Engeza"</string>
-    <string name="add_contact_desc" msgid="2475604767309086575">"Engeza koxhumana nabo"</string>
-    <string name="floating_toolbar_open_overflow_description" msgid="1187148927509077545">"Ezinye izinketho"</string>
-    <string name="floating_toolbar_close_overflow_description" msgid="6243666280435354232">"Vala ukuchichima"</string>
-    <string name="abc_share" msgid="7091841667818715717">"Yaba"</string>
+    <string name="email" msgid="6099716515489216517">"I-imeyili"</string>
+    <string name="email_desc" msgid="2189760120923982860">"I-imeyili ikhethe amakheli"</string>
+    <string name="dial" msgid="2101464860090311277">"Shaya"</string>
+    <string name="dial_desc" msgid="1195407206406821463">"Ikholi ikhethe inombolo yefoni"</string>
+    <string name="browse" msgid="4753676368851695348">"Vula"</string>
+    <string name="browse_desc" msgid="728882176434276995">"Vula i-URL ekhethiwe"</string>
+    <string name="sms" msgid="2214738262605167054">"Umlayezo"</string>
+    <string name="sms_desc" msgid="7733202356868441148">"Thumela umlayezo kunombolo yefoni ekhethiwe"</string>
+    <string name="add_contact" msgid="386263007484061034">"Engeza"</string>
+    <string name="add_contact_desc" msgid="1739272501140197425">"Engeza koxhumana nabo"</string>
+    <string name="floating_toolbar_open_overflow_description" msgid="6778458701858708647">"Ezinye izinketho"</string>
+    <string name="floating_toolbar_close_overflow_description" msgid="3112942430227166657">"Vala ukuchichima"</string>
+    <string name="abc_share" msgid="37557693057519685">"Yaba"</string>
 </resources>
diff --git a/transition/transition-ktx/api/2.0.0-alpha01.txt b/transition/transition-ktx/api/2.0.0-alpha01.txt
new file mode 100644
index 0000000..b01e160
--- /dev/null
+++ b/transition/transition-ktx/api/2.0.0-alpha01.txt
@@ -0,0 +1,14 @@
+// Signature format: 3.0
+package androidx.transition {
+
+  public final class TransitionKt {
+    method public static inline androidx.transition.Transition.TransitionListener addListener(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onPause = {});
+    method public static inline androidx.transition.Transition.TransitionListener doOnCancel(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnEnd(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnPause(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnResume(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnStart(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+  }
+
+}
+
diff --git a/transition/transition-ktx/api/public_plus_experimental_2.0.0-alpha01.txt b/transition/transition-ktx/api/public_plus_experimental_2.0.0-alpha01.txt
new file mode 100644
index 0000000..b01e160
--- /dev/null
+++ b/transition/transition-ktx/api/public_plus_experimental_2.0.0-alpha01.txt
@@ -0,0 +1,14 @@
+// Signature format: 3.0
+package androidx.transition {
+
+  public final class TransitionKt {
+    method public static inline androidx.transition.Transition.TransitionListener addListener(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onPause = {});
+    method public static inline androidx.transition.Transition.TransitionListener doOnCancel(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnEnd(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnPause(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnResume(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnStart(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+  }
+
+}
+
diff --git a/transition/transition-ktx/api/res-2.0.0-alpha01.txt b/transition/transition-ktx/api/res-2.0.0-alpha01.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/transition/transition-ktx/api/res-2.0.0-alpha01.txt
diff --git a/transition/transition-ktx/api/restricted_2.0.0-alpha01.txt b/transition/transition-ktx/api/restricted_2.0.0-alpha01.txt
new file mode 100644
index 0000000..b01e160
--- /dev/null
+++ b/transition/transition-ktx/api/restricted_2.0.0-alpha01.txt
@@ -0,0 +1,14 @@
+// Signature format: 3.0
+package androidx.transition {
+
+  public final class TransitionKt {
+    method public static inline androidx.transition.Transition.TransitionListener addListener(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onPause = {});
+    method public static inline androidx.transition.Transition.TransitionListener doOnCancel(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnEnd(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnPause(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnResume(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+    method public static inline androidx.transition.Transition.TransitionListener doOnStart(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
+  }
+
+}
+
diff --git a/transition/transition/api/2.0.0-alpha01.txt b/transition/transition/api/2.0.0-alpha01.txt
new file mode 100644
index 0000000..d5d8dbf
--- /dev/null
+++ b/transition/transition/api/2.0.0-alpha01.txt
@@ -0,0 +1,283 @@
+// Signature format: 3.0
+package androidx.transition {
+
+  public class ArcMotion extends androidx.transition.PathMotion {
+    ctor public ArcMotion();
+    ctor public ArcMotion(android.content.Context, android.util.AttributeSet);
+    method public float getMaximumAngle();
+    method public float getMinimumHorizontalAngle();
+    method public float getMinimumVerticalAngle();
+    method public android.graphics.Path getPath(float, float, float, float);
+    method public void setMaximumAngle(float);
+    method public void setMinimumHorizontalAngle(float);
+    method public void setMinimumVerticalAngle(float);
+  }
+
+  public class AutoTransition extends androidx.transition.TransitionSet {
+    ctor public AutoTransition();
+    ctor public AutoTransition(android.content.Context, android.util.AttributeSet);
+  }
+
+  public class ChangeBounds extends androidx.transition.Transition {
+    ctor public ChangeBounds();
+    ctor public ChangeBounds(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public boolean getResizeClip();
+    method public void setResizeClip(boolean);
+  }
+
+  public class ChangeClipBounds extends androidx.transition.Transition {
+    ctor public ChangeClipBounds();
+    ctor public ChangeClipBounds(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+  }
+
+  public class ChangeImageTransform extends androidx.transition.Transition {
+    ctor public ChangeImageTransform();
+    ctor public ChangeImageTransform(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+  }
+
+  public class ChangeScroll extends androidx.transition.Transition {
+    ctor public ChangeScroll();
+    ctor public ChangeScroll(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+  }
+
+  public class ChangeTransform extends androidx.transition.Transition {
+    ctor public ChangeTransform();
+    ctor public ChangeTransform(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public boolean getReparent();
+    method public boolean getReparentWithOverlay();
+    method public void setReparent(boolean);
+    method public void setReparentWithOverlay(boolean);
+  }
+
+  public class CircularPropagation extends androidx.transition.VisibilityPropagation {
+    ctor public CircularPropagation();
+    method public long getStartDelay(android.view.ViewGroup!, androidx.transition.Transition!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public void setPropagationSpeed(float);
+  }
+
+  public class Explode extends androidx.transition.Visibility {
+    ctor public Explode();
+    ctor public Explode(android.content.Context, android.util.AttributeSet);
+  }
+
+  public class Fade extends androidx.transition.Visibility {
+    ctor public Fade(int);
+    ctor public Fade();
+    ctor public Fade(android.content.Context, android.util.AttributeSet);
+    field public static final int IN = 1; // 0x1
+    field public static final int OUT = 2; // 0x2
+  }
+
+  public abstract class PathMotion {
+    ctor public PathMotion();
+    ctor public PathMotion(android.content.Context, android.util.AttributeSet);
+    method public abstract android.graphics.Path getPath(float, float, float, float);
+  }
+
+  public class PatternPathMotion extends androidx.transition.PathMotion {
+    ctor public PatternPathMotion();
+    ctor public PatternPathMotion(android.content.Context, android.util.AttributeSet);
+    ctor public PatternPathMotion(android.graphics.Path!);
+    method public android.graphics.Path getPath(float, float, float, float);
+    method public android.graphics.Path! getPatternPath();
+    method public void setPatternPath(android.graphics.Path!);
+  }
+
+  public class Scene {
+    ctor public Scene(android.view.ViewGroup);
+    ctor public Scene(android.view.ViewGroup, android.view.View);
+    method public void enter();
+    method public void exit();
+    method public static androidx.transition.Scene? getCurrentScene(android.view.ViewGroup);
+    method public static androidx.transition.Scene getSceneForLayout(android.view.ViewGroup, @LayoutRes int, android.content.Context);
+    method public android.view.ViewGroup getSceneRoot();
+    method public void setEnterAction(Runnable?);
+    method public void setExitAction(Runnable?);
+  }
+
+  public class SidePropagation extends androidx.transition.VisibilityPropagation {
+    ctor public SidePropagation();
+    method public long getStartDelay(android.view.ViewGroup!, androidx.transition.Transition!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public void setPropagationSpeed(float);
+    method public void setSide(int);
+  }
+
+  public class Slide extends androidx.transition.Visibility {
+    ctor public Slide();
+    ctor public Slide(int);
+    ctor public Slide(android.content.Context, android.util.AttributeSet);
+    method public int getSlideEdge();
+    method public void setSlideEdge(int);
+  }
+
+  public abstract class Transition implements java.lang.Cloneable {
+    ctor public Transition();
+    ctor public Transition(android.content.Context, android.util.AttributeSet);
+    method public androidx.transition.Transition addListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.Transition addTarget(android.view.View);
+    method public androidx.transition.Transition addTarget(@IdRes int);
+    method public androidx.transition.Transition addTarget(String);
+    method public androidx.transition.Transition addTarget(Class<?>);
+    method public abstract void captureEndValues(androidx.transition.TransitionValues);
+    method public abstract void captureStartValues(androidx.transition.TransitionValues);
+    method public androidx.transition.Transition clone();
+    method public androidx.core.animation.Animator? createAnimator(android.view.ViewGroup, androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
+    method public androidx.transition.Transition excludeChildren(android.view.View, boolean);
+    method public androidx.transition.Transition excludeChildren(@IdRes int, boolean);
+    method public androidx.transition.Transition excludeChildren(Class<?>, boolean);
+    method public androidx.transition.Transition excludeTarget(android.view.View, boolean);
+    method public androidx.transition.Transition excludeTarget(@IdRes int, boolean);
+    method public androidx.transition.Transition excludeTarget(String, boolean);
+    method public androidx.transition.Transition excludeTarget(Class<?>, boolean);
+    method public long getDuration();
+    method public android.graphics.Rect? getEpicenter();
+    method public androidx.transition.Transition.EpicenterCallback? getEpicenterCallback();
+    method public androidx.core.animation.Interpolator? getInterpolator();
+    method public String getName();
+    method public androidx.transition.PathMotion getPathMotion();
+    method public androidx.transition.TransitionPropagation? getPropagation();
+    method public long getStartDelay();
+    method public java.util.List<java.lang.Integer!> getTargetIds();
+    method public java.util.List<java.lang.String!>? getTargetNames();
+    method public java.util.List<java.lang.Class<?>!>? getTargetTypes();
+    method public java.util.List<android.view.View!> getTargets();
+    method public String![]? getTransitionProperties();
+    method public androidx.transition.TransitionValues? getTransitionValues(android.view.View, boolean);
+    method public boolean isTransitionRequired(androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
+    method public androidx.transition.Transition removeListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.Transition removeTarget(android.view.View);
+    method public androidx.transition.Transition removeTarget(@IdRes int);
+    method public androidx.transition.Transition removeTarget(String);
+    method public androidx.transition.Transition removeTarget(Class<?>);
+    method public androidx.transition.Transition setDuration(long);
+    method public void setEpicenterCallback(androidx.transition.Transition.EpicenterCallback?);
+    method public androidx.transition.Transition setInterpolator(androidx.core.animation.Interpolator?);
+    method public void setMatchOrder(int...);
+    method public void setPathMotion(androidx.transition.PathMotion?);
+    method public void setPropagation(androidx.transition.TransitionPropagation?);
+    method public androidx.transition.Transition setStartDelay(long);
+    field public static final int MATCH_ID = 3; // 0x3
+    field public static final int MATCH_INSTANCE = 1; // 0x1
+    field public static final int MATCH_ITEM_ID = 4; // 0x4
+    field public static final int MATCH_NAME = 2; // 0x2
+  }
+
+  public abstract static class Transition.EpicenterCallback {
+    ctor public Transition.EpicenterCallback();
+    method public abstract android.graphics.Rect! onGetEpicenter(androidx.transition.Transition);
+  }
+
+  public static interface Transition.TransitionListener {
+    method public void onTransitionCancel(androidx.transition.Transition);
+    method public void onTransitionEnd(androidx.transition.Transition);
+    method public void onTransitionPause(androidx.transition.Transition);
+    method public void onTransitionResume(androidx.transition.Transition);
+    method public void onTransitionStart(androidx.transition.Transition);
+  }
+
+  public class TransitionInflater {
+    method public static androidx.transition.TransitionInflater from(android.content.Context);
+    method public androidx.transition.Transition! inflateTransition(int);
+    method public androidx.transition.TransitionManager! inflateTransitionManager(int, android.view.ViewGroup!);
+  }
+
+  public class TransitionListenerAdapter implements androidx.transition.Transition.TransitionListener {
+    ctor public TransitionListenerAdapter();
+    method public void onTransitionCancel(androidx.transition.Transition);
+    method public void onTransitionEnd(androidx.transition.Transition);
+    method public void onTransitionPause(androidx.transition.Transition);
+    method public void onTransitionResume(androidx.transition.Transition);
+    method public void onTransitionStart(androidx.transition.Transition);
+  }
+
+  public class TransitionManager {
+    ctor public TransitionManager();
+    method public static void beginDelayedTransition(android.view.ViewGroup);
+    method public static void beginDelayedTransition(android.view.ViewGroup, androidx.transition.Transition?);
+    method public static void endTransitions(android.view.ViewGroup!);
+    method public static void go(androidx.transition.Scene);
+    method public static void go(androidx.transition.Scene, androidx.transition.Transition?);
+    method public void setTransition(androidx.transition.Scene, androidx.transition.Transition?);
+    method public void setTransition(androidx.transition.Scene, androidx.transition.Scene, androidx.transition.Transition?);
+    method public void transitionTo(androidx.transition.Scene);
+  }
+
+  public abstract class TransitionPropagation {
+    ctor public TransitionPropagation();
+    method public abstract void captureValues(androidx.transition.TransitionValues!);
+    method public abstract String![]! getPropagationProperties();
+    method public abstract long getStartDelay(android.view.ViewGroup!, androidx.transition.Transition!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+  }
+
+  public class TransitionSet extends androidx.transition.Transition {
+    ctor public TransitionSet();
+    ctor public TransitionSet(android.content.Context, android.util.AttributeSet);
+    method public androidx.transition.TransitionSet addListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.TransitionSet addTarget(android.view.View);
+    method public androidx.transition.TransitionSet addTarget(@IdRes int);
+    method public androidx.transition.TransitionSet addTarget(String);
+    method public androidx.transition.TransitionSet addTarget(Class<?>);
+    method public androidx.transition.TransitionSet addTransition(androidx.transition.Transition);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public int getOrdering();
+    method public androidx.transition.Transition? getTransitionAt(int);
+    method public int getTransitionCount();
+    method public androidx.transition.TransitionSet removeListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.TransitionSet removeTarget(@IdRes int);
+    method public androidx.transition.TransitionSet removeTarget(android.view.View);
+    method public androidx.transition.TransitionSet removeTarget(Class<?>);
+    method public androidx.transition.TransitionSet removeTarget(String);
+    method public androidx.transition.TransitionSet removeTransition(androidx.transition.Transition);
+    method public androidx.transition.TransitionSet setDuration(long);
+    method public androidx.transition.TransitionSet setInterpolator(androidx.core.animation.Interpolator?);
+    method public androidx.transition.TransitionSet setOrdering(int);
+    method public androidx.transition.TransitionSet setStartDelay(long);
+    field public static final int ORDERING_SEQUENTIAL = 1; // 0x1
+    field public static final int ORDERING_TOGETHER = 0; // 0x0
+  }
+
+  public class TransitionValues {
+    ctor @Deprecated public TransitionValues();
+    ctor public TransitionValues(android.view.View);
+    field public final java.util.Map<java.lang.String!,java.lang.Object!>! values;
+    field public android.view.View! view;
+  }
+
+  public abstract class Visibility extends androidx.transition.Transition {
+    ctor public Visibility();
+    ctor public Visibility(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public int getMode();
+    method public boolean isVisible(androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public void setMode(int);
+    field public static final int MODE_IN = 1; // 0x1
+    field public static final int MODE_OUT = 2; // 0x2
+  }
+
+  public abstract class VisibilityPropagation extends androidx.transition.TransitionPropagation {
+    ctor public VisibilityPropagation();
+    method public void captureValues(androidx.transition.TransitionValues!);
+    method public String![]! getPropagationProperties();
+    method public int getViewVisibility(androidx.transition.TransitionValues!);
+    method public int getViewX(androidx.transition.TransitionValues!);
+    method public int getViewY(androidx.transition.TransitionValues!);
+  }
+
+}
+
diff --git a/transition/transition/api/current.txt b/transition/transition/api/current.txt
index e314794..d5d8dbf 100644
--- a/transition/transition/api/current.txt
+++ b/transition/transition/api/current.txt
@@ -130,8 +130,8 @@
     method public androidx.transition.Transition addTarget(Class<?>);
     method public abstract void captureEndValues(androidx.transition.TransitionValues);
     method public abstract void captureStartValues(androidx.transition.TransitionValues);
-    method public androidx.transition.Transition! clone();
-    method public android.animation.Animator? createAnimator(android.view.ViewGroup, androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
+    method public androidx.transition.Transition clone();
+    method public androidx.core.animation.Animator? createAnimator(android.view.ViewGroup, androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
     method public androidx.transition.Transition excludeChildren(android.view.View, boolean);
     method public androidx.transition.Transition excludeChildren(@IdRes int, boolean);
     method public androidx.transition.Transition excludeChildren(Class<?>, boolean);
@@ -142,7 +142,7 @@
     method public long getDuration();
     method public android.graphics.Rect? getEpicenter();
     method public androidx.transition.Transition.EpicenterCallback? getEpicenterCallback();
-    method public android.animation.TimeInterpolator? getInterpolator();
+    method public androidx.core.animation.Interpolator? getInterpolator();
     method public String getName();
     method public androidx.transition.PathMotion getPathMotion();
     method public androidx.transition.TransitionPropagation? getPropagation();
@@ -161,7 +161,7 @@
     method public androidx.transition.Transition removeTarget(Class<?>);
     method public androidx.transition.Transition setDuration(long);
     method public void setEpicenterCallback(androidx.transition.Transition.EpicenterCallback?);
-    method public androidx.transition.Transition setInterpolator(android.animation.TimeInterpolator?);
+    method public androidx.transition.Transition setInterpolator(androidx.core.animation.Interpolator?);
     method public void setMatchOrder(int...);
     method public void setPathMotion(androidx.transition.PathMotion?);
     method public void setPropagation(androidx.transition.TransitionPropagation?);
@@ -240,7 +240,7 @@
     method public androidx.transition.TransitionSet removeTarget(String);
     method public androidx.transition.TransitionSet removeTransition(androidx.transition.Transition);
     method public androidx.transition.TransitionSet setDuration(long);
-    method public androidx.transition.TransitionSet setInterpolator(android.animation.TimeInterpolator?);
+    method public androidx.transition.TransitionSet setInterpolator(androidx.core.animation.Interpolator?);
     method public androidx.transition.TransitionSet setOrdering(int);
     method public androidx.transition.TransitionSet setStartDelay(long);
     field public static final int ORDERING_SEQUENTIAL = 1; // 0x1
@@ -261,10 +261,10 @@
     method public void captureStartValues(androidx.transition.TransitionValues);
     method public int getMode();
     method public boolean isVisible(androidx.transition.TransitionValues!);
-    method public android.animation.Animator? onAppear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
-    method public android.animation.Animator? onAppear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
-    method public android.animation.Animator? onDisappear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
-    method public android.animation.Animator? onDisappear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
     method public void setMode(int);
     field public static final int MODE_IN = 1; // 0x1
     field public static final int MODE_OUT = 2; // 0x2
diff --git a/transition/transition/api/public_plus_experimental_2.0.0-alpha01.txt b/transition/transition/api/public_plus_experimental_2.0.0-alpha01.txt
new file mode 100644
index 0000000..d5d8dbf
--- /dev/null
+++ b/transition/transition/api/public_plus_experimental_2.0.0-alpha01.txt
@@ -0,0 +1,283 @@
+// Signature format: 3.0
+package androidx.transition {
+
+  public class ArcMotion extends androidx.transition.PathMotion {
+    ctor public ArcMotion();
+    ctor public ArcMotion(android.content.Context, android.util.AttributeSet);
+    method public float getMaximumAngle();
+    method public float getMinimumHorizontalAngle();
+    method public float getMinimumVerticalAngle();
+    method public android.graphics.Path getPath(float, float, float, float);
+    method public void setMaximumAngle(float);
+    method public void setMinimumHorizontalAngle(float);
+    method public void setMinimumVerticalAngle(float);
+  }
+
+  public class AutoTransition extends androidx.transition.TransitionSet {
+    ctor public AutoTransition();
+    ctor public AutoTransition(android.content.Context, android.util.AttributeSet);
+  }
+
+  public class ChangeBounds extends androidx.transition.Transition {
+    ctor public ChangeBounds();
+    ctor public ChangeBounds(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public boolean getResizeClip();
+    method public void setResizeClip(boolean);
+  }
+
+  public class ChangeClipBounds extends androidx.transition.Transition {
+    ctor public ChangeClipBounds();
+    ctor public ChangeClipBounds(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+  }
+
+  public class ChangeImageTransform extends androidx.transition.Transition {
+    ctor public ChangeImageTransform();
+    ctor public ChangeImageTransform(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+  }
+
+  public class ChangeScroll extends androidx.transition.Transition {
+    ctor public ChangeScroll();
+    ctor public ChangeScroll(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+  }
+
+  public class ChangeTransform extends androidx.transition.Transition {
+    ctor public ChangeTransform();
+    ctor public ChangeTransform(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public boolean getReparent();
+    method public boolean getReparentWithOverlay();
+    method public void setReparent(boolean);
+    method public void setReparentWithOverlay(boolean);
+  }
+
+  public class CircularPropagation extends androidx.transition.VisibilityPropagation {
+    ctor public CircularPropagation();
+    method public long getStartDelay(android.view.ViewGroup!, androidx.transition.Transition!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public void setPropagationSpeed(float);
+  }
+
+  public class Explode extends androidx.transition.Visibility {
+    ctor public Explode();
+    ctor public Explode(android.content.Context, android.util.AttributeSet);
+  }
+
+  public class Fade extends androidx.transition.Visibility {
+    ctor public Fade(int);
+    ctor public Fade();
+    ctor public Fade(android.content.Context, android.util.AttributeSet);
+    field public static final int IN = 1; // 0x1
+    field public static final int OUT = 2; // 0x2
+  }
+
+  public abstract class PathMotion {
+    ctor public PathMotion();
+    ctor public PathMotion(android.content.Context, android.util.AttributeSet);
+    method public abstract android.graphics.Path getPath(float, float, float, float);
+  }
+
+  public class PatternPathMotion extends androidx.transition.PathMotion {
+    ctor public PatternPathMotion();
+    ctor public PatternPathMotion(android.content.Context, android.util.AttributeSet);
+    ctor public PatternPathMotion(android.graphics.Path!);
+    method public android.graphics.Path getPath(float, float, float, float);
+    method public android.graphics.Path! getPatternPath();
+    method public void setPatternPath(android.graphics.Path!);
+  }
+
+  public class Scene {
+    ctor public Scene(android.view.ViewGroup);
+    ctor public Scene(android.view.ViewGroup, android.view.View);
+    method public void enter();
+    method public void exit();
+    method public static androidx.transition.Scene? getCurrentScene(android.view.ViewGroup);
+    method public static androidx.transition.Scene getSceneForLayout(android.view.ViewGroup, @LayoutRes int, android.content.Context);
+    method public android.view.ViewGroup getSceneRoot();
+    method public void setEnterAction(Runnable?);
+    method public void setExitAction(Runnable?);
+  }
+
+  public class SidePropagation extends androidx.transition.VisibilityPropagation {
+    ctor public SidePropagation();
+    method public long getStartDelay(android.view.ViewGroup!, androidx.transition.Transition!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public void setPropagationSpeed(float);
+    method public void setSide(int);
+  }
+
+  public class Slide extends androidx.transition.Visibility {
+    ctor public Slide();
+    ctor public Slide(int);
+    ctor public Slide(android.content.Context, android.util.AttributeSet);
+    method public int getSlideEdge();
+    method public void setSlideEdge(int);
+  }
+
+  public abstract class Transition implements java.lang.Cloneable {
+    ctor public Transition();
+    ctor public Transition(android.content.Context, android.util.AttributeSet);
+    method public androidx.transition.Transition addListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.Transition addTarget(android.view.View);
+    method public androidx.transition.Transition addTarget(@IdRes int);
+    method public androidx.transition.Transition addTarget(String);
+    method public androidx.transition.Transition addTarget(Class<?>);
+    method public abstract void captureEndValues(androidx.transition.TransitionValues);
+    method public abstract void captureStartValues(androidx.transition.TransitionValues);
+    method public androidx.transition.Transition clone();
+    method public androidx.core.animation.Animator? createAnimator(android.view.ViewGroup, androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
+    method public androidx.transition.Transition excludeChildren(android.view.View, boolean);
+    method public androidx.transition.Transition excludeChildren(@IdRes int, boolean);
+    method public androidx.transition.Transition excludeChildren(Class<?>, boolean);
+    method public androidx.transition.Transition excludeTarget(android.view.View, boolean);
+    method public androidx.transition.Transition excludeTarget(@IdRes int, boolean);
+    method public androidx.transition.Transition excludeTarget(String, boolean);
+    method public androidx.transition.Transition excludeTarget(Class<?>, boolean);
+    method public long getDuration();
+    method public android.graphics.Rect? getEpicenter();
+    method public androidx.transition.Transition.EpicenterCallback? getEpicenterCallback();
+    method public androidx.core.animation.Interpolator? getInterpolator();
+    method public String getName();
+    method public androidx.transition.PathMotion getPathMotion();
+    method public androidx.transition.TransitionPropagation? getPropagation();
+    method public long getStartDelay();
+    method public java.util.List<java.lang.Integer!> getTargetIds();
+    method public java.util.List<java.lang.String!>? getTargetNames();
+    method public java.util.List<java.lang.Class<?>!>? getTargetTypes();
+    method public java.util.List<android.view.View!> getTargets();
+    method public String![]? getTransitionProperties();
+    method public androidx.transition.TransitionValues? getTransitionValues(android.view.View, boolean);
+    method public boolean isTransitionRequired(androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
+    method public androidx.transition.Transition removeListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.Transition removeTarget(android.view.View);
+    method public androidx.transition.Transition removeTarget(@IdRes int);
+    method public androidx.transition.Transition removeTarget(String);
+    method public androidx.transition.Transition removeTarget(Class<?>);
+    method public androidx.transition.Transition setDuration(long);
+    method public void setEpicenterCallback(androidx.transition.Transition.EpicenterCallback?);
+    method public androidx.transition.Transition setInterpolator(androidx.core.animation.Interpolator?);
+    method public void setMatchOrder(int...);
+    method public void setPathMotion(androidx.transition.PathMotion?);
+    method public void setPropagation(androidx.transition.TransitionPropagation?);
+    method public androidx.transition.Transition setStartDelay(long);
+    field public static final int MATCH_ID = 3; // 0x3
+    field public static final int MATCH_INSTANCE = 1; // 0x1
+    field public static final int MATCH_ITEM_ID = 4; // 0x4
+    field public static final int MATCH_NAME = 2; // 0x2
+  }
+
+  public abstract static class Transition.EpicenterCallback {
+    ctor public Transition.EpicenterCallback();
+    method public abstract android.graphics.Rect! onGetEpicenter(androidx.transition.Transition);
+  }
+
+  public static interface Transition.TransitionListener {
+    method public void onTransitionCancel(androidx.transition.Transition);
+    method public void onTransitionEnd(androidx.transition.Transition);
+    method public void onTransitionPause(androidx.transition.Transition);
+    method public void onTransitionResume(androidx.transition.Transition);
+    method public void onTransitionStart(androidx.transition.Transition);
+  }
+
+  public class TransitionInflater {
+    method public static androidx.transition.TransitionInflater from(android.content.Context);
+    method public androidx.transition.Transition! inflateTransition(int);
+    method public androidx.transition.TransitionManager! inflateTransitionManager(int, android.view.ViewGroup!);
+  }
+
+  public class TransitionListenerAdapter implements androidx.transition.Transition.TransitionListener {
+    ctor public TransitionListenerAdapter();
+    method public void onTransitionCancel(androidx.transition.Transition);
+    method public void onTransitionEnd(androidx.transition.Transition);
+    method public void onTransitionPause(androidx.transition.Transition);
+    method public void onTransitionResume(androidx.transition.Transition);
+    method public void onTransitionStart(androidx.transition.Transition);
+  }
+
+  public class TransitionManager {
+    ctor public TransitionManager();
+    method public static void beginDelayedTransition(android.view.ViewGroup);
+    method public static void beginDelayedTransition(android.view.ViewGroup, androidx.transition.Transition?);
+    method public static void endTransitions(android.view.ViewGroup!);
+    method public static void go(androidx.transition.Scene);
+    method public static void go(androidx.transition.Scene, androidx.transition.Transition?);
+    method public void setTransition(androidx.transition.Scene, androidx.transition.Transition?);
+    method public void setTransition(androidx.transition.Scene, androidx.transition.Scene, androidx.transition.Transition?);
+    method public void transitionTo(androidx.transition.Scene);
+  }
+
+  public abstract class TransitionPropagation {
+    ctor public TransitionPropagation();
+    method public abstract void captureValues(androidx.transition.TransitionValues!);
+    method public abstract String![]! getPropagationProperties();
+    method public abstract long getStartDelay(android.view.ViewGroup!, androidx.transition.Transition!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+  }
+
+  public class TransitionSet extends androidx.transition.Transition {
+    ctor public TransitionSet();
+    ctor public TransitionSet(android.content.Context, android.util.AttributeSet);
+    method public androidx.transition.TransitionSet addListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.TransitionSet addTarget(android.view.View);
+    method public androidx.transition.TransitionSet addTarget(@IdRes int);
+    method public androidx.transition.TransitionSet addTarget(String);
+    method public androidx.transition.TransitionSet addTarget(Class<?>);
+    method public androidx.transition.TransitionSet addTransition(androidx.transition.Transition);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public int getOrdering();
+    method public androidx.transition.Transition? getTransitionAt(int);
+    method public int getTransitionCount();
+    method public androidx.transition.TransitionSet removeListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.TransitionSet removeTarget(@IdRes int);
+    method public androidx.transition.TransitionSet removeTarget(android.view.View);
+    method public androidx.transition.TransitionSet removeTarget(Class<?>);
+    method public androidx.transition.TransitionSet removeTarget(String);
+    method public androidx.transition.TransitionSet removeTransition(androidx.transition.Transition);
+    method public androidx.transition.TransitionSet setDuration(long);
+    method public androidx.transition.TransitionSet setInterpolator(androidx.core.animation.Interpolator?);
+    method public androidx.transition.TransitionSet setOrdering(int);
+    method public androidx.transition.TransitionSet setStartDelay(long);
+    field public static final int ORDERING_SEQUENTIAL = 1; // 0x1
+    field public static final int ORDERING_TOGETHER = 0; // 0x0
+  }
+
+  public class TransitionValues {
+    ctor @Deprecated public TransitionValues();
+    ctor public TransitionValues(android.view.View);
+    field public final java.util.Map<java.lang.String!,java.lang.Object!>! values;
+    field public android.view.View! view;
+  }
+
+  public abstract class Visibility extends androidx.transition.Transition {
+    ctor public Visibility();
+    ctor public Visibility(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public int getMode();
+    method public boolean isVisible(androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public void setMode(int);
+    field public static final int MODE_IN = 1; // 0x1
+    field public static final int MODE_OUT = 2; // 0x2
+  }
+
+  public abstract class VisibilityPropagation extends androidx.transition.TransitionPropagation {
+    ctor public VisibilityPropagation();
+    method public void captureValues(androidx.transition.TransitionValues!);
+    method public String![]! getPropagationProperties();
+    method public int getViewVisibility(androidx.transition.TransitionValues!);
+    method public int getViewX(androidx.transition.TransitionValues!);
+    method public int getViewY(androidx.transition.TransitionValues!);
+  }
+
+}
+
diff --git a/transition/transition/api/public_plus_experimental_current.txt b/transition/transition/api/public_plus_experimental_current.txt
index e314794..d5d8dbf 100644
--- a/transition/transition/api/public_plus_experimental_current.txt
+++ b/transition/transition/api/public_plus_experimental_current.txt
@@ -130,8 +130,8 @@
     method public androidx.transition.Transition addTarget(Class<?>);
     method public abstract void captureEndValues(androidx.transition.TransitionValues);
     method public abstract void captureStartValues(androidx.transition.TransitionValues);
-    method public androidx.transition.Transition! clone();
-    method public android.animation.Animator? createAnimator(android.view.ViewGroup, androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
+    method public androidx.transition.Transition clone();
+    method public androidx.core.animation.Animator? createAnimator(android.view.ViewGroup, androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
     method public androidx.transition.Transition excludeChildren(android.view.View, boolean);
     method public androidx.transition.Transition excludeChildren(@IdRes int, boolean);
     method public androidx.transition.Transition excludeChildren(Class<?>, boolean);
@@ -142,7 +142,7 @@
     method public long getDuration();
     method public android.graphics.Rect? getEpicenter();
     method public androidx.transition.Transition.EpicenterCallback? getEpicenterCallback();
-    method public android.animation.TimeInterpolator? getInterpolator();
+    method public androidx.core.animation.Interpolator? getInterpolator();
     method public String getName();
     method public androidx.transition.PathMotion getPathMotion();
     method public androidx.transition.TransitionPropagation? getPropagation();
@@ -161,7 +161,7 @@
     method public androidx.transition.Transition removeTarget(Class<?>);
     method public androidx.transition.Transition setDuration(long);
     method public void setEpicenterCallback(androidx.transition.Transition.EpicenterCallback?);
-    method public androidx.transition.Transition setInterpolator(android.animation.TimeInterpolator?);
+    method public androidx.transition.Transition setInterpolator(androidx.core.animation.Interpolator?);
     method public void setMatchOrder(int...);
     method public void setPathMotion(androidx.transition.PathMotion?);
     method public void setPropagation(androidx.transition.TransitionPropagation?);
@@ -240,7 +240,7 @@
     method public androidx.transition.TransitionSet removeTarget(String);
     method public androidx.transition.TransitionSet removeTransition(androidx.transition.Transition);
     method public androidx.transition.TransitionSet setDuration(long);
-    method public androidx.transition.TransitionSet setInterpolator(android.animation.TimeInterpolator?);
+    method public androidx.transition.TransitionSet setInterpolator(androidx.core.animation.Interpolator?);
     method public androidx.transition.TransitionSet setOrdering(int);
     method public androidx.transition.TransitionSet setStartDelay(long);
     field public static final int ORDERING_SEQUENTIAL = 1; // 0x1
@@ -261,10 +261,10 @@
     method public void captureStartValues(androidx.transition.TransitionValues);
     method public int getMode();
     method public boolean isVisible(androidx.transition.TransitionValues!);
-    method public android.animation.Animator? onAppear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
-    method public android.animation.Animator? onAppear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
-    method public android.animation.Animator? onDisappear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
-    method public android.animation.Animator? onDisappear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
     method public void setMode(int);
     field public static final int MODE_IN = 1; // 0x1
     field public static final int MODE_OUT = 2; // 0x2
diff --git a/transition/transition/api/res-2.0.0-alpha01.txt b/transition/transition/api/res-2.0.0-alpha01.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/transition/transition/api/res-2.0.0-alpha01.txt
diff --git a/transition/transition/api/restricted_2.0.0-alpha01.txt b/transition/transition/api/restricted_2.0.0-alpha01.txt
new file mode 100644
index 0000000..eec52d6
--- /dev/null
+++ b/transition/transition/api/restricted_2.0.0-alpha01.txt
@@ -0,0 +1,320 @@
+// Signature format: 3.0
+package androidx.transition {
+
+  public class ArcMotion extends androidx.transition.PathMotion {
+    ctor public ArcMotion();
+    ctor public ArcMotion(android.content.Context, android.util.AttributeSet);
+    method public float getMaximumAngle();
+    method public float getMinimumHorizontalAngle();
+    method public float getMinimumVerticalAngle();
+    method public android.graphics.Path getPath(float, float, float, float);
+    method public void setMaximumAngle(float);
+    method public void setMinimumHorizontalAngle(float);
+    method public void setMinimumVerticalAngle(float);
+  }
+
+  public class AutoTransition extends androidx.transition.TransitionSet {
+    ctor public AutoTransition();
+    ctor public AutoTransition(android.content.Context, android.util.AttributeSet);
+  }
+
+  public class ChangeBounds extends androidx.transition.Transition {
+    ctor public ChangeBounds();
+    ctor public ChangeBounds(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public boolean getResizeClip();
+    method public void setResizeClip(boolean);
+  }
+
+  public class ChangeClipBounds extends androidx.transition.Transition {
+    ctor public ChangeClipBounds();
+    ctor public ChangeClipBounds(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+  }
+
+  public class ChangeImageTransform extends androidx.transition.Transition {
+    ctor public ChangeImageTransform();
+    ctor public ChangeImageTransform(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+  }
+
+  public class ChangeScroll extends androidx.transition.Transition {
+    ctor public ChangeScroll();
+    ctor public ChangeScroll(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+  }
+
+  public class ChangeTransform extends androidx.transition.Transition {
+    ctor public ChangeTransform();
+    ctor public ChangeTransform(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public boolean getReparent();
+    method public boolean getReparentWithOverlay();
+    method public void setReparent(boolean);
+    method public void setReparentWithOverlay(boolean);
+  }
+
+  public class CircularPropagation extends androidx.transition.VisibilityPropagation {
+    ctor public CircularPropagation();
+    method public long getStartDelay(android.view.ViewGroup!, androidx.transition.Transition!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public void setPropagationSpeed(float);
+  }
+
+  public class Explode extends androidx.transition.Visibility {
+    ctor public Explode();
+    ctor public Explode(android.content.Context, android.util.AttributeSet);
+  }
+
+  public class Fade extends androidx.transition.Visibility {
+    ctor public Fade(@androidx.transition.Visibility.Mode int);
+    ctor public Fade();
+    ctor public Fade(android.content.Context, android.util.AttributeSet);
+    field public static final int IN = 1; // 0x1
+    field public static final int OUT = 2; // 0x2
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class FragmentTransitionSupport extends androidx.fragment.app.FragmentTransitionImpl {
+    ctor public FragmentTransitionSupport();
+    method public void addTarget(Object!, android.view.View!);
+    method public void addTargets(Object!, java.util.ArrayList<android.view.View!>!);
+    method public void beginDelayedTransition(android.view.ViewGroup!, Object!);
+    method public boolean canHandle(Object!);
+    method public Object! cloneTransition(Object!);
+    method public Object! mergeTransitionsInSequence(Object!, Object!, Object!);
+    method public Object! mergeTransitionsTogether(Object!, Object!, Object!);
+    method public void removeTarget(Object!, android.view.View!);
+    method public void replaceTargets(Object!, java.util.ArrayList<android.view.View!>!, java.util.ArrayList<android.view.View!>!);
+    method public void scheduleHideFragmentView(Object!, android.view.View!, java.util.ArrayList<android.view.View!>!);
+    method public void scheduleRemoveTargets(Object!, Object!, java.util.ArrayList<android.view.View!>!, Object!, java.util.ArrayList<android.view.View!>!, Object!, java.util.ArrayList<android.view.View!>!);
+    method public void setEpicenter(Object!, android.view.View!);
+    method public void setEpicenter(Object!, android.graphics.Rect!);
+    method public void setSharedElementTargets(Object!, android.view.View!, java.util.ArrayList<android.view.View!>!);
+    method public void swapSharedElementTargets(Object!, java.util.ArrayList<android.view.View!>!, java.util.ArrayList<android.view.View!>!);
+    method public Object! wrapTransitionInSet(Object!);
+  }
+
+  public abstract class PathMotion {
+    ctor public PathMotion();
+    ctor public PathMotion(android.content.Context, android.util.AttributeSet);
+    method public abstract android.graphics.Path getPath(float, float, float, float);
+  }
+
+  public class PatternPathMotion extends androidx.transition.PathMotion {
+    ctor public PatternPathMotion();
+    ctor public PatternPathMotion(android.content.Context, android.util.AttributeSet);
+    ctor public PatternPathMotion(android.graphics.Path!);
+    method public android.graphics.Path getPath(float, float, float, float);
+    method public android.graphics.Path! getPatternPath();
+    method public void setPatternPath(android.graphics.Path!);
+  }
+
+  public class Scene {
+    ctor public Scene(android.view.ViewGroup);
+    ctor public Scene(android.view.ViewGroup, android.view.View);
+    method public void enter();
+    method public void exit();
+    method public static androidx.transition.Scene? getCurrentScene(android.view.ViewGroup);
+    method public static androidx.transition.Scene getSceneForLayout(android.view.ViewGroup, @LayoutRes int, android.content.Context);
+    method public android.view.ViewGroup getSceneRoot();
+    method public void setEnterAction(Runnable?);
+    method public void setExitAction(Runnable?);
+  }
+
+  public class SidePropagation extends androidx.transition.VisibilityPropagation {
+    ctor public SidePropagation();
+    method public long getStartDelay(android.view.ViewGroup!, androidx.transition.Transition!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public void setPropagationSpeed(float);
+    method public void setSide(@androidx.transition.Slide.GravityFlag int);
+  }
+
+  public class Slide extends androidx.transition.Visibility {
+    ctor public Slide();
+    ctor public Slide(@androidx.transition.Slide.GravityFlag int);
+    ctor public Slide(android.content.Context, android.util.AttributeSet);
+    method @androidx.transition.Slide.GravityFlag public int getSlideEdge();
+    method public void setSlideEdge(@androidx.transition.Slide.GravityFlag int);
+  }
+
+  @IntDef({android.view.Gravity.LEFT, android.view.Gravity.TOP, android.view.Gravity.RIGHT, android.view.Gravity.BOTTOM, android.view.Gravity.START, android.view.Gravity.END}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface Slide.GravityFlag {
+  }
+
+  public abstract class Transition implements java.lang.Cloneable {
+    ctor public Transition();
+    ctor public Transition(android.content.Context, android.util.AttributeSet);
+    method public androidx.transition.Transition addListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.Transition addTarget(android.view.View);
+    method public androidx.transition.Transition addTarget(@IdRes int);
+    method public androidx.transition.Transition addTarget(String);
+    method public androidx.transition.Transition addTarget(Class<?>);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void animate(androidx.core.animation.Animator!);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void cancel();
+    method public abstract void captureEndValues(androidx.transition.TransitionValues);
+    method public abstract void captureStartValues(androidx.transition.TransitionValues);
+    method public androidx.transition.Transition clone();
+    method public androidx.core.animation.Animator? createAnimator(android.view.ViewGroup, androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void createAnimators(android.view.ViewGroup!, androidx.transition.TransitionValuesMaps!, androidx.transition.TransitionValuesMaps!, java.util.ArrayList<androidx.transition.TransitionValues!>!, java.util.ArrayList<androidx.transition.TransitionValues!>!);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void end();
+    method public androidx.transition.Transition excludeChildren(android.view.View, boolean);
+    method public androidx.transition.Transition excludeChildren(@IdRes int, boolean);
+    method public androidx.transition.Transition excludeChildren(Class<?>, boolean);
+    method public androidx.transition.Transition excludeTarget(android.view.View, boolean);
+    method public androidx.transition.Transition excludeTarget(@IdRes int, boolean);
+    method public androidx.transition.Transition excludeTarget(String, boolean);
+    method public androidx.transition.Transition excludeTarget(Class<?>, boolean);
+    method public long getDuration();
+    method public android.graphics.Rect? getEpicenter();
+    method public androidx.transition.Transition.EpicenterCallback? getEpicenterCallback();
+    method public androidx.core.animation.Interpolator? getInterpolator();
+    method public String getName();
+    method public androidx.transition.PathMotion getPathMotion();
+    method public androidx.transition.TransitionPropagation? getPropagation();
+    method public long getStartDelay();
+    method public java.util.List<java.lang.Integer!> getTargetIds();
+    method public java.util.List<java.lang.String!>? getTargetNames();
+    method public java.util.List<java.lang.Class<?>!>? getTargetTypes();
+    method public java.util.List<android.view.View!> getTargets();
+    method public String![]? getTransitionProperties();
+    method public androidx.transition.TransitionValues? getTransitionValues(android.view.View, boolean);
+    method public boolean isTransitionRequired(androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void pause(android.view.View!);
+    method public androidx.transition.Transition removeListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.Transition removeTarget(android.view.View);
+    method public androidx.transition.Transition removeTarget(@IdRes int);
+    method public androidx.transition.Transition removeTarget(String);
+    method public androidx.transition.Transition removeTarget(Class<?>);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public void resume(android.view.View!);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void runAnimators();
+    method public androidx.transition.Transition setDuration(long);
+    method public void setEpicenterCallback(androidx.transition.Transition.EpicenterCallback?);
+    method public androidx.transition.Transition setInterpolator(androidx.core.animation.Interpolator?);
+    method public void setMatchOrder(@androidx.transition.Transition.MatchOrder int...);
+    method public void setPathMotion(androidx.transition.PathMotion?);
+    method public void setPropagation(androidx.transition.TransitionPropagation?);
+    method public androidx.transition.Transition setStartDelay(long);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void start();
+    field public static final int MATCH_ID = 3; // 0x3
+    field public static final int MATCH_INSTANCE = 1; // 0x1
+    field public static final int MATCH_ITEM_ID = 4; // 0x4
+    field public static final int MATCH_NAME = 2; // 0x2
+  }
+
+  public abstract static class Transition.EpicenterCallback {
+    ctor public Transition.EpicenterCallback();
+    method public abstract android.graphics.Rect! onGetEpicenter(androidx.transition.Transition);
+  }
+
+  @IntDef({androidx.transition.Transition.MATCH_INSTANCE, androidx.transition.Transition.MATCH_NAME, androidx.transition.Transition.MATCH_ID, androidx.transition.Transition.MATCH_ITEM_ID}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface Transition.MatchOrder {
+  }
+
+  public static interface Transition.TransitionListener {
+    method public void onTransitionCancel(androidx.transition.Transition);
+    method public void onTransitionEnd(androidx.transition.Transition);
+    method public void onTransitionPause(androidx.transition.Transition);
+    method public void onTransitionResume(androidx.transition.Transition);
+    method public void onTransitionStart(androidx.transition.Transition);
+  }
+
+  public class TransitionInflater {
+    method public static androidx.transition.TransitionInflater from(android.content.Context);
+    method public androidx.transition.Transition! inflateTransition(int);
+    method public androidx.transition.TransitionManager! inflateTransitionManager(int, android.view.ViewGroup!);
+  }
+
+  public class TransitionListenerAdapter implements androidx.transition.Transition.TransitionListener {
+    ctor public TransitionListenerAdapter();
+    method public void onTransitionCancel(androidx.transition.Transition);
+    method public void onTransitionEnd(androidx.transition.Transition);
+    method public void onTransitionPause(androidx.transition.Transition);
+    method public void onTransitionResume(androidx.transition.Transition);
+    method public void onTransitionStart(androidx.transition.Transition);
+  }
+
+  public class TransitionManager {
+    ctor public TransitionManager();
+    method public static void beginDelayedTransition(android.view.ViewGroup);
+    method public static void beginDelayedTransition(android.view.ViewGroup, androidx.transition.Transition?);
+    method public static void endTransitions(android.view.ViewGroup!);
+    method public static void go(androidx.transition.Scene);
+    method public static void go(androidx.transition.Scene, androidx.transition.Transition?);
+    method public void setTransition(androidx.transition.Scene, androidx.transition.Transition?);
+    method public void setTransition(androidx.transition.Scene, androidx.transition.Scene, androidx.transition.Transition?);
+    method public void transitionTo(androidx.transition.Scene);
+  }
+
+  public abstract class TransitionPropagation {
+    ctor public TransitionPropagation();
+    method public abstract void captureValues(androidx.transition.TransitionValues!);
+    method public abstract String![]! getPropagationProperties();
+    method public abstract long getStartDelay(android.view.ViewGroup!, androidx.transition.Transition!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+  }
+
+  public class TransitionSet extends androidx.transition.Transition {
+    ctor public TransitionSet();
+    ctor public TransitionSet(android.content.Context, android.util.AttributeSet);
+    method public androidx.transition.TransitionSet addListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.TransitionSet addTarget(android.view.View);
+    method public androidx.transition.TransitionSet addTarget(@IdRes int);
+    method public androidx.transition.TransitionSet addTarget(String);
+    method public androidx.transition.TransitionSet addTarget(Class<?>);
+    method public androidx.transition.TransitionSet addTransition(androidx.transition.Transition);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method public int getOrdering();
+    method public androidx.transition.Transition? getTransitionAt(int);
+    method public int getTransitionCount();
+    method public androidx.transition.TransitionSet removeListener(androidx.transition.Transition.TransitionListener);
+    method public androidx.transition.TransitionSet removeTarget(@IdRes int);
+    method public androidx.transition.TransitionSet removeTarget(android.view.View);
+    method public androidx.transition.TransitionSet removeTarget(Class<?>);
+    method public androidx.transition.TransitionSet removeTarget(String);
+    method public androidx.transition.TransitionSet removeTransition(androidx.transition.Transition);
+    method public androidx.transition.TransitionSet setDuration(long);
+    method public androidx.transition.TransitionSet setInterpolator(androidx.core.animation.Interpolator?);
+    method public androidx.transition.TransitionSet setOrdering(int);
+    method public androidx.transition.TransitionSet setStartDelay(long);
+    field public static final int ORDERING_SEQUENTIAL = 1; // 0x1
+    field public static final int ORDERING_TOGETHER = 0; // 0x0
+  }
+
+  public class TransitionValues {
+    ctor @Deprecated public TransitionValues();
+    ctor public TransitionValues(android.view.View);
+    field public final java.util.Map<java.lang.String!,java.lang.Object!>! values;
+    field public android.view.View! view;
+  }
+
+  public abstract class Visibility extends androidx.transition.Transition {
+    ctor public Visibility();
+    ctor public Visibility(android.content.Context, android.util.AttributeSet);
+    method public void captureEndValues(androidx.transition.TransitionValues);
+    method public void captureStartValues(androidx.transition.TransitionValues);
+    method @androidx.transition.Visibility.Mode public int getMode();
+    method public boolean isVisible(androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public void setMode(@androidx.transition.Visibility.Mode int);
+    field public static final int MODE_IN = 1; // 0x1
+    field public static final int MODE_OUT = 2; // 0x2
+  }
+
+  @IntDef(flag=true, value={androidx.transition.Visibility.MODE_IN, androidx.transition.Visibility.MODE_OUT, androidx.transition.Fade.IN, androidx.transition.Fade.OUT}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface Visibility.Mode {
+  }
+
+  public abstract class VisibilityPropagation extends androidx.transition.TransitionPropagation {
+    ctor public VisibilityPropagation();
+    method public void captureValues(androidx.transition.TransitionValues!);
+    method public String![]! getPropagationProperties();
+    method public int getViewVisibility(androidx.transition.TransitionValues!);
+    method public int getViewX(androidx.transition.TransitionValues!);
+    method public int getViewY(androidx.transition.TransitionValues!);
+  }
+
+}
+
diff --git a/transition/transition/api/restricted_current.txt b/transition/transition/api/restricted_current.txt
index fdce88d..eec52d6 100644
--- a/transition/transition/api/restricted_current.txt
+++ b/transition/transition/api/restricted_current.txt
@@ -151,12 +151,12 @@
     method public androidx.transition.Transition addTarget(@IdRes int);
     method public androidx.transition.Transition addTarget(String);
     method public androidx.transition.Transition addTarget(Class<?>);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void animate(android.animation.Animator!);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void animate(androidx.core.animation.Animator!);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void cancel();
     method public abstract void captureEndValues(androidx.transition.TransitionValues);
     method public abstract void captureStartValues(androidx.transition.TransitionValues);
-    method public androidx.transition.Transition! clone();
-    method public android.animation.Animator? createAnimator(android.view.ViewGroup, androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
+    method public androidx.transition.Transition clone();
+    method public androidx.core.animation.Animator? createAnimator(android.view.ViewGroup, androidx.transition.TransitionValues?, androidx.transition.TransitionValues?);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void createAnimators(android.view.ViewGroup!, androidx.transition.TransitionValuesMaps!, androidx.transition.TransitionValuesMaps!, java.util.ArrayList<androidx.transition.TransitionValues!>!, java.util.ArrayList<androidx.transition.TransitionValues!>!);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void end();
     method public androidx.transition.Transition excludeChildren(android.view.View, boolean);
@@ -169,7 +169,7 @@
     method public long getDuration();
     method public android.graphics.Rect? getEpicenter();
     method public androidx.transition.Transition.EpicenterCallback? getEpicenterCallback();
-    method public android.animation.TimeInterpolator? getInterpolator();
+    method public androidx.core.animation.Interpolator? getInterpolator();
     method public String getName();
     method public androidx.transition.PathMotion getPathMotion();
     method public androidx.transition.TransitionPropagation? getPropagation();
@@ -191,7 +191,7 @@
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void runAnimators();
     method public androidx.transition.Transition setDuration(long);
     method public void setEpicenterCallback(androidx.transition.Transition.EpicenterCallback?);
-    method public androidx.transition.Transition setInterpolator(android.animation.TimeInterpolator?);
+    method public androidx.transition.Transition setInterpolator(androidx.core.animation.Interpolator?);
     method public void setMatchOrder(@androidx.transition.Transition.MatchOrder int...);
     method public void setPathMotion(androidx.transition.PathMotion?);
     method public void setPropagation(androidx.transition.TransitionPropagation?);
@@ -274,7 +274,7 @@
     method public androidx.transition.TransitionSet removeTarget(String);
     method public androidx.transition.TransitionSet removeTransition(androidx.transition.Transition);
     method public androidx.transition.TransitionSet setDuration(long);
-    method public androidx.transition.TransitionSet setInterpolator(android.animation.TimeInterpolator?);
+    method public androidx.transition.TransitionSet setInterpolator(androidx.core.animation.Interpolator?);
     method public androidx.transition.TransitionSet setOrdering(int);
     method public androidx.transition.TransitionSet setStartDelay(long);
     field public static final int ORDERING_SEQUENTIAL = 1; // 0x1
@@ -295,10 +295,10 @@
     method public void captureStartValues(androidx.transition.TransitionValues);
     method @androidx.transition.Visibility.Mode public int getMode();
     method public boolean isVisible(androidx.transition.TransitionValues!);
-    method public android.animation.Animator? onAppear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
-    method public android.animation.Animator? onAppear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
-    method public android.animation.Animator? onDisappear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
-    method public android.animation.Animator? onDisappear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onAppear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, androidx.transition.TransitionValues!, int, androidx.transition.TransitionValues!, int);
+    method public androidx.core.animation.Animator? onDisappear(android.view.ViewGroup!, android.view.View!, androidx.transition.TransitionValues!, androidx.transition.TransitionValues!);
     method public void setMode(@androidx.transition.Visibility.Mode int);
     field public static final int MODE_IN = 1; // 0x1
     field public static final int MODE_OUT = 2; // 0x2
diff --git a/transition/transition/build.gradle b/transition/transition/build.gradle
index 7a5e169..6d3f74d 100644
--- a/transition/transition/build.gradle
+++ b/transition/transition/build.gradle
@@ -13,6 +13,7 @@
 dependencies {
     api("androidx.annotation:annotation:1.1.0")
     api("androidx.core:core:1.1.0")
+    api(project(":core:core-animation"))
     implementation("androidx.collection:collection:1.1.0")
     compileOnly(project(":fragment:fragment"))
     compileOnly("androidx.appcompat:appcompat:1.0.1")
@@ -37,8 +38,8 @@
 
 android {
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_7
-        targetCompatibility = JavaVersion.VERSION_1_7
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
     buildTypes.all {
         consumerProguardFiles 'proguard-rules.pro'
diff --git a/transition/transition/src/androidTest/java/androidx/transition/BaseTransitionTest.java b/transition/transition/src/androidTest/java/androidx/transition/BaseTransitionTest.java
index a8fc93e..5e25809 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/BaseTransitionTest.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/BaseTransitionTest.java
@@ -21,12 +21,12 @@
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import androidx.core.animation.Animator;
+import androidx.core.animation.ObjectAnimator;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.testutils.AnimationDurationScaleRule;
 import androidx.transition.test.R;
diff --git a/transition/transition/src/androidTest/java/androidx/transition/ChangeBoundsTest.java b/transition/transition/src/androidTest/java/androidx/transition/ChangeBoundsTest.java
index 7e7f751..97357e5 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/ChangeBoundsTest.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/ChangeBoundsTest.java
@@ -24,10 +24,10 @@
 import android.content.Context;
 import android.os.Build;
 import android.view.View;
-import android.view.animation.LinearInterpolator;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
+import androidx.core.animation.LinearInterpolator;
 import androidx.test.annotation.UiThreadTest;
 import androidx.test.filters.LargeTest;
 import androidx.transition.test.R;
diff --git a/transition/transition/src/androidTest/java/androidx/transition/ChangeImageTransformTest.java b/transition/transition/src/androidTest/java/androidx/transition/ChangeImageTransformTest.java
index 6b3802f..6903822 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/ChangeImageTransformTest.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/ChangeImageTransformTest.java
@@ -25,8 +25,6 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
@@ -39,6 +37,8 @@
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorListenerAdapter;
 import androidx.core.app.ActivityCompat;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -372,12 +372,12 @@
         }
 
         @Override
-        public void onAnimationStart(Animator animation) {
+        public void onAnimationStart(@NonNull Animator animation) {
             mStartMatrix = copyMatrix();
         }
 
         @Override
-        public void onAnimationEnd(Animator animation) {
+        public void onAnimationEnd(@NonNull Animator animation) {
             mEndMatrix = copyMatrix();
         }
 
diff --git a/transition/transition/src/androidTest/java/androidx/transition/FadeTest.java b/transition/transition/src/androidTest/java/androidx/transition/FadeTest.java
index fa58f8b..36fe4d5 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/FadeTest.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/FadeTest.java
@@ -31,15 +31,15 @@
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
 import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.ObjectAnimator;
+import androidx.core.animation.ValueAnimator;
 import androidx.test.annotation.UiThreadTest;
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -300,11 +300,12 @@
                 @Nullable final TransitionValues endValues) {
             final Animator animator = super.createAnimator(sceneRoot, startValues, endValues);
             if (animator instanceof ObjectAnimator) {
-                ((ObjectAnimator) animator).addUpdateListener(
+                animator.addUpdateListener(
                         new ValueAnimator.AnimatorUpdateListener() {
                             @Override
-                            public void onAnimationUpdate(ValueAnimator animation) {
-                                final float alpha = (float) animation.getAnimatedValue();
+                            public void onAnimationUpdate(@NonNull Animator animation) {
+                                final ValueAnimator anim = (ValueAnimator) animation;
+                                final float alpha = (float) anim.getAnimatedValue();
                                 mAlphaValues[1] = alpha;
                                 if (mInitialAlpha < 0) {
                                     mInitialAlpha = alpha;
diff --git a/transition/transition/src/androidTest/java/androidx/transition/PrevTransitionStoppedTest.java b/transition/transition/src/androidTest/java/androidx/transition/PrevTransitionStoppedTest.java
index 873d8c6..8050da9 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/PrevTransitionStoppedTest.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/PrevTransitionStoppedTest.java
@@ -21,12 +21,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import android.animation.Animator;
-import android.animation.ValueAnimator;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.core.animation.Animator;
+import androidx.core.animation.ValueAnimator;
 import androidx.test.filters.MediumTest;
 import androidx.transition.test.R;
 
diff --git a/transition/transition/src/androidTest/java/androidx/transition/PropagationTest.java b/transition/transition/src/androidTest/java/androidx/transition/PropagationTest.java
index 8c6da69..a5a104d 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/PropagationTest.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/PropagationTest.java
@@ -23,9 +23,6 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
 import android.graphics.Rect;
 import android.util.SparseArray;
 import android.view.Gravity;
@@ -33,6 +30,9 @@
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorListenerAdapter;
+import androidx.core.animation.ObjectAnimator;
 import androidx.test.filters.MediumTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.transition.test.R;
@@ -111,7 +111,7 @@
                 final Animator anim = super.onDisappear(sceneRoot, view, startValues, endValues);
                 anim.addListener(new AnimatorListenerAdapter() {
                     @Override
-                    public void onAnimationStart(Animator animation) {
+                    public void onAnimationStart(@NonNull Animator animation) {
                         final ObjectAnimator a = (ObjectAnimator) animation;
                         final int viewId = ((View) a.getTarget()).getId();
                         final long startDelay = a.getStartDelay();
diff --git a/transition/transition/src/androidTest/java/androidx/transition/TrackingVisibility.java b/transition/transition/src/androidTest/java/androidx/transition/TrackingVisibility.java
index 46c421e..91917c5 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/TrackingVisibility.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/TrackingVisibility.java
@@ -15,13 +15,14 @@
  */
 package androidx.transition;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
 import android.graphics.Rect;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorListenerAdapter;
+import androidx.core.animation.ObjectAnimator;
 import androidx.fragment.app.TargetTracking;
 
 import java.util.ArrayList;
@@ -72,7 +73,7 @@
             // and wait for that to end.
             animator.addListener(new AnimatorListenerAdapter() {
                 @Override
-                public void onAnimationStart(Animator animation) {
+                public void onAnimationStart(@NonNull Animator animation) {
                     super.onAnimationStart(animation);
                     animation.removeListener(this);
                     animation.addListener(this);
@@ -80,7 +81,7 @@
                 }
 
                 @Override
-                public void onAnimationEnd(Animator animation) {
+                public void onAnimationEnd(@NonNull Animator animation) {
                     endAnimatorCountDownLatch.countDown();
                     animation.removeListener(this);
                 }
@@ -90,6 +91,7 @@
         return null;
     }
 
+    @NonNull
     @Override
     public ArrayList<View> getTrackedTargets() {
         return targets;
diff --git a/transition/transition/src/androidTest/java/androidx/transition/TransitionSetTest.java b/transition/transition/src/androidTest/java/androidx/transition/TransitionSetTest.java
index dfcb088..f146126 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/TransitionSetTest.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/TransitionSetTest.java
@@ -25,14 +25,15 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
-import android.animation.TimeInterpolator;
 import android.graphics.Rect;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.DecelerateInterpolator;
 
+import androidx.annotation.NonNull;
+import androidx.core.animation.AccelerateDecelerateInterpolator;
+import androidx.core.animation.AccelerateInterpolator;
+import androidx.core.animation.DecelerateInterpolator;
+import androidx.core.animation.Interpolator;
 import androidx.test.filters.SmallTest;
 import androidx.transition.test.R;
 
@@ -145,7 +146,7 @@
         fade.setPropagation(new TestPropagation());
         fade.setEpicenterCallback(new Transition.EpicenterCallback() {
             @Override
-            public Rect onGetEpicenter(Transition transition) {
+            public Rect onGetEpicenter(@NonNull Transition transition) {
                 return null;
             }
         });
@@ -155,11 +156,11 @@
         TransitionSet transitionSet = new TransitionSet();
         int duration = 100;
         TestPropagation propagation = new TestPropagation();
-        TimeInterpolator interpolator = new DecelerateInterpolator();
+        Interpolator interpolator = new DecelerateInterpolator();
         PathMotion pathMotion = new ArcMotion();
         Transition.EpicenterCallback epicenterCallback = new Transition.EpicenterCallback() {
             @Override
-            public Rect onGetEpicenter(Transition transition) {
+            public Rect onGetEpicenter(@NonNull Transition transition) {
                 return null;
             }
         };
@@ -184,7 +185,7 @@
         fade.setPropagation(new TestPropagation());
         fade.setEpicenterCallback(new Transition.EpicenterCallback() {
             @Override
-            public Rect onGetEpicenter(Transition transition) {
+            public Rect onGetEpicenter(@NonNull Transition transition) {
                 return null;
             }
         });
@@ -211,11 +212,11 @@
         Fade fade = new Fade();
         int duration = 100;
         TestPropagation propagation = new TestPropagation();
-        TimeInterpolator interpolator = new DecelerateInterpolator();
+        Interpolator interpolator = new DecelerateInterpolator();
         PathMotion pathMotion = new ArcMotion();
         Transition.EpicenterCallback epicenterCallback = new Transition.EpicenterCallback() {
             @Override
-            public Rect onGetEpicenter(Transition transition) {
+            public Rect onGetEpicenter(@NonNull Transition transition) {
                 return null;
             }
         };
@@ -245,7 +246,7 @@
         transitionSet.addTransition(fade); // here set's duration and interpolator are applied
 
         int overriddenDuration = 200;
-        TimeInterpolator overriddenInterpolator = new AccelerateInterpolator();
+        Interpolator overriddenInterpolator = new AccelerateInterpolator();
         fade.setDuration(overriddenDuration);
         fade.setInterpolator(overriddenInterpolator);
 
diff --git a/transition/transition/src/androidTest/java/androidx/transition/TransitionTest.java b/transition/transition/src/androidTest/java/androidx/transition/TransitionTest.java
index 2a52da8..5c654b5 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/TransitionTest.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/TransitionTest.java
@@ -32,20 +32,20 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.animation.TimeInterpolator;
 import android.graphics.Rect;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.LinearInterpolator;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.Interpolator;
+import androidx.core.animation.LinearInterpolator;
+import androidx.core.animation.ObjectAnimator;
 import androidx.core.view.ViewCompat;
 import androidx.test.annotation.UiThreadTest;
 import androidx.test.filters.MediumTest;
@@ -88,7 +88,7 @@
     @Test
     public void testInterpolator() {
         Transition transition = new EmptyTransition();
-        TimeInterpolator interpolator = new LinearInterpolator();
+        Interpolator interpolator = new LinearInterpolator();
         assertThat(transition.setInterpolator(interpolator), is(sameInstance(transition)));
         assertThat(transition.getInterpolator(), is(interpolator));
     }
@@ -226,7 +226,7 @@
     public void testExcludeTargetType() throws Throwable {
         showInitialScene();
         Transition transition = new EmptyTransition();
-        FrameLayout container = (FrameLayout) rule.getActivity().findViewById(R.id.container);
+        FrameLayout container = rule.getActivity().findViewById(R.id.container);
         View view0 = rule.getActivity().findViewById(R.id.view0);
         transition.addTarget(View.class);
         assertThat(transition.isValidTarget(container), is(true));
diff --git a/transition/transition/src/androidTest/java/androidx/transition/TranslationAnimationCreatorTest.java b/transition/transition/src/androidTest/java/androidx/transition/TranslationAnimationCreatorTest.java
index 976277a..12173c1 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/TranslationAnimationCreatorTest.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/TranslationAnimationCreatorTest.java
@@ -20,10 +20,10 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import android.animation.Animator;
 import android.view.View;
-import android.view.animation.LinearInterpolator;
 
+import androidx.core.animation.Animator;
+import androidx.core.animation.LinearInterpolator;
 import androidx.test.annotation.UiThreadTest;
 import androidx.test.filters.LargeTest;
 
diff --git a/transition/transition/src/androidTest/java/androidx/transition/VisibilityTest.java b/transition/transition/src/androidTest/java/androidx/transition/VisibilityTest.java
index dd8cb01..704b0b3 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/VisibilityTest.java
+++ b/transition/transition/src/androidTest/java/androidx/transition/VisibilityTest.java
@@ -27,14 +27,14 @@
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.ObjectAnimator;
+import androidx.core.animation.ValueAnimator;
 import androidx.test.annotation.UiThreadTest;
 import androidx.test.filters.FlakyTest;
 import androidx.test.filters.MediumTest;
diff --git a/transition/transition/src/main/java/androidx/transition/AnimatorUtils.java b/transition/transition/src/main/java/androidx/transition/AnimatorUtils.java
deleted file mode 100644
index 6772a60..0000000
--- a/transition/transition/src/main/java/androidx/transition/AnimatorUtils.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2017 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.transition;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.os.Build;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-
-class AnimatorUtils {
-
-    static void addPauseListener(@NonNull Animator animator,
-            @NonNull AnimatorListenerAdapter listener) {
-        if (Build.VERSION.SDK_INT >= 19) {
-            animator.addPauseListener(listener);
-        }
-    }
-
-    static void pause(@NonNull Animator animator) {
-        if (Build.VERSION.SDK_INT >= 19) {
-            animator.pause();
-        } else {
-            final ArrayList<Animator.AnimatorListener> listeners = animator.getListeners();
-            if (listeners != null) {
-                for (int i = 0, size = listeners.size(); i < size; i++) {
-                    final Animator.AnimatorListener listener = listeners.get(i);
-                    if (listener instanceof AnimatorPauseListenerCompat) {
-                        ((AnimatorPauseListenerCompat) listener).onAnimationPause(animator);
-                    }
-                }
-            }
-        }
-    }
-
-    static void resume(@NonNull Animator animator) {
-        if (Build.VERSION.SDK_INT >= 19) {
-            animator.resume();
-        } else {
-            final ArrayList<Animator.AnimatorListener> listeners = animator.getListeners();
-            if (listeners != null) {
-                for (int i = 0, size = listeners.size(); i < size; i++) {
-                    final Animator.AnimatorListener listener = listeners.get(i);
-                    if (listener instanceof AnimatorPauseListenerCompat) {
-                        ((AnimatorPauseListenerCompat) listener).onAnimationResume(animator);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Listeners can implement this interface in addition to the platform AnimatorPauseListener to
-     * make them compatible with API level 18 and below. Animators will not be paused or resumed,
-     * but the callbacks here are invoked.
-     */
-    interface AnimatorPauseListenerCompat {
-
-        void onAnimationPause(Animator animation);
-
-        void onAnimationResume(Animator animation);
-
-    }
-
-    private AnimatorUtils() {
-    }
-}
diff --git a/transition/transition/src/main/java/androidx/transition/ChangeBounds.java b/transition/transition/src/main/java/androidx/transition/ChangeBounds.java
index a0fcc2c..a652cb5 100644
--- a/transition/transition/src/main/java/androidx/transition/ChangeBounds.java
+++ b/transition/transition/src/main/java/androidx/transition/ChangeBounds.java
@@ -16,11 +16,6 @@
 
 package androidx.transition;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -39,6 +34,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorListenerAdapter;
+import androidx.core.animation.AnimatorSet;
+import androidx.core.animation.ObjectAnimator;
+import androidx.core.animation.PropertyValuesHolder;
+import androidx.core.animation.RectEvaluator;
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.core.view.ViewCompat;
 
@@ -307,19 +308,19 @@
                         if (startWidth == endWidth && startHeight == endHeight) {
                             Path topLeftPath = getPathMotion().getPath(startLeft, startTop, endLeft,
                                     endTop);
-                            anim = ObjectAnimatorUtils.ofPointF(view, POSITION_PROPERTY,
+                            anim = ObjectAnimator.ofObject(view, POSITION_PROPERTY, null,
                                     topLeftPath);
                         } else {
                             final ViewBounds viewBounds = new ViewBounds(view);
                             Path topLeftPath = getPathMotion().getPath(startLeft, startTop,
                                     endLeft, endTop);
-                            ObjectAnimator topLeftAnimator = ObjectAnimatorUtils
-                                    .ofPointF(viewBounds, TOP_LEFT_PROPERTY, topLeftPath);
+                            ObjectAnimator topLeftAnimator = ObjectAnimator
+                                    .ofObject(viewBounds, TOP_LEFT_PROPERTY, null, topLeftPath);
 
                             Path bottomRightPath = getPathMotion().getPath(startRight, startBottom,
                                     endRight, endBottom);
-                            ObjectAnimator bottomRightAnimator = ObjectAnimatorUtils.ofPointF(
-                                    viewBounds, BOTTOM_RIGHT_PROPERTY, bottomRightPath);
+                            ObjectAnimator bottomRightAnimator = ObjectAnimator.ofObject(
+                                    viewBounds, BOTTOM_RIGHT_PROPERTY, null, bottomRightPath);
                             AnimatorSet set = new AnimatorSet();
                             set.playTogether(topLeftAnimator, bottomRightAnimator);
                             anim = set;
@@ -333,12 +334,12 @@
                     } else if (startLeft != endLeft || startTop != endTop) {
                         Path topLeftPath = getPathMotion().getPath(startLeft, startTop,
                                 endLeft, endTop);
-                        anim = ObjectAnimatorUtils.ofPointF(view, TOP_LEFT_ONLY_PROPERTY,
+                        anim = ObjectAnimator.ofObject(view, TOP_LEFT_ONLY_PROPERTY, null,
                                 topLeftPath);
                     } else {
                         Path bottomRight = getPathMotion().getPath(startRight, startBottom,
                                 endRight, endBottom);
-                        anim = ObjectAnimatorUtils.ofPointF(view, BOTTOM_RIGHT_ONLY_PROPERTY,
+                        anim = ObjectAnimator.ofObject(view, BOTTOM_RIGHT_ONLY_PROPERTY, null,
                                 bottomRight);
                     }
                 } else {
@@ -352,7 +353,7 @@
                     if (startLeft != endLeft || startTop != endTop) {
                         Path topLeftPath = getPathMotion().getPath(startLeft, startTop, endLeft,
                                 endTop);
-                        positionAnimator = ObjectAnimatorUtils.ofPointF(view, POSITION_PROPERTY,
+                        positionAnimator = ObjectAnimator.ofObject(view, POSITION_PROPERTY, null,
                                 topLeftPath);
                     }
                     final Rect finalClip = endClip;
@@ -371,12 +372,12 @@
                             private boolean mIsCanceled;
 
                             @Override
-                            public void onAnimationCancel(Animator animation) {
+                            public void onAnimationCancel(@NonNull Animator animation) {
                                 mIsCanceled = true;
                             }
 
                             @Override
-                            public void onAnimationEnd(Animator animation) {
+                            public void onAnimationEnd(@NonNull Animator animation) {
                                 if (!mIsCanceled) {
                                     ViewCompat.setClipBounds(view, finalClip);
                                     ViewUtils.setLeftTopRightBottom(view, endLeft, endTop, endRight,
@@ -442,12 +443,12 @@
                 Path topLeftPath = getPathMotion().getPath(startX - mTempLocation[0],
                         startY - mTempLocation[1], endX - mTempLocation[0],
                         endY - mTempLocation[1]);
-                PropertyValuesHolder origin = PropertyValuesHolderUtils.ofPointF(
-                        DRAWABLE_ORIGIN_PROPERTY, topLeftPath);
+                PropertyValuesHolder origin = PropertyValuesHolder.ofObject(
+                        DRAWABLE_ORIGIN_PROPERTY, null, topLeftPath);
                 ObjectAnimator anim = ObjectAnimator.ofPropertyValuesHolder(drawable, origin);
                 anim.addListener(new AnimatorListenerAdapter() {
                     @Override
-                    public void onAnimationEnd(Animator animation) {
+                    public void onAnimationEnd(@NonNull Animator animation) {
                         ViewUtils.getOverlay(sceneRoot).remove(drawable);
                         ViewUtils.setTransitionAlpha(view, transitionAlpha);
                     }
diff --git a/transition/transition/src/main/java/androidx/transition/ChangeClipBounds.java b/transition/transition/src/main/java/androidx/transition/ChangeClipBounds.java
index b568ae2..85c039d 100644
--- a/transition/transition/src/main/java/androidx/transition/ChangeClipBounds.java
+++ b/transition/transition/src/main/java/androidx/transition/ChangeClipBounds.java
@@ -16,9 +16,6 @@
 
 package androidx.transition;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -27,6 +24,10 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorListenerAdapter;
+import androidx.core.animation.ObjectAnimator;
+import androidx.core.animation.RectEvaluator;
 import androidx.core.view.ViewCompat;
 
 /**
@@ -115,7 +116,7 @@
             final View endView = endValues.view;
             animator.addListener(new AnimatorListenerAdapter() {
                 @Override
-                public void onAnimationEnd(Animator animation) {
+                public void onAnimationEnd(@NonNull Animator animation) {
                     ViewCompat.setClipBounds(endView, null);
                 }
             });
diff --git a/transition/transition/src/main/java/androidx/transition/ChangeImageTransform.java b/transition/transition/src/main/java/androidx/transition/ChangeImageTransform.java
index cfdbbd3..1b53282 100644
--- a/transition/transition/src/main/java/androidx/transition/ChangeImageTransform.java
+++ b/transition/transition/src/main/java/androidx/transition/ChangeImageTransform.java
@@ -16,9 +16,6 @@
 
 package androidx.transition;
 
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
-import android.animation.TypeEvaluator;
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.Rect;
@@ -31,6 +28,9 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.ObjectAnimator;
+import androidx.core.animation.TypeEvaluator;
 
 import java.util.Map;
 
@@ -54,7 +54,8 @@
 
     private static final TypeEvaluator<Matrix> NULL_MATRIX_EVALUATOR = new TypeEvaluator<Matrix>() {
         @Override
-        public Matrix evaluate(float fraction, Matrix startValue, Matrix endValue) {
+        public Matrix evaluate(float fraction, @NonNull Matrix startValue,
+                @NonNull Matrix endValue) {
             return null;
         }
     };
diff --git a/transition/transition/src/main/java/androidx/transition/ChangeScroll.java b/transition/transition/src/main/java/androidx/transition/ChangeScroll.java
index d2b9a21..56421e3 100644
--- a/transition/transition/src/main/java/androidx/transition/ChangeScroll.java
+++ b/transition/transition/src/main/java/androidx/transition/ChangeScroll.java
@@ -16,8 +16,6 @@
 
 package androidx.transition;
 
-import android.animation.Animator;
-import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
@@ -25,6 +23,8 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.ObjectAnimator;
 
 
 /**
diff --git a/transition/transition/src/main/java/androidx/transition/ChangeTransform.java b/transition/transition/src/main/java/androidx/transition/ChangeTransform.java
index 84b869f..69f36f5 100644
--- a/transition/transition/src/main/java/androidx/transition/ChangeTransform.java
+++ b/transition/transition/src/main/java/androidx/transition/ChangeTransform.java
@@ -16,10 +16,6 @@
 
 package androidx.transition;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -34,6 +30,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorListenerAdapter;
+import androidx.core.animation.FloatArrayEvaluator;
+import androidx.core.animation.ObjectAnimator;
+import androidx.core.animation.PropertyValuesHolder;
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.core.view.ViewCompat;
 
@@ -321,8 +322,8 @@
         Path path = getPathMotion().getPath(startMatrixValues[Matrix.MTRANS_X],
                 startMatrixValues[Matrix.MTRANS_Y], endMatrixValues[Matrix.MTRANS_X],
                 endMatrixValues[Matrix.MTRANS_Y]);
-        PropertyValuesHolder translationProperty = PropertyValuesHolderUtils.ofPointF(
-                TRANSLATIONS_PROPERTY, path);
+        PropertyValuesHolder translationProperty = PropertyValuesHolder.ofObject(
+                TRANSLATIONS_PROPERTY, null, path);
         ObjectAnimator animator = ObjectAnimator.ofPropertyValuesHolder(pathAnimatorMatrix,
                 valuesProperty, translationProperty);
 
@@ -333,12 +334,12 @@
             private Matrix mTempMatrix = new Matrix();
 
             @Override
-            public void onAnimationCancel(Animator animation) {
+            public void onAnimationCancel(@NonNull Animator animation) {
                 mIsCanceled = true;
             }
 
             @Override
-            public void onAnimationEnd(Animator animation) {
+            public void onAnimationEnd(@NonNull Animator animation) {
                 if (!mIsCanceled) {
                     if (handleParentChange && mUseOverlay) {
                         setCurrentMatrix(finalEndMatrix);
@@ -352,13 +353,13 @@
             }
 
             @Override
-            public void onAnimationPause(Animator animation) {
+            public void onAnimationPause(@NonNull Animator animation) {
                 Matrix currentMatrix = pathAnimatorMatrix.getMatrix();
                 setCurrentMatrix(currentMatrix);
             }
 
             @Override
-            public void onAnimationResume(Animator animation) {
+            public void onAnimationResume(@NonNull Animator animation) {
                 setIdentityTransforms(view);
             }
 
@@ -370,7 +371,7 @@
         };
 
         animator.addListener(listener);
-        AnimatorUtils.addPauseListener(animator, listener);
+        animator.addPauseListener(listener);
         return animator;
     }
 
diff --git a/transition/transition/src/main/java/androidx/transition/Explode.java b/transition/transition/src/main/java/androidx/transition/Explode.java
index 2423e3e..a142b40 100644
--- a/transition/transition/src/main/java/androidx/transition/Explode.java
+++ b/transition/transition/src/main/java/androidx/transition/Explode.java
@@ -16,18 +16,18 @@
 
 package androidx.transition;
 
-import android.animation.Animator;
-import android.animation.TimeInterpolator;
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.DecelerateInterpolator;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.AccelerateInterpolator;
+import androidx.core.animation.Animator;
+import androidx.core.animation.DecelerateInterpolator;
+import androidx.core.animation.Interpolator;
 
 /**
  * This transition tracks changes to the visibility of target views in the
@@ -42,8 +42,8 @@
  */
 public class Explode extends Visibility {
 
-    private static final TimeInterpolator sDecelerate = new DecelerateInterpolator();
-    private static final TimeInterpolator sAccelerate = new AccelerateInterpolator();
+    private static final Interpolator sDecelerate = new DecelerateInterpolator();
+    private static final Interpolator sAccelerate = new AccelerateInterpolator();
     private static final String PROPNAME_SCREEN_BOUNDS = "android:explode:screenBounds";
 
     private int[] mTempLoc = new int[2];
diff --git a/transition/transition/src/main/java/androidx/transition/Fade.java b/transition/transition/src/main/java/androidx/transition/Fade.java
index 50c8390..39071f1 100644
--- a/transition/transition/src/main/java/androidx/transition/Fade.java
+++ b/transition/transition/src/main/java/androidx/transition/Fade.java
@@ -16,9 +16,6 @@
 
 package androidx.transition;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -30,6 +27,9 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorListenerAdapter;
+import androidx.core.animation.ObjectAnimator;
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.core.view.ViewCompat;
 
@@ -191,7 +191,7 @@
         }
 
         @Override
-        public void onAnimationStart(Animator animation) {
+        public void onAnimationStart(@NonNull Animator animation) {
             if (ViewCompat.hasOverlappingRendering(mView)
                     && mView.getLayerType() == View.LAYER_TYPE_NONE) {
                 mLayerTypeChanged = true;
@@ -200,7 +200,7 @@
         }
 
         @Override
-        public void onAnimationEnd(Animator animation) {
+        public void onAnimationEnd(@NonNull Animator animation) {
             ViewUtils.setTransitionAlpha(mView, 1);
             if (mLayerTypeChanged) {
                 mView.setLayerType(View.LAYER_TYPE_NONE, null);
diff --git a/transition/transition/src/main/java/androidx/transition/FloatArrayEvaluator.java b/transition/transition/src/main/java/androidx/transition/FloatArrayEvaluator.java
deleted file mode 100644
index 9947921..0000000
--- a/transition/transition/src/main/java/androidx/transition/FloatArrayEvaluator.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 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.transition;
-
-import android.animation.TypeEvaluator;
-
-/**
- * This evaluator can be used to perform type interpolation between <code>float[]</code> values.
- * Each index into the array is treated as a separate value to interpolate. For example,
- * evaluating <code>{100, 200}</code> and <code>{300, 400}</code> will interpolate the value at
- * the first index between 100 and 300 and the value at the second index value between 200 and 400.
- */
-class FloatArrayEvaluator implements TypeEvaluator<float[]> {
-
-    private float[] mArray;
-
-    /**
-     * Create a FloatArrayEvaluator that reuses <code>reuseArray</code> for every evaluate() call.
-     * Caution must be taken to ensure that the value returned from
-     * {@link android.animation.ValueAnimator#getAnimatedValue()} is not cached, modified, or
-     * used across threads. The value will be modified on each <code>evaluate()</code> call.
-     *
-     * @param reuseArray The array to modify and return from <code>evaluate</code>.
-     */
-    FloatArrayEvaluator(float[] reuseArray) {
-        mArray = reuseArray;
-    }
-
-    /**
-     * Interpolates the value at each index by the fraction. If
-     * {@link #FloatArrayEvaluator(float[])} was used to construct this object,
-     * <code>reuseArray</code> will be returned, otherwise a new <code>float[]</code>
-     * will be returned.
-     *
-     * @param fraction   The fraction from the starting to the ending values
-     * @param startValue The start value.
-     * @param endValue   The end value.
-     * @return A <code>float[]</code> where each element is an interpolation between
-     * the same index in startValue and endValue.
-     */
-    @Override
-    public float[] evaluate(float fraction, float[] startValue, float[] endValue) {
-        float[] array = mArray;
-        if (array == null) {
-            array = new float[startValue.length];
-        }
-
-        for (int i = 0; i < array.length; i++) {
-            float start = startValue[i];
-            float end = endValue[i];
-            array[i] = start + (fraction * (end - start));
-        }
-        return array;
-    }
-
-}
diff --git a/transition/transition/src/main/java/androidx/transition/ObjectAnimatorUtils.java b/transition/transition/src/main/java/androidx/transition/ObjectAnimatorUtils.java
deleted file mode 100644
index bd73b58..0000000
--- a/transition/transition/src/main/java/androidx/transition/ObjectAnimatorUtils.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 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.transition;
-
-import android.animation.ObjectAnimator;
-import android.graphics.Path;
-import android.graphics.PointF;
-import android.os.Build;
-import android.util.Property;
-
-class ObjectAnimatorUtils {
-
-    static <T> ObjectAnimator ofPointF(T target, Property<T, PointF> property, Path path) {
-        if (Build.VERSION.SDK_INT >= 21) {
-            return ObjectAnimator.ofObject(target, property, null, path);
-        }
-        return ObjectAnimator.ofFloat(target, new PathProperty<>(property, path), 0f, 1f);
-    }
-
-    private ObjectAnimatorUtils() {
-    }
-}
diff --git a/transition/transition/src/main/java/androidx/transition/PathProperty.java b/transition/transition/src/main/java/androidx/transition/PathProperty.java
deleted file mode 100644
index be2dddb..0000000
--- a/transition/transition/src/main/java/androidx/transition/PathProperty.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 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.transition;
-
-import android.graphics.Path;
-import android.graphics.PathMeasure;
-import android.graphics.PointF;
-import android.util.Property;
-
-/**
- * A special {@link Property} that can animate a pair of properties bi-dimensionally along the
- * specified path.
- * <p>
- * This property should always be used with Animator that sets float fractions between
- * {@code 0.f} and {@code 1.f}. For example, setting {@code 0.5f} to this property sets the
- * values right in the middle of the specified path to the underlying properties.
- * <p>
- * Unlike many of the platform built-in properties, instances of this class cannot be reused
- * for later animations.
- */
-class PathProperty<T> extends Property<T, Float> {
-
-    private final Property<T, PointF> mProperty;
-    private final PathMeasure mPathMeasure;
-    private final float mPathLength;
-    private final float[] mPosition = new float[2];
-    private final PointF mPointF = new PointF();
-    private float mCurrentFraction;
-
-    PathProperty(Property<T, PointF> property, Path path) {
-        super(Float.class, property.getName());
-        mProperty = property;
-        mPathMeasure = new PathMeasure(path, false);
-        mPathLength = mPathMeasure.getLength();
-    }
-
-    @Override
-    public Float get(T object) {
-        return mCurrentFraction;
-    }
-
-    @Override
-    public void set(T target, Float fraction) {
-        mCurrentFraction = fraction;
-        mPathMeasure.getPosTan(mPathLength * fraction, mPosition, null);
-        mPointF.x = mPosition[0];
-        mPointF.y = mPosition[1];
-        mProperty.set(target, mPointF);
-    }
-
-}
diff --git a/transition/transition/src/main/java/androidx/transition/PropertyValuesHolderUtils.java b/transition/transition/src/main/java/androidx/transition/PropertyValuesHolderUtils.java
deleted file mode 100644
index 42527c4..0000000
--- a/transition/transition/src/main/java/androidx/transition/PropertyValuesHolderUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017 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.transition;
-
-import android.animation.PropertyValuesHolder;
-import android.graphics.Path;
-import android.graphics.PointF;
-import android.os.Build;
-import android.util.Property;
-
-class PropertyValuesHolderUtils {
-
-    /**
-     * Constructs and returns a PropertyValuesHolder with a given property and
-     * a Path along which the values should be animated. This variant supports a
-     * <code>TypeConverter</code> to convert from <code>PointF</code> to the target
-     * type.
-     *
-     * @param property The property being animated. Should not be null.
-     * @param path     The Path along which the values should be animated.
-     * @return PropertyValuesHolder The constructed PropertyValuesHolder object.
-     */
-    static PropertyValuesHolder ofPointF(Property<?, PointF> property, Path path) {
-        if (Build.VERSION.SDK_INT >= 21) {
-            return PropertyValuesHolder.ofObject(property, null, path);
-        }
-        return PropertyValuesHolder.ofFloat(new PathProperty<>(property, path), 0f, 1f);
-    }
-
-    private PropertyValuesHolderUtils() {
-    }
-}
diff --git a/transition/transition/src/main/java/androidx/transition/RectEvaluator.java b/transition/transition/src/main/java/androidx/transition/RectEvaluator.java
deleted file mode 100644
index 6dab422..0000000
--- a/transition/transition/src/main/java/androidx/transition/RectEvaluator.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2016 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.transition;
-
-import android.animation.TypeEvaluator;
-import android.graphics.Rect;
-
-/**
- * This evaluator can be used to perform type interpolation between <code>Rect</code> values.
- */
-class RectEvaluator implements TypeEvaluator<Rect> {
-
-    /**
-     * When null, a new Rect is returned on every evaluate call. When non-null,
-     * mRect will be modified and returned on every evaluate.
-     */
-    private Rect mRect;
-
-    /**
-     * Construct a RectEvaluator that returns a new Rect on every evaluate call.
-     * To avoid creating an object for each evaluate call,
-     * {@link RectEvaluator#RectEvaluator(android.graphics.Rect)} should be used
-     * whenever possible.
-     */
-    RectEvaluator() {
-    }
-
-    /**
-     * Constructs a RectEvaluator that modifies and returns <code>reuseRect</code>
-     * in {@link #evaluate(float, android.graphics.Rect, android.graphics.Rect)} calls.
-     * The value returned from
-     * {@link #evaluate(float, android.graphics.Rect, android.graphics.Rect)} should
-     * not be cached because it will change over time as the object is reused on each
-     * call.
-     *
-     * @param reuseRect A Rect to be modified and returned by evaluate.
-     */
-    RectEvaluator(Rect reuseRect) {
-        mRect = reuseRect;
-    }
-
-    /**
-     * This function returns the result of linearly interpolating the start and
-     * end Rect values, with <code>fraction</code> representing the proportion
-     * between the start and end values. The calculation is a simple parametric
-     * calculation on each of the separate components in the Rect objects
-     * (left, top, right, and bottom).
-     *
-     * <p>If {@link #RectEvaluator(android.graphics.Rect)} was used to construct
-     * this RectEvaluator, the object returned will be the <code>reuseRect</code>
-     * passed into the constructor.</p>
-     *
-     * @param fraction   The fraction from the starting to the ending values
-     * @param startValue The start Rect
-     * @param endValue   The end Rect
-     * @return A linear interpolation between the start and end values, given the
-     * <code>fraction</code> parameter.
-     */
-    @Override
-    public Rect evaluate(float fraction, Rect startValue, Rect endValue) {
-        int left = startValue.left + (int) ((endValue.left - startValue.left) * fraction);
-        int top = startValue.top + (int) ((endValue.top - startValue.top) * fraction);
-        int right = startValue.right + (int) ((endValue.right - startValue.right) * fraction);
-        int bottom = startValue.bottom + (int) ((endValue.bottom - startValue.bottom) * fraction);
-        if (mRect == null) {
-            return new Rect(left, top, right, bottom);
-        } else {
-            mRect.set(left, top, right, bottom);
-            return mRect;
-        }
-    }
-}
diff --git a/transition/transition/src/main/java/androidx/transition/Slide.java b/transition/transition/src/main/java/androidx/transition/Slide.java
index ac438c3..fc06702 100644
--- a/transition/transition/src/main/java/androidx/transition/Slide.java
+++ b/transition/transition/src/main/java/androidx/transition/Slide.java
@@ -18,8 +18,6 @@
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX;
 
-import android.animation.Animator;
-import android.animation.TimeInterpolator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -27,13 +25,15 @@
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.DecelerateInterpolator;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.core.animation.AccelerateInterpolator;
+import androidx.core.animation.Animator;
+import androidx.core.animation.DecelerateInterpolator;
+import androidx.core.animation.Interpolator;
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.core.view.ViewCompat;
 
@@ -53,8 +53,8 @@
  */
 public class Slide extends Visibility {
 
-    private static final TimeInterpolator sDecelerate = new DecelerateInterpolator();
-    private static final TimeInterpolator sAccelerate = new AccelerateInterpolator();
+    private static final Interpolator sDecelerate = new DecelerateInterpolator();
+    private static final Interpolator sAccelerate = new AccelerateInterpolator();
     private static final String PROPNAME_SCREEN_POSITION = "android:slide:screenPosition";
     private CalculateSlide mSlideCalculator = sCalculateBottom;
     private int mSlideEdge = Gravity.BOTTOM;
diff --git a/transition/transition/src/main/java/androidx/transition/Transition.java b/transition/transition/src/main/java/androidx/transition/Transition.java
index 4458a46..b0444f5 100644
--- a/transition/transition/src/main/java/androidx/transition/Transition.java
+++ b/transition/transition/src/main/java/androidx/transition/Transition.java
@@ -18,9 +18,6 @@
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.TimeInterpolator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -36,7 +33,6 @@
 import android.view.TextureView;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AnimationUtils;
 import android.widget.ListView;
 import android.widget.Spinner;
 
@@ -47,6 +43,10 @@
 import androidx.annotation.RestrictTo;
 import androidx.collection.ArrayMap;
 import androidx.collection.LongSparseArray;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorInflater;
+import androidx.core.animation.AnimatorListenerAdapter;
+import androidx.core.animation.Interpolator;
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.core.view.ViewCompat;
 
@@ -182,7 +182,7 @@
 
     private long mStartDelay = -1;
     long mDuration = -1;
-    private TimeInterpolator mInterpolator = null;
+    private Interpolator mInterpolator = null;
     ArrayList<Integer> mTargetIds = new ArrayList<>();
     ArrayList<View> mTargets = new ArrayList<>();
     private ArrayList<String> mTargetNames = null;
@@ -287,7 +287,7 @@
         final int resId = TypedArrayUtils.getNamedResourceId(a, parser, "interpolator",
                 Styleable.Transition.INTERPOLATOR, 0);
         if (resId > 0) {
-            setInterpolator(AnimationUtils.loadInterpolator(context, resId));
+            setInterpolator(AnimatorInflater.loadInterpolator(context, resId));
         }
         String matchOrder = TypedArrayUtils.getNamedString(a, parser, "matchOrder",
                 Styleable.Transition.MATCH_ORDER);
@@ -391,7 +391,7 @@
      * @return This transition object.
      */
     @NonNull
-    public Transition setInterpolator(@Nullable TimeInterpolator interpolator) {
+    public Transition setInterpolator(@Nullable Interpolator interpolator) {
         mInterpolator = interpolator;
         return this;
     }
@@ -405,7 +405,7 @@
      * returns null.
      */
     @Nullable
-    public TimeInterpolator getInterpolator() {
+    public Interpolator getInterpolator() {
         return mInterpolator;
     }
 
@@ -894,12 +894,12 @@
             // TODO: could be a single listener instance for all of them since it uses the param
             animator.addListener(new AnimatorListenerAdapter() {
                 @Override
-                public void onAnimationStart(Animator animation) {
+                public void onAnimationStart(@NonNull Animator animation) {
                     mCurrentAnimators.add(animation);
                 }
 
                 @Override
-                public void onAnimationEnd(Animator animation) {
+                public void onAnimationEnd(@NonNull Animator animation) {
                     runningAnimators.remove(animation);
                     mCurrentAnimators.remove(animation);
                 }
@@ -1721,7 +1721,7 @@
                 AnimationInfo info = runningAnimators.valueAt(i);
                 if (info.mView != null && windowId.equals(info.mWindowId)) {
                     Animator anim = runningAnimators.keyAt(i);
-                    AnimatorUtils.pause(anim);
+                    anim.pause();
                 }
             }
             if (mListeners != null && mListeners.size() > 0) {
@@ -1754,7 +1754,7 @@
                     AnimationInfo info = runningAnimators.valueAt(i);
                     if (info.mView != null && windowId.equals(info.mWindowId)) {
                         Animator anim = runningAnimators.keyAt(i);
-                        AnimatorUtils.resume(anim);
+                        anim.resume();
                     }
                 }
                 if (mListeners != null && mListeners.size() > 0) {
@@ -1907,7 +1907,7 @@
             }
             animator.addListener(new AnimatorListenerAdapter() {
                 @Override
-                public void onAnimationEnd(Animator animation) {
+                public void onAnimationEnd(@NonNull Animator animation) {
                     end();
                     animation.removeListener(this);
                 }
@@ -2205,11 +2205,13 @@
         mCanRemoveViews = canRemoveViews;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return toString("");
     }
 
+    @NonNull
     @Override
     public Transition clone() {
         try {
@@ -2221,7 +2223,7 @@
             clone.mEndValuesList = null;
             return clone;
         } catch (CloneNotSupportedException e) {
-            return null;
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/transition/transition/src/main/java/androidx/transition/TransitionSet.java b/transition/transition/src/main/java/androidx/transition/TransitionSet.java
index 0c71667..0371233 100644
--- a/transition/transition/src/main/java/androidx/transition/TransitionSet.java
+++ b/transition/transition/src/main/java/androidx/transition/TransitionSet.java
@@ -18,7 +18,6 @@
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX;
 
-import android.animation.TimeInterpolator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -32,6 +31,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.core.animation.Interpolator;
 import androidx.core.content.res.TypedArrayUtils;
 
 import java.util.ArrayList;
@@ -254,7 +254,7 @@
 
     @NonNull
     @Override
-    public TransitionSet setInterpolator(@Nullable TimeInterpolator interpolator) {
+    public TransitionSet setInterpolator(@Nullable Interpolator interpolator) {
         mChangeFlags |= FLAG_CHANGE_INTERPOLATOR;
         if (mTransitions != null) {
             int numTransitions = mTransitions.size();
@@ -634,6 +634,7 @@
         return result;
     }
 
+    @NonNull
     @Override
     public Transition clone() {
         TransitionSet clone = (TransitionSet) super.clone();
diff --git a/transition/transition/src/main/java/androidx/transition/TransitionUtils.java b/transition/transition/src/main/java/androidx/transition/TransitionUtils.java
index 5360727..ae17040 100644
--- a/transition/transition/src/main/java/androidx/transition/TransitionUtils.java
+++ b/transition/transition/src/main/java/androidx/transition/TransitionUtils.java
@@ -16,9 +16,6 @@
 
 package androidx.transition;
 
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.animation.TypeEvaluator;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
@@ -29,6 +26,11 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorSet;
+import androidx.core.animation.TypeEvaluator;
+
 class TransitionUtils {
 
     private static final int MAX_IMAGE_SIZE = 1024 * 1024;
@@ -160,8 +162,10 @@
 
         final Matrix mTempMatrix = new Matrix();
 
+        @NonNull
         @Override
-        public Matrix evaluate(float fraction, Matrix startValue, Matrix endValue) {
+        public Matrix evaluate(float fraction, @NonNull Matrix startValue,
+                @NonNull Matrix endValue) {
             startValue.getValues(mTempStartValues);
             endValue.getValues(mTempEndValues);
             for (int i = 0; i < 9; i++) {
diff --git a/transition/transition/src/main/java/androidx/transition/TranslationAnimationCreator.java b/transition/transition/src/main/java/androidx/transition/TranslationAnimationCreator.java
index 7a24a33..7104c4a 100644
--- a/transition/transition/src/main/java/androidx/transition/TranslationAnimationCreator.java
+++ b/transition/transition/src/main/java/androidx/transition/TranslationAnimationCreator.java
@@ -16,15 +16,15 @@
 
 package androidx.transition;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.TimeInterpolator;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorListenerAdapter;
+import androidx.core.animation.Interpolator;
+import androidx.core.animation.ObjectAnimator;
+import androidx.core.animation.PropertyValuesHolder;
 
 /**
  * This class is used by Slide and Explode to create an animator that goes from the start
@@ -52,7 +52,7 @@
     @Nullable
     static Animator createAnimation(@NonNull View view, @NonNull TransitionValues values,
             int viewPosX, int viewPosY, float startX, float startY, float endX, float endY,
-            @Nullable TimeInterpolator interpolator, @NonNull Transition transition) {
+            @Nullable Interpolator interpolator, @NonNull Transition transition) {
         float terminalX = view.getTranslationX();
         float terminalY = view.getTranslationY();
         int[] startPosition = (int[]) values.view.getTag(R.id.transition_position);
@@ -77,7 +77,7 @@
                 startPosX, startPosY, terminalX, terminalY);
         transition.addListener(listener);
         anim.addListener(listener);
-        AnimatorUtils.addPauseListener(anim, listener);
+        anim.addPauseListener(listener);
         anim.setInterpolator(interpolator);
         return anim;
     }
@@ -110,7 +110,7 @@
         }
 
         @Override
-        public void onAnimationCancel(Animator animation) {
+        public void onAnimationCancel(@NonNull Animator animation) {
             if (mTransitionPosition == null) {
                 mTransitionPosition = new int[2];
             }
@@ -120,7 +120,7 @@
         }
 
         @Override
-        public void onAnimationPause(Animator animator) {
+        public void onAnimationPause(@NonNull Animator animator) {
             mPausedX = mMovingView.getTranslationX();
             mPausedY = mMovingView.getTranslationY();
             mMovingView.setTranslationX(mTerminalX);
@@ -128,7 +128,7 @@
         }
 
         @Override
-        public void onAnimationResume(Animator animator) {
+        public void onAnimationResume(@NonNull Animator animator) {
             mMovingView.setTranslationX(mPausedX);
             mMovingView.setTranslationY(mPausedY);
         }
diff --git a/transition/transition/src/main/java/androidx/transition/Visibility.java b/transition/transition/src/main/java/androidx/transition/Visibility.java
index 23fbc3b..3d10a0f 100644
--- a/transition/transition/src/main/java/androidx/transition/Visibility.java
+++ b/transition/transition/src/main/java/androidx/transition/Visibility.java
@@ -18,8 +18,6 @@
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -32,6 +30,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
+import androidx.core.animation.Animator;
+import androidx.core.animation.AnimatorListenerAdapter;
 import androidx.core.content.res.TypedArrayUtils;
 
 import java.lang.annotation.Retention;
@@ -474,7 +474,7 @@
                 DisappearListener disappearListener = new DisappearListener(viewToKeep,
                         endVisibility, true);
                 animator.addListener(disappearListener);
-                AnimatorUtils.addPauseListener(animator, disappearListener);
+                animator.addPauseListener(disappearListener);
                 addListener(disappearListener);
             } else {
                 ViewUtils.setTransitionVisibility(viewToKeep, originalVisibility);
@@ -525,7 +525,7 @@
     }
 
     private static class DisappearListener extends AnimatorListenerAdapter
-            implements TransitionListener, AnimatorUtils.AnimatorPauseListenerCompat {
+            implements TransitionListener {
 
         private final View mView;
         private final int mFinalVisibility;
@@ -547,7 +547,7 @@
         // This overrides both AnimatorListenerAdapter and
         // AnimatorUtilsApi14.AnimatorPauseListenerCompat
         @Override
-        public void onAnimationPause(Animator animation) {
+        public void onAnimationPause(@NonNull Animator animation) {
             if (!mCanceled) {
                 ViewUtils.setTransitionVisibility(mView, mFinalVisibility);
             }
@@ -556,27 +556,27 @@
         // This overrides both AnimatorListenerAdapter and
         // AnimatorUtilsApi14.AnimatorPauseListenerCompat
         @Override
-        public void onAnimationResume(Animator animation) {
+        public void onAnimationResume(@NonNull Animator animation) {
             if (!mCanceled) {
                 ViewUtils.setTransitionVisibility(mView, View.VISIBLE);
             }
         }
 
         @Override
-        public void onAnimationCancel(Animator animation) {
+        public void onAnimationCancel(@NonNull Animator animation) {
             mCanceled = true;
         }
 
         @Override
-        public void onAnimationRepeat(Animator animation) {
+        public void onAnimationRepeat(@NonNull Animator animation) {
         }
 
         @Override
-        public void onAnimationStart(Animator animation) {
+        public void onAnimationStart(@NonNull Animator animation) {
         }
 
         @Override
-        public void onAnimationEnd(Animator animation) {
+        public void onAnimationEnd(@NonNull Animator animation) {
             hideViewWhenNotCanceled();
         }
 
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt
index e105d473..c91510e 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/core/WithConstraintsBenchmark.kt
@@ -24,7 +24,6 @@
 import androidx.ui.benchmark.ComposeBenchmarkRule
 import androidx.ui.benchmark.toggleStateBenchmarkComposeMeasureLayout
 import androidx.ui.benchmark.toggleStateBenchmarkMeasureLayout
-import androidx.ui.core.Placeable.PlacementScope.place
 import androidx.ui.foundation.Box
 import androidx.ui.foundation.ContentGravity
 import androidx.ui.integration.test.ToggleableTestCase
@@ -126,7 +125,12 @@
 private fun ChangingConstraintsLayout(size: State<IntPx>, children: @Composable() () -> Unit) {
     Layout(children) { measurables, _, _ ->
         val constraints = Constraints.fixed(size.value, size.value)
-        measurables.first().measure(constraints).place(0.ipx, 0.ipx)
+        with(PlacementScope) { measurables.first().measure(constraints).place(0.ipx, 0.ipx) }
         layout(100.ipx, 100.ipx) {}
     }
 }
+
+private object PlacementScope : Placeable.PlacementScope() {
+    override val parentWidth = 0.ipx
+    override val parentLayoutDirection = LayoutDirection.Ltr
+}
diff --git a/ui/integration-tests/demos/build.gradle b/ui/integration-tests/demos/build.gradle
index ace45bd..8ad2c72 100644
--- a/ui/integration-tests/demos/build.gradle
+++ b/ui/integration-tests/demos/build.gradle
@@ -12,14 +12,14 @@
 dependencies {
     kotlinPlugin project(path: ":compose:compose-compiler")
 
-    implementation(project(":ui:ui-android-view:integration-tests:ui-android-view-demos"))
-    implementation(project(":ui:ui-animation:integration-tests:ui-animation-demos"))
-    implementation(project(":ui:ui-foundation:integration-tests:ui-foundation-demos"))
-    implementation(project(":ui:ui-framework:integration-tests:ui-framework-demos"))
-    implementation(project(":ui:ui-layout:integration-tests:ui-layout-demos"))
-    implementation(project(":ui:ui-material:integration-tests:ui-material-demos"))
-    implementation(project(":ui:ui-material:integration-tests:ui-material-studies"))
-    implementation(project(":ui:ui-text:integration-tests:ui-text-compose-demos"))
+    implementation project(":ui:ui-android-view:integration-tests:ui-android-view-demos")
+    implementation project(":ui:ui-animation:integration-tests:ui-animation-demos")
+    implementation project(":ui:ui-foundation:integration-tests:ui-foundation-demos")
+    implementation project(":ui:ui-framework:integration-tests:ui-framework-demos")
+    implementation project(":ui:ui-layout:integration-tests:ui-layout-demos")
+    implementation project(":ui:ui-material:integration-tests:ui-material-demos")
+    implementation project(":ui:ui-material:integration-tests:ui-material-studies")
+    implementation project(":ui:ui-text:integration-tests:ui-text-compose-demos")
 
     implementation(KOTLIN_REFLECT)
     implementation(KOTLIN_STDLIB)
@@ -36,15 +36,43 @@
     implementation project(":ui:integration-tests:demos:common")
 
     implementation "androidx.preference:preference-ktx:1.1.0"
+
+    androidTestImplementation project(":ui:ui-test")
+
+    // TODO: presumably shouldn't need to specify these again? figure out why this is needed.
+    androidTestImplementation project(":ui:ui-android-view:integration-tests:ui-android-view-demos")
+    androidTestImplementation project(":ui:ui-animation:integration-tests:ui-animation-demos")
+    androidTestImplementation project(":ui:ui-foundation:integration-tests:ui-foundation-demos")
+    androidTestImplementation project(":ui:ui-framework:integration-tests:ui-framework-demos")
+    androidTestImplementation project(":ui:ui-layout:integration-tests:ui-layout-demos")
+    androidTestImplementation project(":ui:ui-material:integration-tests:ui-material-demos")
+    androidTestImplementation project(":ui:ui-material:integration-tests:ui-material-studies")
+    androidTestImplementation project(":ui:ui-text:integration-tests:ui-text-compose-demos")
+
+    androidTestImplementation(ANDROIDX_TEST_RULES)
+    androidTestImplementation(ANDROIDX_TEST_RUNNER)
+    androidTestImplementation(JUNIT)
+    androidTestImplementation(TRUTH)
 }
 
 android {
     defaultConfig {
         minSdkVersion 21
+        // Change the APK name to match the *testapp regex we use to pick up APKs for testing as
+        // part of CI.
+        archivesBaseName = "compose-demos-testapp"
     }
-    // Kotlin generates kotlin_module files based off the gradle *sub*module name, ignoring the
-    // parent project - this means that we generate multiple of these files for any project with a
-    // :samples subproject
+    /*
+    Kotlin generates kotlin_module files based off the gradle *sub*module name, ignoring the
+    parent project - this means that we generate multiple of these files for any project with a
+    :samples subproject.
+
+    Ideally each sample module should set:
+    compileOptions {
+        kotlinOptions.freeCompilerArgs += ['-module-name', "$PUBLISH_GROUP_ID.$PUBLISH_ARTIFACT_ID"]
+    }
+    However, given that we aren't shipping these demos, we can just exclude all of these.
+    */
     packagingOptions {
         exclude 'META-INF/samples_debug.kotlin_module'
     }
diff --git a/ui/integration-tests/demos/src/androidTest/AndroidManifest.xml b/ui/integration-tests/demos/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000..1babff9
--- /dev/null
+++ b/ui/integration-tests/demos/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?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 package="androidx.ui.demos.test" />
diff --git a/ui/integration-tests/demos/src/androidTest/java/androidx/ui/demos/test/DemoTest.kt b/ui/integration-tests/demos/src/androidTest/java/androidx/ui/demos/test/DemoTest.kt
new file mode 100644
index 0000000..5858278
--- /dev/null
+++ b/ui/integration-tests/demos/src/androidTest/java/androidx/ui/demos/test/DemoTest.kt
@@ -0,0 +1,47 @@
+/*
+ * 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.ui.demos.test
+
+import androidx.test.filters.LargeTest
+import androidx.ui.demos.DemoActivity
+import androidx.ui.material.demos.MaterialDemos
+import androidx.ui.test.android.AndroidComposeTestRule
+import androidx.ui.test.assertIsDisplayed
+import androidx.ui.test.doClick
+import androidx.ui.test.findByText
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+// TODO: b/124040743 expand testing here to test that every demo works
+@LargeTest
+@RunWith(JUnit4::class)
+class DemoTest {
+    @get:Rule
+    val composeTestRule = AndroidComposeTestRule<DemoActivity>(disableTransitions = true)
+
+    // Simple test that launches the demos, navigates to the Material category, and ensures that
+    // the first demo there is displayed
+    @Test
+    fun openFirstDemoCategory() {
+        val categoryTitle = MaterialDemos.title
+        val demoTitle = MaterialDemos.demos.first().title
+        findByText(categoryTitle).doClick()
+        findByText(demoTitle).assertIsDisplayed()
+    }
+}
diff --git a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoActivity.kt b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoActivity.kt
index 259350d..28dbd27 100644
--- a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoActivity.kt
+++ b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoActivity.kt
@@ -213,7 +213,8 @@
             if (savedValue.isNullOrBlank()) {
                 null
             } else {
-                val parsedColor = Color(savedValue.toLong(16))
+                // TODO: should be a Color(savedValue.toLong(16)) when b/154329050 is fixed
+                val parsedColor = savedValue.toLong(16)
                 parameter to parsedColor
             }
         }.toMap()
@@ -225,63 +226,65 @@
 }
 
 /**
+ * TODO: remove after b/154329050 is fixed
  * Inline classes don't play well with reflection, so we want boxed classes for our
  * call to [lightColorPalette].
  */
 internal fun reflectLightColorPalette(
-    primary: Color? = Color(0xFF6200EE),
-    primaryVariant: Color? = Color(0xFF3700B3),
-    secondary: Color? = Color(0xFF03DAC6),
-    secondaryVariant: Color? = Color(0xFF018786),
-    background: Color? = Color.White,
-    surface: Color? = Color.White,
-    error: Color? = Color(0xFFB00020),
-    onPrimary: Color? = Color.White,
-    onSecondary: Color? = Color.Black,
-    onBackground: Color? = Color.Black,
-    onSurface: Color? = Color.Black,
-    onError: Color? = Color.White
+    primary: Long = 0xFF6200EE,
+    primaryVariant: Long = 0xFF3700B3,
+    secondary: Long = 0xFF03DAC6,
+    secondaryVariant: Long = 0xFF018786,
+    background: Long = 0xFFFFFFFF,
+    surface: Long = 0xFFFFFFFF,
+    error: Long = 0xFFB00020,
+    onPrimary: Long = 0xFFFFFFFF,
+    onSecondary: Long = 0xFF000000,
+    onBackground: Long = 0xFF000000,
+    onSurface: Long = 0xFF000000,
+    onError: Long = 0xFFFFFFFF
 ) = lightColorPalette(
-    primary = primary!!,
-    primaryVariant = primaryVariant!!,
-    secondary = secondary!!,
-    secondaryVariant = secondaryVariant!!,
-    background = background!!,
-    surface = surface!!,
-    error = error!!,
-    onPrimary = onPrimary!!,
-    onSecondary = onSecondary!!,
-    onBackground = onBackground!!,
-    onSurface = onSurface!!,
-    onError = onError!!
+    primary = Color(primary),
+    primaryVariant = Color(primaryVariant),
+    secondary = Color(secondary),
+    secondaryVariant = Color(secondaryVariant),
+    background = Color(background),
+    surface = Color(surface),
+    error = Color(error),
+    onPrimary = Color(onPrimary),
+    onSecondary = Color(onSecondary),
+    onBackground = Color(onBackground),
+    onSurface = Color(onSurface),
+    onError = Color(onError)
 )
 
 /**
+ * TODO: remove after b/154329050 is fixed
  * Inline classes don't play well with reflection, so we want boxed classes for our
  * call to [darkColorPalette].
  */
 internal fun reflectDarkColorPalette(
-    primary: Color? = Color(0xFFBB86FC),
-    primaryVariant: Color? = Color(0xFF3700B3),
-    secondary: Color? = Color(0xFF03DAC6),
-    background: Color? = Color(0xFF121212),
-    surface: Color? = Color(0xFF121212),
-    error: Color? = Color(0xFFCF6679),
-    onPrimary: Color? = Color.Black,
-    onSecondary: Color? = Color.Black,
-    onBackground: Color? = Color.White,
-    onSurface: Color? = Color.White,
-    onError: Color? = Color.Black
+    primary: Long = 0xFFBB86FC,
+    primaryVariant: Long = 0xFF3700B3,
+    secondary: Long = 0xFF03DAC6,
+    background: Long = 0xFF121212,
+    surface: Long = 0xFF121212,
+    error: Long = 0xFFCF6679,
+    onPrimary: Long = 0xFF000000,
+    onSecondary: Long = 0xFF000000,
+    onBackground: Long = 0xFFFFFFFF,
+    onSurface: Long = 0xFFFFFFFF,
+    onError: Long = 0xFF000000
 ) = darkColorPalette(
-    primary = primary!!,
-    primaryVariant = primaryVariant!!,
-    secondary = secondary!!,
-    background = background!!,
-    surface = surface!!,
-    error = error!!,
-    onPrimary = onPrimary!!,
-    onSecondary = onSecondary!!,
-    onBackground = onBackground!!,
-    onSurface = onSurface!!,
-    onError = onError!!
+    primary = Color(primary),
+    primaryVariant = Color(primaryVariant),
+    secondary = Color(secondary),
+    background = Color(background),
+    surface = Color(surface),
+    error = Color(error),
+    onPrimary = Color(onPrimary),
+    onSecondary = Color(onSecondary),
+    onBackground = Color(onBackground),
+    onSurface = Color(onSurface),
+    onError = Color(onError)
 )
\ No newline at end of file
diff --git a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoFilter.kt b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoFilter.kt
index faeae20..829c19e 100644
--- a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoFilter.kt
+++ b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoFilter.kt
@@ -30,6 +30,7 @@
 import androidx.ui.foundation.VerticalScroller
 import androidx.ui.graphics.compositeOver
 import androidx.ui.layout.Column
+import androidx.ui.layout.fillMaxWidth
 import androidx.ui.layout.preferredHeight
 import androidx.ui.layout.wrapContentSize
 import androidx.ui.material.IconButton
@@ -86,7 +87,11 @@
             IconButton(modifier = Modifier.gravity(Alignment.CenterVertically), onClick = onClose) {
                 Icon(Icons.Filled.Close)
             }
-            FilterField(filterText, onFilter, Modifier.gravity(Alignment.CenterVertically))
+            FilterField(
+                filterText,
+                onFilter,
+                Modifier.fillMaxWidth().gravity(Alignment.CenterVertically)
+            )
         }
     }
 }
diff --git a/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeNothingInAndroidTap.kt b/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeNothingInAndroidTap.kt
index 92e723d..2f6a80a 100644
--- a/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeNothingInAndroidTap.kt
+++ b/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeNothingInAndroidTap.kt
@@ -25,8 +25,8 @@
 import androidx.ui.core.setContent
 import androidx.ui.foundation.Box
 import androidx.ui.foundation.drawBackground
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.toArgb
 import androidx.ui.layout.fillMaxSize
 
diff --git a/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeScrollInAndroidScrollDifferentOrientation.kt b/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeScrollInAndroidScrollDifferentOrientation.kt
index 1fe6f31..278336c 100644
--- a/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeScrollInAndroidScrollDifferentOrientation.kt
+++ b/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeScrollInAndroidScrollDifferentOrientation.kt
@@ -26,8 +26,8 @@
 import androidx.ui.foundation.Box
 import androidx.ui.foundation.HorizontalScroller
 import androidx.ui.foundation.drawBackground
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.toArgb
 import androidx.ui.layout.fillMaxHeight
 import androidx.ui.layout.fillMaxWidth
diff --git a/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeScrollInAndroidScrollSameOrientation.kt b/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeScrollInAndroidScrollSameOrientation.kt
index 5957147..e643c31 100644
--- a/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeScrollInAndroidScrollSameOrientation.kt
+++ b/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeScrollInAndroidScrollSameOrientation.kt
@@ -26,8 +26,8 @@
 import androidx.ui.foundation.Box
 import androidx.ui.foundation.VerticalScroller
 import androidx.ui.foundation.drawBackground
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.toArgb
 import androidx.ui.layout.fillMaxWidth
 import androidx.ui.layout.padding
diff --git a/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeTapInAndroidScroll.kt b/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeTapInAndroidScroll.kt
index 27711a1..fc19060 100644
--- a/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeTapInAndroidScroll.kt
+++ b/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeTapInAndroidScroll.kt
@@ -27,8 +27,8 @@
 import androidx.ui.core.setContent
 import androidx.ui.foundation.Box
 import androidx.ui.foundation.drawBackground
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.toArgb
 import androidx.ui.layout.fillMaxWidth
 import androidx.ui.layout.preferredHeight
diff --git a/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeTapInAndroidTap.kt b/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeTapInAndroidTap.kt
index 2996838..ae78524 100644
--- a/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeTapInAndroidTap.kt
+++ b/ui/ui-android-view/integration-tests/android-view-demos/src/main/java/androidx/ui/androidview/demos/ComposeTapInAndroidTap.kt
@@ -27,8 +27,8 @@
 import androidx.ui.core.setContent
 import androidx.ui.foundation.Box
 import androidx.ui.foundation.drawBackground
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.toArgb
 import androidx.ui.layout.fillMaxSize
 
diff --git a/ui/ui-animation-core/api/0.1.0-dev11.txt b/ui/ui-animation-core/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..f3716d0
--- /dev/null
+++ b/ui/ui-animation-core/api/0.1.0-dev11.txt
@@ -0,0 +1,375 @@
+// Signature format: 3.0
+package androidx.animation {
+
+  public abstract class AnimatedFloat extends androidx.animation.BaseAnimatedValue<java.lang.Float,androidx.animation.AnimationVector1D> {
+    ctor public AnimatedFloat(androidx.animation.AnimationClockObservable clock, float visibilityThreshold);
+    method public final float getMax();
+    method public final float getMin();
+    method public final float getVelocity();
+    method public final void setBounds(float min = Float.NEGATIVE_INFINITY, float max = Float.POSITIVE_INFINITY);
+    method public void snapTo(float targetValue);
+    property public final float max;
+    property public final float min;
+    property public final float velocity;
+  }
+
+  public abstract class AnimatedValue<T, V extends androidx.animation.AnimationVector> extends androidx.animation.BaseAnimatedValue<T,V> {
+    ctor public AnimatedValue(androidx.animation.TwoWayConverter<T,V> typeConverter, androidx.animation.AnimationClockObservable clock, V? visibilityThreshold);
+    method public final V getVelocity();
+    property public final V velocity;
+  }
+
+  public final class AnimatedValueKt {
+    method public static androidx.animation.AnimatedFloat AnimatedFloat(float initVal, androidx.animation.AnimationClockObservable clock, float visibilityThreshold = 0.01f);
+    method public static <T, V extends androidx.animation.AnimationVector> androidx.animation.AnimatedValue<T,V> AnimatedValue(T? initVal, androidx.animation.TwoWayConverter<T,V> typeConverter, androidx.animation.AnimationClockObservable clock, V visibilityThreshold = typeConverter.invoke(initVal).newInstanceOfValue(Spring.DefaultDisplacementThreshold));
+    method public static <V extends androidx.animation.AnimationVector> androidx.animation.AnimatedValue<V,V> AnimatedVector(V initVal, androidx.animation.AnimationClockObservable clock, V visibilityThreshold = initVal.newInstanceOfValue(Spring.DefaultDisplacementThreshold));
+    method public static void fling(androidx.animation.AnimatedFloat, float startVelocity, androidx.animation.DecayAnimation decay = androidx.animation.ExponentialDecay(), kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onEnd = null);
+    method public static void fling(androidx.animation.AnimatedFloat, float startVelocity, androidx.animation.DecayAnimation decay = androidx.animation.ExponentialDecay(), kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget, kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onEnd = null);
+  }
+
+  public abstract class AnimationBuilder<T> {
+    ctor public AnimationBuilder();
+  }
+
+  public final class AnimationBuilderKt {
+    field public static final int DefaultDuration = 300; // 0x12c
+    field public static final int Infinite = 2147483647; // 0x7fffffff
+  }
+
+  public final class AnimationClockKt {
+  }
+
+  public interface AnimationClockObservable {
+    method public void subscribe(androidx.animation.AnimationClockObserver observer);
+    method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
+  }
+
+  public interface AnimationClockObserver {
+    method public void onAnimationFrame(long frameTimeMillis);
+  }
+
+  public enum AnimationEndReason {
+    enum_constant public static final androidx.animation.AnimationEndReason BoundReached;
+    enum_constant public static final androidx.animation.AnimationEndReason Interrupted;
+    enum_constant public static final androidx.animation.AnimationEndReason TargetReached;
+  }
+
+  public abstract sealed class AnimationVector {
+  }
+
+  public final class AnimationVector1D extends androidx.animation.AnimationVector {
+    ctor public AnimationVector1D(float initVal);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getValue();
+    method public androidx.animation.AnimationVector1D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(int index, float value);
+    property public int size;
+    property public final float value;
+  }
+
+  public final class AnimationVector2D extends androidx.animation.AnimationVector {
+    ctor public AnimationVector2D(float v1, float v2);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getV1();
+    method public float getV2();
+    method public androidx.animation.AnimationVector2D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+  }
+
+  public final class AnimationVector3D extends androidx.animation.AnimationVector {
+    ctor public AnimationVector3D(float v1, float v2, float v3);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public androidx.animation.AnimationVector3D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(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.animation.AnimationVector {
+    ctor public AnimationVector4D(float v1, float v2, float v3, float v4);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public float getV4();
+    method public androidx.animation.AnimationVector4D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(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.animation.AnimationVector1D AnimationVector(float v1);
+    method public static androidx.animation.AnimationVector2D AnimationVector(float v1, float v2);
+    method public static androidx.animation.AnimationVector3D AnimationVector(float v1, float v2, float v3);
+    method public static androidx.animation.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
+  }
+
+  public abstract sealed class BaseAnimatedValue<T, V extends androidx.animation.AnimationVector> {
+    method public final void animateTo(T? targetValue, androidx.animation.AnimationBuilder<T> anim = defaultPhysicsBuilder(), kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super T,kotlin.Unit>? onEnd = null);
+    method protected void checkFinished(long playtime);
+    method public final T! getTargetValue();
+    method public abstract T! getValue();
+    method public final boolean isRunning();
+    method protected abstract void setValue(T! p);
+    method public void snapTo(T? targetValue);
+    method public final void stop();
+    property public final boolean isRunning;
+    property public final T! targetValue;
+    property public abstract T! value;
+  }
+
+  public abstract sealed class BaseAnimationClock implements androidx.animation.AnimationClockObservable {
+    method public void subscribe(androidx.animation.AnimationClockObserver observer);
+    method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
+    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion! Companion;
+  }
+
+  public final class ComplexDoubleKt {
+  }
+
+  public final class CubicBezierEasing implements kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> {
+    ctor public CubicBezierEasing(float a, float b, float c, float d);
+    method public Float! invoke(float fraction);
+  }
+
+  public interface DecayAnimation {
+    method public float getAbsVelocityThreshold();
+    method public long getDurationMillis(float start, float startVelocity);
+    method public float getTarget(float start, float startVelocity);
+    method public float getValue(long playTime, float start, float startVelocity);
+    method public float getVelocity(long playTime, float start, float startVelocity);
+    property public abstract float absVelocityThreshold;
+  }
+
+  public final class DecayAnimationKt {
+  }
+
+  public final class DefaultAnimationClock extends androidx.animation.BaseAnimationClock {
+    ctor public DefaultAnimationClock();
+    method public void dispatchTime$lintWithKotlin(long frameTimeMillis);
+  }
+
+  public abstract class DurationBasedAnimationBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public DurationBasedAnimationBuilder();
+    method public abstract <V extends androidx.animation.AnimationVector> androidx.animation.DurationBasedAnimation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public final int getDelay();
+    method public final int getDuration();
+    method public final void setDelay(int value);
+    method public final void setDuration(int value);
+    property public final int delay;
+    property public final int duration;
+  }
+
+  public final class EasingKt {
+    method public static androidx.animation.CubicBezierEasing getFastOutLinearInEasing();
+    method public static androidx.animation.CubicBezierEasing getFastOutSlowInEasing();
+    method public static kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> getLinearEasing();
+    method public static androidx.animation.CubicBezierEasing getLinearOutSlowInEasing();
+  }
+
+  public final class ExponentialDecay implements androidx.animation.DecayAnimation {
+    ctor public ExponentialDecay(@FloatRange(from=null, fromInclusive=null) float frictionMultiplier, @FloatRange(from=null, fromInclusive=null) float absVelocityThreshold);
+    ctor public ExponentialDecay();
+    method public float getAbsVelocityThreshold();
+    method public long getDurationMillis(float start, float startVelocity);
+    method public float getTarget(float start, float startVelocity);
+    method public float getValue(long playTime, float start, float startVelocity);
+    method public float getVelocity(long playTime, float start, float startVelocity);
+    property public float absVelocityThreshold;
+  }
+
+  public final class FloatPropKey implements androidx.animation.PropKey<java.lang.Float,androidx.animation.AnimationVector1D> {
+    ctor public FloatPropKey();
+    method public androidx.animation.TwoWayConverter<java.lang.Float,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<java.lang.Float,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public final class IntPropKey implements androidx.animation.PropKey<java.lang.Integer,androidx.animation.AnimationVector1D> {
+    ctor public IntPropKey();
+    method public androidx.animation.TwoWayConverter<java.lang.Integer,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<java.lang.Integer,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public enum InterruptionHandling {
+    enum_constant public static final androidx.animation.InterruptionHandling PHYSICS;
+    enum_constant public static final androidx.animation.InterruptionHandling SNAP_TO_END;
+    enum_constant public static final androidx.animation.InterruptionHandling TWEEN;
+    enum_constant public static final androidx.animation.InterruptionHandling UNINTERRUPTIBLE;
+  }
+
+  public final class KeyframesBuilder<T> extends androidx.animation.DurationBasedAnimationBuilder<T> {
+    ctor public KeyframesBuilder();
+    method public infix androidx.animation.KeyframesBuilder<T>.KeyframeEntity<T> at(T?, int timeStamp);
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.DurationBasedAnimation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public infix void with(androidx.animation.KeyframesBuilder<T>.KeyframeEntity<T>, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> easing);
+  }
+
+  public final class KeyframesBuilder.KeyframeEntity<T> {
+  }
+
+  public final class ManualAnimationClock extends androidx.animation.BaseAnimationClock {
+    ctor public ManualAnimationClock(long initTimeMillis, boolean dispatchOnSubscribe);
+    method public long getClockTimeMillis();
+    method public boolean getHasObservers();
+    method public void setClockTimeMillis(long value);
+    property public final long clockTimeMillis;
+    property public final boolean hasObservers;
+  }
+
+  public interface MutableTransitionState {
+    method public operator <T, V extends androidx.animation.AnimationVector> void set(androidx.animation.PropKey<T,V> propKey, T? prop);
+  }
+
+  public final class PhysicsBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public PhysicsBuilder(float dampingRatio, float stiffness, T! displacementThreshold);
+    ctor public PhysicsBuilder(float dampingRatio, float stiffness, float displacementThreshold);
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.Animation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public float getDampingRatio();
+    method public float getStiffness();
+    method public void setDampingRatio(float p);
+    method public void setStiffness(float p);
+  }
+
+  public interface PropKey<T, V extends androidx.animation.AnimationVector> {
+    method public androidx.animation.TwoWayConverter<T,V> getTypeConverter();
+    property public abstract androidx.animation.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public final class PropKeyKt {
+    method public static <T, V extends androidx.animation.AnimationVector> androidx.animation.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.animation.TwoWayConverter<java.lang.Float,androidx.animation.AnimationVector1D> getFloatToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<java.lang.Integer,androidx.animation.AnimationVector1D> getIntToVectorConverter();
+  }
+
+  public final class RepeatableBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public RepeatableBuilder();
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.Animation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public androidx.animation.DurationBasedAnimationBuilder<T>? getAnimation();
+    method public Integer? getIterations();
+    method public void setAnimation(androidx.animation.DurationBasedAnimationBuilder<T>? p);
+    method public void setIterations(Integer? value);
+    property public final androidx.animation.DurationBasedAnimationBuilder<T>? animation;
+    property public final Integer? iterations;
+  }
+
+  public final class SnapBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public SnapBuilder();
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.Animation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+  }
+
+  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.animation.Spring! INSTANCE;
+    field public static final float StiffnessHigh = 10000.0f;
+    field public static final float StiffnessLow = 200.0f;
+    field public static final float StiffnessMedium = 1500.0f;
+    field public static final float StiffnessVeryLow = 50.0f;
+  }
+
+  public final class SpringEstimationKt {
+  }
+
+  public final class SpringSimulationKt {
+  }
+
+  public final class TargetAnimation {
+    ctor public TargetAnimation(float target, androidx.animation.AnimationBuilder<java.lang.Float> animation);
+    method public float component1();
+    method public androidx.animation.AnimationBuilder<java.lang.Float> component2();
+    method public androidx.animation.TargetAnimation copy(float target, androidx.animation.AnimationBuilder<java.lang.Float> animation);
+    method public androidx.animation.AnimationBuilder<java.lang.Float> getAnimation();
+    method public float getTarget();
+  }
+
+  public final class TransitionAnimation<T> implements androidx.animation.TransitionState {
+    ctor public TransitionAnimation(androidx.animation.TransitionDefinition<T> def, androidx.animation.AnimationClockObservable clock, T? initState);
+    method public operator <T, V extends androidx.animation.AnimationVector> T! get(androidx.animation.PropKey<T,V> propKey);
+    method public kotlin.jvm.functions.Function1<T,kotlin.Unit>? getOnStateChangeFinished();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? getOnUpdate();
+    method public boolean isRunning();
+    method public void setOnStateChangeFinished(kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? p);
+    method public void setOnUpdate(kotlin.jvm.functions.Function0<kotlin.Unit>? p);
+    method public void toState(T? name);
+    property public final boolean isRunning;
+    property public final kotlin.jvm.functions.Function1<T,kotlin.Unit>? onStateChangeFinished;
+    property public final kotlin.jvm.functions.Function0<kotlin.Unit>? onUpdate;
+  }
+
+  public final class TransitionDefinition<T> {
+    ctor public TransitionDefinition();
+    method public androidx.animation.TransitionState getStateFor(T? name);
+    method public void snapTransition(kotlin.Pair<? extends T,? extends T>![] fromToPairs, T? nextState = null);
+    method public void state(T? name, kotlin.jvm.functions.Function1<? super androidx.animation.MutableTransitionState,kotlin.Unit> init);
+    method public void transition(T? fromState = null, T? toState = null, kotlin.jvm.functions.Function1<? super androidx.animation.TransitionSpec<T>,kotlin.Unit> init);
+    method public void transition(kotlin.Pair<? extends T,? extends T>![] fromToPairs, kotlin.jvm.functions.Function1<? super androidx.animation.TransitionSpec<T>,kotlin.Unit> init);
+  }
+
+  public final class TransitionDefinitionKt {
+    method public static <T> androidx.animation.TransitionAnimation<T> createAnimation(androidx.animation.TransitionDefinition<T>, androidx.animation.AnimationClockObservable clock, T? initState = null);
+    method public static <T> androidx.animation.TransitionDefinition<T> transitionDefinition(kotlin.jvm.functions.Function1<? super androidx.animation.TransitionDefinition<T>,kotlin.Unit> init);
+  }
+
+  public final class TransitionSpec<S> {
+    method public androidx.animation.InterruptionHandling getInterruptionHandling();
+    method public S? getNextState();
+    method public <T> androidx.animation.KeyframesBuilder<T> keyframes(kotlin.jvm.functions.Function1<? super androidx.animation.KeyframesBuilder<T>,kotlin.Unit> init);
+    method public <T> androidx.animation.AnimationBuilder<T> physics(kotlin.jvm.functions.Function1<? super androidx.animation.PhysicsBuilder<T>,kotlin.Unit> init);
+    method public <T> androidx.animation.AnimationBuilder<T> repeatable(kotlin.jvm.functions.Function1<? super androidx.animation.RepeatableBuilder<T>,kotlin.Unit> init);
+    method public void setInterruptionHandling(androidx.animation.InterruptionHandling p);
+    method public void setNextState(S? p);
+    method public <T> androidx.animation.AnimationBuilder<T> snap();
+    method public <T> androidx.animation.DurationBasedAnimationBuilder<T> tween(kotlin.jvm.functions.Function1<? super androidx.animation.TweenBuilder<T>,kotlin.Unit> init);
+    method public infix <T, V extends androidx.animation.AnimationVector> void using(androidx.animation.PropKey<T,V>, androidx.animation.AnimationBuilder<T> builder);
+    property public final androidx.animation.InterruptionHandling interruptionHandling;
+    property public final S? nextState;
+  }
+
+  public interface TransitionState {
+    method public operator <T, V extends androidx.animation.AnimationVector> T! get(androidx.animation.PropKey<T,V> propKey);
+  }
+
+  public final class TweenBuilder<T> extends androidx.animation.DurationBasedAnimationBuilder<T> {
+    ctor public TweenBuilder();
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.DurationBasedAnimation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> getEasing();
+    method public void setEasing(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> p);
+    property public final kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> easing;
+  }
+
+  public interface TwoWayConverter<T, V extends androidx.animation.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 VectorAnimationKt {
+    field public static final boolean DEBUG = false;
+  }
+
+}
+
diff --git a/ui/ui-animation-core/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-animation-core/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..f3716d0
--- /dev/null
+++ b/ui/ui-animation-core/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,375 @@
+// Signature format: 3.0
+package androidx.animation {
+
+  public abstract class AnimatedFloat extends androidx.animation.BaseAnimatedValue<java.lang.Float,androidx.animation.AnimationVector1D> {
+    ctor public AnimatedFloat(androidx.animation.AnimationClockObservable clock, float visibilityThreshold);
+    method public final float getMax();
+    method public final float getMin();
+    method public final float getVelocity();
+    method public final void setBounds(float min = Float.NEGATIVE_INFINITY, float max = Float.POSITIVE_INFINITY);
+    method public void snapTo(float targetValue);
+    property public final float max;
+    property public final float min;
+    property public final float velocity;
+  }
+
+  public abstract class AnimatedValue<T, V extends androidx.animation.AnimationVector> extends androidx.animation.BaseAnimatedValue<T,V> {
+    ctor public AnimatedValue(androidx.animation.TwoWayConverter<T,V> typeConverter, androidx.animation.AnimationClockObservable clock, V? visibilityThreshold);
+    method public final V getVelocity();
+    property public final V velocity;
+  }
+
+  public final class AnimatedValueKt {
+    method public static androidx.animation.AnimatedFloat AnimatedFloat(float initVal, androidx.animation.AnimationClockObservable clock, float visibilityThreshold = 0.01f);
+    method public static <T, V extends androidx.animation.AnimationVector> androidx.animation.AnimatedValue<T,V> AnimatedValue(T? initVal, androidx.animation.TwoWayConverter<T,V> typeConverter, androidx.animation.AnimationClockObservable clock, V visibilityThreshold = typeConverter.invoke(initVal).newInstanceOfValue(Spring.DefaultDisplacementThreshold));
+    method public static <V extends androidx.animation.AnimationVector> androidx.animation.AnimatedValue<V,V> AnimatedVector(V initVal, androidx.animation.AnimationClockObservable clock, V visibilityThreshold = initVal.newInstanceOfValue(Spring.DefaultDisplacementThreshold));
+    method public static void fling(androidx.animation.AnimatedFloat, float startVelocity, androidx.animation.DecayAnimation decay = androidx.animation.ExponentialDecay(), kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onEnd = null);
+    method public static void fling(androidx.animation.AnimatedFloat, float startVelocity, androidx.animation.DecayAnimation decay = androidx.animation.ExponentialDecay(), kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget, kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onEnd = null);
+  }
+
+  public abstract class AnimationBuilder<T> {
+    ctor public AnimationBuilder();
+  }
+
+  public final class AnimationBuilderKt {
+    field public static final int DefaultDuration = 300; // 0x12c
+    field public static final int Infinite = 2147483647; // 0x7fffffff
+  }
+
+  public final class AnimationClockKt {
+  }
+
+  public interface AnimationClockObservable {
+    method public void subscribe(androidx.animation.AnimationClockObserver observer);
+    method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
+  }
+
+  public interface AnimationClockObserver {
+    method public void onAnimationFrame(long frameTimeMillis);
+  }
+
+  public enum AnimationEndReason {
+    enum_constant public static final androidx.animation.AnimationEndReason BoundReached;
+    enum_constant public static final androidx.animation.AnimationEndReason Interrupted;
+    enum_constant public static final androidx.animation.AnimationEndReason TargetReached;
+  }
+
+  public abstract sealed class AnimationVector {
+  }
+
+  public final class AnimationVector1D extends androidx.animation.AnimationVector {
+    ctor public AnimationVector1D(float initVal);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getValue();
+    method public androidx.animation.AnimationVector1D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(int index, float value);
+    property public int size;
+    property public final float value;
+  }
+
+  public final class AnimationVector2D extends androidx.animation.AnimationVector {
+    ctor public AnimationVector2D(float v1, float v2);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getV1();
+    method public float getV2();
+    method public androidx.animation.AnimationVector2D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+  }
+
+  public final class AnimationVector3D extends androidx.animation.AnimationVector {
+    ctor public AnimationVector3D(float v1, float v2, float v3);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public androidx.animation.AnimationVector3D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(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.animation.AnimationVector {
+    ctor public AnimationVector4D(float v1, float v2, float v3, float v4);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public float getV4();
+    method public androidx.animation.AnimationVector4D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(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.animation.AnimationVector1D AnimationVector(float v1);
+    method public static androidx.animation.AnimationVector2D AnimationVector(float v1, float v2);
+    method public static androidx.animation.AnimationVector3D AnimationVector(float v1, float v2, float v3);
+    method public static androidx.animation.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
+  }
+
+  public abstract sealed class BaseAnimatedValue<T, V extends androidx.animation.AnimationVector> {
+    method public final void animateTo(T? targetValue, androidx.animation.AnimationBuilder<T> anim = defaultPhysicsBuilder(), kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super T,kotlin.Unit>? onEnd = null);
+    method protected void checkFinished(long playtime);
+    method public final T! getTargetValue();
+    method public abstract T! getValue();
+    method public final boolean isRunning();
+    method protected abstract void setValue(T! p);
+    method public void snapTo(T? targetValue);
+    method public final void stop();
+    property public final boolean isRunning;
+    property public final T! targetValue;
+    property public abstract T! value;
+  }
+
+  public abstract sealed class BaseAnimationClock implements androidx.animation.AnimationClockObservable {
+    method public void subscribe(androidx.animation.AnimationClockObserver observer);
+    method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
+    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion! Companion;
+  }
+
+  public final class ComplexDoubleKt {
+  }
+
+  public final class CubicBezierEasing implements kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> {
+    ctor public CubicBezierEasing(float a, float b, float c, float d);
+    method public Float! invoke(float fraction);
+  }
+
+  public interface DecayAnimation {
+    method public float getAbsVelocityThreshold();
+    method public long getDurationMillis(float start, float startVelocity);
+    method public float getTarget(float start, float startVelocity);
+    method public float getValue(long playTime, float start, float startVelocity);
+    method public float getVelocity(long playTime, float start, float startVelocity);
+    property public abstract float absVelocityThreshold;
+  }
+
+  public final class DecayAnimationKt {
+  }
+
+  public final class DefaultAnimationClock extends androidx.animation.BaseAnimationClock {
+    ctor public DefaultAnimationClock();
+    method public void dispatchTime$lintWithKotlin(long frameTimeMillis);
+  }
+
+  public abstract class DurationBasedAnimationBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public DurationBasedAnimationBuilder();
+    method public abstract <V extends androidx.animation.AnimationVector> androidx.animation.DurationBasedAnimation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public final int getDelay();
+    method public final int getDuration();
+    method public final void setDelay(int value);
+    method public final void setDuration(int value);
+    property public final int delay;
+    property public final int duration;
+  }
+
+  public final class EasingKt {
+    method public static androidx.animation.CubicBezierEasing getFastOutLinearInEasing();
+    method public static androidx.animation.CubicBezierEasing getFastOutSlowInEasing();
+    method public static kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> getLinearEasing();
+    method public static androidx.animation.CubicBezierEasing getLinearOutSlowInEasing();
+  }
+
+  public final class ExponentialDecay implements androidx.animation.DecayAnimation {
+    ctor public ExponentialDecay(@FloatRange(from=null, fromInclusive=null) float frictionMultiplier, @FloatRange(from=null, fromInclusive=null) float absVelocityThreshold);
+    ctor public ExponentialDecay();
+    method public float getAbsVelocityThreshold();
+    method public long getDurationMillis(float start, float startVelocity);
+    method public float getTarget(float start, float startVelocity);
+    method public float getValue(long playTime, float start, float startVelocity);
+    method public float getVelocity(long playTime, float start, float startVelocity);
+    property public float absVelocityThreshold;
+  }
+
+  public final class FloatPropKey implements androidx.animation.PropKey<java.lang.Float,androidx.animation.AnimationVector1D> {
+    ctor public FloatPropKey();
+    method public androidx.animation.TwoWayConverter<java.lang.Float,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<java.lang.Float,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public final class IntPropKey implements androidx.animation.PropKey<java.lang.Integer,androidx.animation.AnimationVector1D> {
+    ctor public IntPropKey();
+    method public androidx.animation.TwoWayConverter<java.lang.Integer,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<java.lang.Integer,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public enum InterruptionHandling {
+    enum_constant public static final androidx.animation.InterruptionHandling PHYSICS;
+    enum_constant public static final androidx.animation.InterruptionHandling SNAP_TO_END;
+    enum_constant public static final androidx.animation.InterruptionHandling TWEEN;
+    enum_constant public static final androidx.animation.InterruptionHandling UNINTERRUPTIBLE;
+  }
+
+  public final class KeyframesBuilder<T> extends androidx.animation.DurationBasedAnimationBuilder<T> {
+    ctor public KeyframesBuilder();
+    method public infix androidx.animation.KeyframesBuilder<T>.KeyframeEntity<T> at(T?, int timeStamp);
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.DurationBasedAnimation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public infix void with(androidx.animation.KeyframesBuilder<T>.KeyframeEntity<T>, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> easing);
+  }
+
+  public final class KeyframesBuilder.KeyframeEntity<T> {
+  }
+
+  public final class ManualAnimationClock extends androidx.animation.BaseAnimationClock {
+    ctor public ManualAnimationClock(long initTimeMillis, boolean dispatchOnSubscribe);
+    method public long getClockTimeMillis();
+    method public boolean getHasObservers();
+    method public void setClockTimeMillis(long value);
+    property public final long clockTimeMillis;
+    property public final boolean hasObservers;
+  }
+
+  public interface MutableTransitionState {
+    method public operator <T, V extends androidx.animation.AnimationVector> void set(androidx.animation.PropKey<T,V> propKey, T? prop);
+  }
+
+  public final class PhysicsBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public PhysicsBuilder(float dampingRatio, float stiffness, T! displacementThreshold);
+    ctor public PhysicsBuilder(float dampingRatio, float stiffness, float displacementThreshold);
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.Animation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public float getDampingRatio();
+    method public float getStiffness();
+    method public void setDampingRatio(float p);
+    method public void setStiffness(float p);
+  }
+
+  public interface PropKey<T, V extends androidx.animation.AnimationVector> {
+    method public androidx.animation.TwoWayConverter<T,V> getTypeConverter();
+    property public abstract androidx.animation.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public final class PropKeyKt {
+    method public static <T, V extends androidx.animation.AnimationVector> androidx.animation.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.animation.TwoWayConverter<java.lang.Float,androidx.animation.AnimationVector1D> getFloatToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<java.lang.Integer,androidx.animation.AnimationVector1D> getIntToVectorConverter();
+  }
+
+  public final class RepeatableBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public RepeatableBuilder();
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.Animation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public androidx.animation.DurationBasedAnimationBuilder<T>? getAnimation();
+    method public Integer? getIterations();
+    method public void setAnimation(androidx.animation.DurationBasedAnimationBuilder<T>? p);
+    method public void setIterations(Integer? value);
+    property public final androidx.animation.DurationBasedAnimationBuilder<T>? animation;
+    property public final Integer? iterations;
+  }
+
+  public final class SnapBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public SnapBuilder();
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.Animation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+  }
+
+  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.animation.Spring! INSTANCE;
+    field public static final float StiffnessHigh = 10000.0f;
+    field public static final float StiffnessLow = 200.0f;
+    field public static final float StiffnessMedium = 1500.0f;
+    field public static final float StiffnessVeryLow = 50.0f;
+  }
+
+  public final class SpringEstimationKt {
+  }
+
+  public final class SpringSimulationKt {
+  }
+
+  public final class TargetAnimation {
+    ctor public TargetAnimation(float target, androidx.animation.AnimationBuilder<java.lang.Float> animation);
+    method public float component1();
+    method public androidx.animation.AnimationBuilder<java.lang.Float> component2();
+    method public androidx.animation.TargetAnimation copy(float target, androidx.animation.AnimationBuilder<java.lang.Float> animation);
+    method public androidx.animation.AnimationBuilder<java.lang.Float> getAnimation();
+    method public float getTarget();
+  }
+
+  public final class TransitionAnimation<T> implements androidx.animation.TransitionState {
+    ctor public TransitionAnimation(androidx.animation.TransitionDefinition<T> def, androidx.animation.AnimationClockObservable clock, T? initState);
+    method public operator <T, V extends androidx.animation.AnimationVector> T! get(androidx.animation.PropKey<T,V> propKey);
+    method public kotlin.jvm.functions.Function1<T,kotlin.Unit>? getOnStateChangeFinished();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? getOnUpdate();
+    method public boolean isRunning();
+    method public void setOnStateChangeFinished(kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? p);
+    method public void setOnUpdate(kotlin.jvm.functions.Function0<kotlin.Unit>? p);
+    method public void toState(T? name);
+    property public final boolean isRunning;
+    property public final kotlin.jvm.functions.Function1<T,kotlin.Unit>? onStateChangeFinished;
+    property public final kotlin.jvm.functions.Function0<kotlin.Unit>? onUpdate;
+  }
+
+  public final class TransitionDefinition<T> {
+    ctor public TransitionDefinition();
+    method public androidx.animation.TransitionState getStateFor(T? name);
+    method public void snapTransition(kotlin.Pair<? extends T,? extends T>![] fromToPairs, T? nextState = null);
+    method public void state(T? name, kotlin.jvm.functions.Function1<? super androidx.animation.MutableTransitionState,kotlin.Unit> init);
+    method public void transition(T? fromState = null, T? toState = null, kotlin.jvm.functions.Function1<? super androidx.animation.TransitionSpec<T>,kotlin.Unit> init);
+    method public void transition(kotlin.Pair<? extends T,? extends T>![] fromToPairs, kotlin.jvm.functions.Function1<? super androidx.animation.TransitionSpec<T>,kotlin.Unit> init);
+  }
+
+  public final class TransitionDefinitionKt {
+    method public static <T> androidx.animation.TransitionAnimation<T> createAnimation(androidx.animation.TransitionDefinition<T>, androidx.animation.AnimationClockObservable clock, T? initState = null);
+    method public static <T> androidx.animation.TransitionDefinition<T> transitionDefinition(kotlin.jvm.functions.Function1<? super androidx.animation.TransitionDefinition<T>,kotlin.Unit> init);
+  }
+
+  public final class TransitionSpec<S> {
+    method public androidx.animation.InterruptionHandling getInterruptionHandling();
+    method public S? getNextState();
+    method public <T> androidx.animation.KeyframesBuilder<T> keyframes(kotlin.jvm.functions.Function1<? super androidx.animation.KeyframesBuilder<T>,kotlin.Unit> init);
+    method public <T> androidx.animation.AnimationBuilder<T> physics(kotlin.jvm.functions.Function1<? super androidx.animation.PhysicsBuilder<T>,kotlin.Unit> init);
+    method public <T> androidx.animation.AnimationBuilder<T> repeatable(kotlin.jvm.functions.Function1<? super androidx.animation.RepeatableBuilder<T>,kotlin.Unit> init);
+    method public void setInterruptionHandling(androidx.animation.InterruptionHandling p);
+    method public void setNextState(S? p);
+    method public <T> androidx.animation.AnimationBuilder<T> snap();
+    method public <T> androidx.animation.DurationBasedAnimationBuilder<T> tween(kotlin.jvm.functions.Function1<? super androidx.animation.TweenBuilder<T>,kotlin.Unit> init);
+    method public infix <T, V extends androidx.animation.AnimationVector> void using(androidx.animation.PropKey<T,V>, androidx.animation.AnimationBuilder<T> builder);
+    property public final androidx.animation.InterruptionHandling interruptionHandling;
+    property public final S? nextState;
+  }
+
+  public interface TransitionState {
+    method public operator <T, V extends androidx.animation.AnimationVector> T! get(androidx.animation.PropKey<T,V> propKey);
+  }
+
+  public final class TweenBuilder<T> extends androidx.animation.DurationBasedAnimationBuilder<T> {
+    ctor public TweenBuilder();
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.DurationBasedAnimation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> getEasing();
+    method public void setEasing(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> p);
+    property public final kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> easing;
+  }
+
+  public interface TwoWayConverter<T, V extends androidx.animation.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 VectorAnimationKt {
+    field public static final boolean DEBUG = false;
+  }
+
+}
+
diff --git a/ui/ui-animation-core/api/res-0.1.0-dev11.txt b/ui/ui-animation-core/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-animation-core/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-animation-core/api/restricted_0.1.0-dev11.txt b/ui/ui-animation-core/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..f3716d0
--- /dev/null
+++ b/ui/ui-animation-core/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,375 @@
+// Signature format: 3.0
+package androidx.animation {
+
+  public abstract class AnimatedFloat extends androidx.animation.BaseAnimatedValue<java.lang.Float,androidx.animation.AnimationVector1D> {
+    ctor public AnimatedFloat(androidx.animation.AnimationClockObservable clock, float visibilityThreshold);
+    method public final float getMax();
+    method public final float getMin();
+    method public final float getVelocity();
+    method public final void setBounds(float min = Float.NEGATIVE_INFINITY, float max = Float.POSITIVE_INFINITY);
+    method public void snapTo(float targetValue);
+    property public final float max;
+    property public final float min;
+    property public final float velocity;
+  }
+
+  public abstract class AnimatedValue<T, V extends androidx.animation.AnimationVector> extends androidx.animation.BaseAnimatedValue<T,V> {
+    ctor public AnimatedValue(androidx.animation.TwoWayConverter<T,V> typeConverter, androidx.animation.AnimationClockObservable clock, V? visibilityThreshold);
+    method public final V getVelocity();
+    property public final V velocity;
+  }
+
+  public final class AnimatedValueKt {
+    method public static androidx.animation.AnimatedFloat AnimatedFloat(float initVal, androidx.animation.AnimationClockObservable clock, float visibilityThreshold = 0.01f);
+    method public static <T, V extends androidx.animation.AnimationVector> androidx.animation.AnimatedValue<T,V> AnimatedValue(T? initVal, androidx.animation.TwoWayConverter<T,V> typeConverter, androidx.animation.AnimationClockObservable clock, V visibilityThreshold = typeConverter.invoke(initVal).newInstanceOfValue(Spring.DefaultDisplacementThreshold));
+    method public static <V extends androidx.animation.AnimationVector> androidx.animation.AnimatedValue<V,V> AnimatedVector(V initVal, androidx.animation.AnimationClockObservable clock, V visibilityThreshold = initVal.newInstanceOfValue(Spring.DefaultDisplacementThreshold));
+    method public static void fling(androidx.animation.AnimatedFloat, float startVelocity, androidx.animation.DecayAnimation decay = androidx.animation.ExponentialDecay(), kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onEnd = null);
+    method public static void fling(androidx.animation.AnimatedFloat, float startVelocity, androidx.animation.DecayAnimation decay = androidx.animation.ExponentialDecay(), kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget, kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onEnd = null);
+  }
+
+  public abstract class AnimationBuilder<T> {
+    ctor public AnimationBuilder();
+  }
+
+  public final class AnimationBuilderKt {
+    field public static final int DefaultDuration = 300; // 0x12c
+    field public static final int Infinite = 2147483647; // 0x7fffffff
+  }
+
+  public final class AnimationClockKt {
+  }
+
+  public interface AnimationClockObservable {
+    method public void subscribe(androidx.animation.AnimationClockObserver observer);
+    method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
+  }
+
+  public interface AnimationClockObserver {
+    method public void onAnimationFrame(long frameTimeMillis);
+  }
+
+  public enum AnimationEndReason {
+    enum_constant public static final androidx.animation.AnimationEndReason BoundReached;
+    enum_constant public static final androidx.animation.AnimationEndReason Interrupted;
+    enum_constant public static final androidx.animation.AnimationEndReason TargetReached;
+  }
+
+  public abstract sealed class AnimationVector {
+  }
+
+  public final class AnimationVector1D extends androidx.animation.AnimationVector {
+    ctor public AnimationVector1D(float initVal);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getValue();
+    method public androidx.animation.AnimationVector1D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(int index, float value);
+    property public int size;
+    property public final float value;
+  }
+
+  public final class AnimationVector2D extends androidx.animation.AnimationVector {
+    ctor public AnimationVector2D(float v1, float v2);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getV1();
+    method public float getV2();
+    method public androidx.animation.AnimationVector2D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(int index, float value);
+    property public int size;
+    property public final float v1;
+    property public final float v2;
+  }
+
+  public final class AnimationVector3D extends androidx.animation.AnimationVector {
+    ctor public AnimationVector3D(float v1, float v2, float v3);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public androidx.animation.AnimationVector3D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(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.animation.AnimationVector {
+    ctor public AnimationVector4D(float v1, float v2, float v3, float v4);
+    method public float get$lintWithKotlin(int index);
+    method public int getSize$lintWithKotlin();
+    method public float getV1();
+    method public float getV2();
+    method public float getV3();
+    method public float getV4();
+    method public androidx.animation.AnimationVector4D newVector$lintWithKotlin();
+    method public void reset$lintWithKotlin();
+    method public void set$lintWithKotlin(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.animation.AnimationVector1D AnimationVector(float v1);
+    method public static androidx.animation.AnimationVector2D AnimationVector(float v1, float v2);
+    method public static androidx.animation.AnimationVector3D AnimationVector(float v1, float v2, float v3);
+    method public static androidx.animation.AnimationVector4D AnimationVector(float v1, float v2, float v3, float v4);
+  }
+
+  public abstract sealed class BaseAnimatedValue<T, V extends androidx.animation.AnimationVector> {
+    method public final void animateTo(T? targetValue, androidx.animation.AnimationBuilder<T> anim = defaultPhysicsBuilder(), kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super T,kotlin.Unit>? onEnd = null);
+    method protected void checkFinished(long playtime);
+    method public final T! getTargetValue();
+    method public abstract T! getValue();
+    method public final boolean isRunning();
+    method protected abstract void setValue(T! p);
+    method public void snapTo(T? targetValue);
+    method public final void stop();
+    property public final boolean isRunning;
+    property public final T! targetValue;
+    property public abstract T! value;
+  }
+
+  public abstract sealed class BaseAnimationClock implements androidx.animation.AnimationClockObservable {
+    method public void subscribe(androidx.animation.AnimationClockObserver observer);
+    method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
+    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion! Companion;
+  }
+
+  public final class ComplexDoubleKt {
+  }
+
+  public final class CubicBezierEasing implements kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> {
+    ctor public CubicBezierEasing(float a, float b, float c, float d);
+    method public Float! invoke(float fraction);
+  }
+
+  public interface DecayAnimation {
+    method public float getAbsVelocityThreshold();
+    method public long getDurationMillis(float start, float startVelocity);
+    method public float getTarget(float start, float startVelocity);
+    method public float getValue(long playTime, float start, float startVelocity);
+    method public float getVelocity(long playTime, float start, float startVelocity);
+    property public abstract float absVelocityThreshold;
+  }
+
+  public final class DecayAnimationKt {
+  }
+
+  public final class DefaultAnimationClock extends androidx.animation.BaseAnimationClock {
+    ctor public DefaultAnimationClock();
+    method public void dispatchTime$lintWithKotlin(long frameTimeMillis);
+  }
+
+  public abstract class DurationBasedAnimationBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public DurationBasedAnimationBuilder();
+    method public abstract <V extends androidx.animation.AnimationVector> androidx.animation.DurationBasedAnimation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public final int getDelay();
+    method public final int getDuration();
+    method public final void setDelay(int value);
+    method public final void setDuration(int value);
+    property public final int delay;
+    property public final int duration;
+  }
+
+  public final class EasingKt {
+    method public static androidx.animation.CubicBezierEasing getFastOutLinearInEasing();
+    method public static androidx.animation.CubicBezierEasing getFastOutSlowInEasing();
+    method public static kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> getLinearEasing();
+    method public static androidx.animation.CubicBezierEasing getLinearOutSlowInEasing();
+  }
+
+  public final class ExponentialDecay implements androidx.animation.DecayAnimation {
+    ctor public ExponentialDecay(@FloatRange(from=null, fromInclusive=null) float frictionMultiplier, @FloatRange(from=null, fromInclusive=null) float absVelocityThreshold);
+    ctor public ExponentialDecay();
+    method public float getAbsVelocityThreshold();
+    method public long getDurationMillis(float start, float startVelocity);
+    method public float getTarget(float start, float startVelocity);
+    method public float getValue(long playTime, float start, float startVelocity);
+    method public float getVelocity(long playTime, float start, float startVelocity);
+    property public float absVelocityThreshold;
+  }
+
+  public final class FloatPropKey implements androidx.animation.PropKey<java.lang.Float,androidx.animation.AnimationVector1D> {
+    ctor public FloatPropKey();
+    method public androidx.animation.TwoWayConverter<java.lang.Float,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<java.lang.Float,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public final class IntPropKey implements androidx.animation.PropKey<java.lang.Integer,androidx.animation.AnimationVector1D> {
+    ctor public IntPropKey();
+    method public androidx.animation.TwoWayConverter<java.lang.Integer,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<java.lang.Integer,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public enum InterruptionHandling {
+    enum_constant public static final androidx.animation.InterruptionHandling PHYSICS;
+    enum_constant public static final androidx.animation.InterruptionHandling SNAP_TO_END;
+    enum_constant public static final androidx.animation.InterruptionHandling TWEEN;
+    enum_constant public static final androidx.animation.InterruptionHandling UNINTERRUPTIBLE;
+  }
+
+  public final class KeyframesBuilder<T> extends androidx.animation.DurationBasedAnimationBuilder<T> {
+    ctor public KeyframesBuilder();
+    method public infix androidx.animation.KeyframesBuilder<T>.KeyframeEntity<T> at(T?, int timeStamp);
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.DurationBasedAnimation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public infix void with(androidx.animation.KeyframesBuilder<T>.KeyframeEntity<T>, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> easing);
+  }
+
+  public final class KeyframesBuilder.KeyframeEntity<T> {
+  }
+
+  public final class ManualAnimationClock extends androidx.animation.BaseAnimationClock {
+    ctor public ManualAnimationClock(long initTimeMillis, boolean dispatchOnSubscribe);
+    method public long getClockTimeMillis();
+    method public boolean getHasObservers();
+    method public void setClockTimeMillis(long value);
+    property public final long clockTimeMillis;
+    property public final boolean hasObservers;
+  }
+
+  public interface MutableTransitionState {
+    method public operator <T, V extends androidx.animation.AnimationVector> void set(androidx.animation.PropKey<T,V> propKey, T? prop);
+  }
+
+  public final class PhysicsBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public PhysicsBuilder(float dampingRatio, float stiffness, T! displacementThreshold);
+    ctor public PhysicsBuilder(float dampingRatio, float stiffness, float displacementThreshold);
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.Animation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public float getDampingRatio();
+    method public float getStiffness();
+    method public void setDampingRatio(float p);
+    method public void setStiffness(float p);
+  }
+
+  public interface PropKey<T, V extends androidx.animation.AnimationVector> {
+    method public androidx.animation.TwoWayConverter<T,V> getTypeConverter();
+    property public abstract androidx.animation.TwoWayConverter<T,V> typeConverter;
+  }
+
+  public final class PropKeyKt {
+    method public static <T, V extends androidx.animation.AnimationVector> androidx.animation.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.animation.TwoWayConverter<java.lang.Float,androidx.animation.AnimationVector1D> getFloatToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<java.lang.Integer,androidx.animation.AnimationVector1D> getIntToVectorConverter();
+  }
+
+  public final class RepeatableBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public RepeatableBuilder();
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.Animation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public androidx.animation.DurationBasedAnimationBuilder<T>? getAnimation();
+    method public Integer? getIterations();
+    method public void setAnimation(androidx.animation.DurationBasedAnimationBuilder<T>? p);
+    method public void setIterations(Integer? value);
+    property public final androidx.animation.DurationBasedAnimationBuilder<T>? animation;
+    property public final Integer? iterations;
+  }
+
+  public final class SnapBuilder<T> extends androidx.animation.AnimationBuilder<T> {
+    ctor public SnapBuilder();
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.Animation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+  }
+
+  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.animation.Spring! INSTANCE;
+    field public static final float StiffnessHigh = 10000.0f;
+    field public static final float StiffnessLow = 200.0f;
+    field public static final float StiffnessMedium = 1500.0f;
+    field public static final float StiffnessVeryLow = 50.0f;
+  }
+
+  public final class SpringEstimationKt {
+  }
+
+  public final class SpringSimulationKt {
+  }
+
+  public final class TargetAnimation {
+    ctor public TargetAnimation(float target, androidx.animation.AnimationBuilder<java.lang.Float> animation);
+    method public float component1();
+    method public androidx.animation.AnimationBuilder<java.lang.Float> component2();
+    method public androidx.animation.TargetAnimation copy(float target, androidx.animation.AnimationBuilder<java.lang.Float> animation);
+    method public androidx.animation.AnimationBuilder<java.lang.Float> getAnimation();
+    method public float getTarget();
+  }
+
+  public final class TransitionAnimation<T> implements androidx.animation.TransitionState {
+    ctor public TransitionAnimation(androidx.animation.TransitionDefinition<T> def, androidx.animation.AnimationClockObservable clock, T? initState);
+    method public operator <T, V extends androidx.animation.AnimationVector> T! get(androidx.animation.PropKey<T,V> propKey);
+    method public kotlin.jvm.functions.Function1<T,kotlin.Unit>? getOnStateChangeFinished();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? getOnUpdate();
+    method public boolean isRunning();
+    method public void setOnStateChangeFinished(kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? p);
+    method public void setOnUpdate(kotlin.jvm.functions.Function0<kotlin.Unit>? p);
+    method public void toState(T? name);
+    property public final boolean isRunning;
+    property public final kotlin.jvm.functions.Function1<T,kotlin.Unit>? onStateChangeFinished;
+    property public final kotlin.jvm.functions.Function0<kotlin.Unit>? onUpdate;
+  }
+
+  public final class TransitionDefinition<T> {
+    ctor public TransitionDefinition();
+    method public androidx.animation.TransitionState getStateFor(T? name);
+    method public void snapTransition(kotlin.Pair<? extends T,? extends T>![] fromToPairs, T? nextState = null);
+    method public void state(T? name, kotlin.jvm.functions.Function1<? super androidx.animation.MutableTransitionState,kotlin.Unit> init);
+    method public void transition(T? fromState = null, T? toState = null, kotlin.jvm.functions.Function1<? super androidx.animation.TransitionSpec<T>,kotlin.Unit> init);
+    method public void transition(kotlin.Pair<? extends T,? extends T>![] fromToPairs, kotlin.jvm.functions.Function1<? super androidx.animation.TransitionSpec<T>,kotlin.Unit> init);
+  }
+
+  public final class TransitionDefinitionKt {
+    method public static <T> androidx.animation.TransitionAnimation<T> createAnimation(androidx.animation.TransitionDefinition<T>, androidx.animation.AnimationClockObservable clock, T? initState = null);
+    method public static <T> androidx.animation.TransitionDefinition<T> transitionDefinition(kotlin.jvm.functions.Function1<? super androidx.animation.TransitionDefinition<T>,kotlin.Unit> init);
+  }
+
+  public final class TransitionSpec<S> {
+    method public androidx.animation.InterruptionHandling getInterruptionHandling();
+    method public S? getNextState();
+    method public <T> androidx.animation.KeyframesBuilder<T> keyframes(kotlin.jvm.functions.Function1<? super androidx.animation.KeyframesBuilder<T>,kotlin.Unit> init);
+    method public <T> androidx.animation.AnimationBuilder<T> physics(kotlin.jvm.functions.Function1<? super androidx.animation.PhysicsBuilder<T>,kotlin.Unit> init);
+    method public <T> androidx.animation.AnimationBuilder<T> repeatable(kotlin.jvm.functions.Function1<? super androidx.animation.RepeatableBuilder<T>,kotlin.Unit> init);
+    method public void setInterruptionHandling(androidx.animation.InterruptionHandling p);
+    method public void setNextState(S? p);
+    method public <T> androidx.animation.AnimationBuilder<T> snap();
+    method public <T> androidx.animation.DurationBasedAnimationBuilder<T> tween(kotlin.jvm.functions.Function1<? super androidx.animation.TweenBuilder<T>,kotlin.Unit> init);
+    method public infix <T, V extends androidx.animation.AnimationVector> void using(androidx.animation.PropKey<T,V>, androidx.animation.AnimationBuilder<T> builder);
+    property public final androidx.animation.InterruptionHandling interruptionHandling;
+    property public final S? nextState;
+  }
+
+  public interface TransitionState {
+    method public operator <T, V extends androidx.animation.AnimationVector> T! get(androidx.animation.PropKey<T,V> propKey);
+  }
+
+  public final class TweenBuilder<T> extends androidx.animation.DurationBasedAnimationBuilder<T> {
+    ctor public TweenBuilder();
+    method public <V extends androidx.animation.AnimationVector> androidx.animation.DurationBasedAnimation<V> build$lintWithKotlin(androidx.animation.TwoWayConverter<T,V> converter);
+    method public kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> getEasing();
+    method public void setEasing(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> p);
+    property public final kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> easing;
+  }
+
+  public interface TwoWayConverter<T, V extends androidx.animation.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 VectorAnimationKt {
+    field public static final boolean DEBUG = false;
+  }
+
+}
+
diff --git a/ui/ui-animation-core/src/main/java/androidx/animation/AnimatedValue.kt b/ui/ui-animation-core/src/main/java/androidx/animation/AnimatedValue.kt
index ba766fc..871d162 100644
--- a/ui/ui-animation-core/src/main/java/androidx/animation/AnimatedValue.kt
+++ b/ui/ui-animation-core/src/main/java/androidx/animation/AnimatedValue.kt
@@ -299,8 +299,11 @@
         get() = velocityVector.value
 
     /**
-     * Sets up the bounds that the animation should be constrained to. Note that when the animation
-     * reaches the bounds it will stop right away, even when there is remaining velocity.
+     * Sets up the bounds that the animation should be constrained to. When the animation
+     * reaches the bounds it will stop right away, even when there is remaining velocity. Setting
+     * a range will immediately clamp the current value to the new range. Therefore it is not
+     * recommended to change bounds in a way that immediately changes current value **during** an
+     * animation, as it would result in a discontinuous animation.
      *
      * @param min Lower bound of the animation value. Defaults to [Float.NEGATIVE_INFINITY]
      * @param max Upper bound of the animation value. Defaults to [Float.POSITIVE_INFINITY]
@@ -311,6 +314,16 @@
         }
         this.min = min
         this.max = max
+        // Clamp to the range right away.
+        val clamped = value.coerceIn(min, max)
+        if (clamped != value) {
+            value = clamped
+            if (isRunning && clamped == targetValue.coerceIn(min, max) && clamped != targetValue) {
+                // Target is outside of bounds, animation value is snapped to the bound closer to
+                // the target.
+                endAnimation(BoundReached)
+            }
+        }
     }
 
     override fun snapTo(targetValue: Float) {
@@ -318,13 +331,14 @@
     }
 
     override fun checkFinished(playtime: Long) {
-        if (value < min) {
+        if (value < min && targetValue <= min) {
             value = min
             endAnimation(BoundReached)
-        } else if (value > max) {
+        } else if (value > max && targetValue >= max) {
             value = max
             endAnimation(BoundReached)
         } else {
+            value = value.coerceIn(min, max)
             super.checkFinished(playtime)
         }
     }
diff --git a/ui/ui-animation-core/src/test/java/androidx/animation/AnimatedValueTest.kt b/ui/ui-animation-core/src/test/java/androidx/animation/AnimatedValueTest.kt
index 46d780b9..9d6d432 100644
--- a/ui/ui-animation-core/src/test/java/androidx/animation/AnimatedValueTest.kt
+++ b/ui/ui-animation-core/src/test/java/androidx/animation/AnimatedValueTest.kt
@@ -85,6 +85,22 @@
         clock.clockTimeMillis += 10000L
         assertEquals(-4f, animatedFloat.value)
         assertEquals(reason, AnimationEndReason.BoundReached)
+
+        // Change bounds, and check that value is clamped
+        val expected = 5f
+        animatedFloat.setBounds(expected, expected + 10f)
+        assertEquals(expected, animatedFloat.value)
+
+        // Start an animation and set bounds
+        reason = AnimationEndReason.TargetReached
+        animatedFloat.animateTo(expected + 10) { endReason: AnimationEndReason, _: Float ->
+            reason = endReason
+        }
+        clock.clockTimeMillis += 5L
+        assertTrue(animatedFloat.value > expected)
+        animatedFloat.setBounds(-expected, expected)
+        assertEquals(expected, animatedFloat.value)
+        assertEquals(AnimationEndReason.BoundReached, reason)
     }
 
     @Test
diff --git a/ui/ui-animation/api/0.1.0-dev11.txt b/ui/ui-animation/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..27e987e
--- /dev/null
+++ b/ui/ui-animation/api/0.1.0-dev11.txt
@@ -0,0 +1,97 @@
+// Signature format: 3.0
+package androidx.ui.animation {
+
+  public final class AnimatedFloatModel extends androidx.animation.AnimatedFloat {
+    ctor public AnimatedFloatModel(float value, androidx.animation.AnimationClockObservable clock, float visibilityThreshold);
+    method public Float getValue();
+    method protected void setValue(float p);
+  }
+
+  public final class AnimatedValueEffectsKt {
+    method public static androidx.animation.AnimatedValue<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> animatedColor-o4iVt3U(long initVal, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+    method public static androidx.animation.AnimatedFloat animatedFloat(float initVal, float visibilityThreshold = 0.01f, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+    method public static <T, V extends androidx.animation.AnimationVector> androidx.animation.AnimatedValue<T,V> animatedValue(T? initVal, androidx.animation.TwoWayConverter<T,V> converter, V? visibilityThreshold = null, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+  }
+
+  public final class AnimatedValueModel<T, V extends androidx.animation.AnimationVector> extends androidx.animation.AnimatedValue<T,V> {
+    ctor public AnimatedValueModel(T! value, androidx.animation.TwoWayConverter<T,V> typeConverter, androidx.animation.AnimationClockObservable clock, V? visibilityThreshold);
+    method public T! getValue();
+    method protected void setValue(T? p);
+  }
+
+  public final class ColorPropKey implements androidx.animation.PropKey<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> {
+    ctor public ColorPropKey(androidx.ui.graphics.colorspace.ColorSpace colorSpace);
+    ctor public ColorPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> typeConverter;
+  }
+
+  public final class CrossfadeKt {
+    method public static <T> void Crossfade(T? current, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> children);
+  }
+
+  public final class DisposableAnimationClock implements androidx.animation.AnimationClockObservable {
+    ctor public DisposableAnimationClock(androidx.animation.AnimationClockObservable clock);
+    method public void dispose();
+    method public boolean isDisposed();
+    method public void subscribe(androidx.animation.AnimationClockObserver observer);
+    method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
+    property public final boolean isDisposed;
+  }
+
+  public final class DisposableAnimationClockKt {
+    method public static androidx.ui.animation.DisposableAnimationClock asDisposableClock(androidx.animation.AnimationClockObservable);
+  }
+
+  public final class DpPropKey implements androidx.animation.PropKey<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> {
+    ctor public DpPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public final class PropertyKeysKt {
+    method public static kotlin.jvm.functions.Function1<androidx.ui.graphics.colorspace.ColorSpace,androidx.animation.TwoWayConverter<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D>> getColorToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> getDpToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> getPxPositionToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> getPxToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> getRectToVectorConverter();
+  }
+
+  public final class PxPositionPropKey implements androidx.animation.PropKey<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> {
+    ctor public PxPositionPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> typeConverter;
+  }
+
+  public final class PxPropKey implements androidx.animation.PropKey<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> {
+    ctor public PxPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public final class RectPropKey implements androidx.animation.PropKey<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> {
+    ctor public RectPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> typeConverter;
+  }
+
+  public final class SingleValueAnimationKt {
+    method public static float animate(float target, androidx.animation.AnimationBuilder<java.lang.Float> animBuilder = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit>? endListener = null);
+    method public static <T, V extends androidx.animation.AnimationVector> T! animate(T? target, androidx.animation.TwoWayConverter<T,V> converter, androidx.animation.AnimationBuilder<T> animBuilder = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? endListener = null);
+    method public static long animate-90dr43Y(long target, androidx.animation.AnimationBuilder<androidx.ui.graphics.Color> animBuilder = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super androidx.ui.graphics.Color,kotlin.Unit>? endListener = null);
+  }
+
+  public final class TransitionKt {
+    method public static <T> void Transition(androidx.animation.TransitionDefinition<T> definition, T? toState, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current, T? initState = toState, kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? onStateChangeFinished = null, kotlin.jvm.functions.Function1<? super androidx.animation.TransitionState,kotlin.Unit> children);
+    method public static boolean getTransitionsEnabled();
+    method public static void setTransitionsEnabled(boolean p);
+  }
+
+}
+
diff --git a/ui/ui-animation/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-animation/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..27e987e
--- /dev/null
+++ b/ui/ui-animation/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,97 @@
+// Signature format: 3.0
+package androidx.ui.animation {
+
+  public final class AnimatedFloatModel extends androidx.animation.AnimatedFloat {
+    ctor public AnimatedFloatModel(float value, androidx.animation.AnimationClockObservable clock, float visibilityThreshold);
+    method public Float getValue();
+    method protected void setValue(float p);
+  }
+
+  public final class AnimatedValueEffectsKt {
+    method public static androidx.animation.AnimatedValue<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> animatedColor-o4iVt3U(long initVal, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+    method public static androidx.animation.AnimatedFloat animatedFloat(float initVal, float visibilityThreshold = 0.01f, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+    method public static <T, V extends androidx.animation.AnimationVector> androidx.animation.AnimatedValue<T,V> animatedValue(T? initVal, androidx.animation.TwoWayConverter<T,V> converter, V? visibilityThreshold = null, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+  }
+
+  public final class AnimatedValueModel<T, V extends androidx.animation.AnimationVector> extends androidx.animation.AnimatedValue<T,V> {
+    ctor public AnimatedValueModel(T! value, androidx.animation.TwoWayConverter<T,V> typeConverter, androidx.animation.AnimationClockObservable clock, V? visibilityThreshold);
+    method public T! getValue();
+    method protected void setValue(T? p);
+  }
+
+  public final class ColorPropKey implements androidx.animation.PropKey<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> {
+    ctor public ColorPropKey(androidx.ui.graphics.colorspace.ColorSpace colorSpace);
+    ctor public ColorPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> typeConverter;
+  }
+
+  public final class CrossfadeKt {
+    method public static <T> void Crossfade(T? current, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> children);
+  }
+
+  public final class DisposableAnimationClock implements androidx.animation.AnimationClockObservable {
+    ctor public DisposableAnimationClock(androidx.animation.AnimationClockObservable clock);
+    method public void dispose();
+    method public boolean isDisposed();
+    method public void subscribe(androidx.animation.AnimationClockObserver observer);
+    method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
+    property public final boolean isDisposed;
+  }
+
+  public final class DisposableAnimationClockKt {
+    method public static androidx.ui.animation.DisposableAnimationClock asDisposableClock(androidx.animation.AnimationClockObservable);
+  }
+
+  public final class DpPropKey implements androidx.animation.PropKey<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> {
+    ctor public DpPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public final class PropertyKeysKt {
+    method public static kotlin.jvm.functions.Function1<androidx.ui.graphics.colorspace.ColorSpace,androidx.animation.TwoWayConverter<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D>> getColorToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> getDpToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> getPxPositionToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> getPxToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> getRectToVectorConverter();
+  }
+
+  public final class PxPositionPropKey implements androidx.animation.PropKey<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> {
+    ctor public PxPositionPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> typeConverter;
+  }
+
+  public final class PxPropKey implements androidx.animation.PropKey<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> {
+    ctor public PxPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public final class RectPropKey implements androidx.animation.PropKey<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> {
+    ctor public RectPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> typeConverter;
+  }
+
+  public final class SingleValueAnimationKt {
+    method public static float animate(float target, androidx.animation.AnimationBuilder<java.lang.Float> animBuilder = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit>? endListener = null);
+    method public static <T, V extends androidx.animation.AnimationVector> T! animate(T? target, androidx.animation.TwoWayConverter<T,V> converter, androidx.animation.AnimationBuilder<T> animBuilder = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? endListener = null);
+    method public static long animate-90dr43Y(long target, androidx.animation.AnimationBuilder<androidx.ui.graphics.Color> animBuilder = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super androidx.ui.graphics.Color,kotlin.Unit>? endListener = null);
+  }
+
+  public final class TransitionKt {
+    method public static <T> void Transition(androidx.animation.TransitionDefinition<T> definition, T? toState, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current, T? initState = toState, kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? onStateChangeFinished = null, kotlin.jvm.functions.Function1<? super androidx.animation.TransitionState,kotlin.Unit> children);
+    method public static boolean getTransitionsEnabled();
+    method public static void setTransitionsEnabled(boolean p);
+  }
+
+}
+
diff --git a/ui/ui-animation/api/res-0.1.0-dev11.txt b/ui/ui-animation/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-animation/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-animation/api/restricted_0.1.0-dev11.txt b/ui/ui-animation/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..27e987e
--- /dev/null
+++ b/ui/ui-animation/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,97 @@
+// Signature format: 3.0
+package androidx.ui.animation {
+
+  public final class AnimatedFloatModel extends androidx.animation.AnimatedFloat {
+    ctor public AnimatedFloatModel(float value, androidx.animation.AnimationClockObservable clock, float visibilityThreshold);
+    method public Float getValue();
+    method protected void setValue(float p);
+  }
+
+  public final class AnimatedValueEffectsKt {
+    method public static androidx.animation.AnimatedValue<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> animatedColor-o4iVt3U(long initVal, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+    method public static androidx.animation.AnimatedFloat animatedFloat(float initVal, float visibilityThreshold = 0.01f, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+    method public static <T, V extends androidx.animation.AnimationVector> androidx.animation.AnimatedValue<T,V> animatedValue(T? initVal, androidx.animation.TwoWayConverter<T,V> converter, V? visibilityThreshold = null, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+  }
+
+  public final class AnimatedValueModel<T, V extends androidx.animation.AnimationVector> extends androidx.animation.AnimatedValue<T,V> {
+    ctor public AnimatedValueModel(T! value, androidx.animation.TwoWayConverter<T,V> typeConverter, androidx.animation.AnimationClockObservable clock, V? visibilityThreshold);
+    method public T! getValue();
+    method protected void setValue(T? p);
+  }
+
+  public final class ColorPropKey implements androidx.animation.PropKey<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> {
+    ctor public ColorPropKey(androidx.ui.graphics.colorspace.ColorSpace colorSpace);
+    ctor public ColorPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D> typeConverter;
+  }
+
+  public final class CrossfadeKt {
+    method public static <T> void Crossfade(T? current, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> children);
+  }
+
+  public final class DisposableAnimationClock implements androidx.animation.AnimationClockObservable {
+    ctor public DisposableAnimationClock(androidx.animation.AnimationClockObservable clock);
+    method public void dispose();
+    method public boolean isDisposed();
+    method public void subscribe(androidx.animation.AnimationClockObserver observer);
+    method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
+    property public final boolean isDisposed;
+  }
+
+  public final class DisposableAnimationClockKt {
+    method public static androidx.ui.animation.DisposableAnimationClock asDisposableClock(androidx.animation.AnimationClockObservable);
+  }
+
+  public final class DpPropKey implements androidx.animation.PropKey<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> {
+    ctor public DpPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public final class PropertyKeysKt {
+    method public static kotlin.jvm.functions.Function1<androidx.ui.graphics.colorspace.ColorSpace,androidx.animation.TwoWayConverter<androidx.ui.graphics.Color,androidx.animation.AnimationVector4D>> getColorToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.unit.Dp,androidx.animation.AnimationVector1D> getDpToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> getPxPositionToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> getPxToVectorConverter();
+    method public static androidx.animation.TwoWayConverter<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> getRectToVectorConverter();
+  }
+
+  public final class PxPositionPropKey implements androidx.animation.PropKey<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> {
+    ctor public PxPositionPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.unit.PxPosition,androidx.animation.AnimationVector2D> typeConverter;
+  }
+
+  public final class PxPropKey implements androidx.animation.PropKey<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> {
+    ctor public PxPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.unit.Px,androidx.animation.AnimationVector1D> typeConverter;
+  }
+
+  public final class RectPropKey implements androidx.animation.PropKey<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> {
+    ctor public RectPropKey();
+    method public androidx.animation.TwoWayConverter<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> getTypeConverter();
+    property public androidx.animation.TwoWayConverter<androidx.ui.geometry.Rect,androidx.animation.AnimationVector4D> typeConverter;
+  }
+
+  public final class SingleValueAnimationKt {
+    method public static float animate(float target, androidx.animation.AnimationBuilder<java.lang.Float> animBuilder = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit>? endListener = null);
+    method public static <T, V extends androidx.animation.AnimationVector> T! animate(T? target, androidx.animation.TwoWayConverter<T,V> converter, androidx.animation.AnimationBuilder<T> animBuilder = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? endListener = null);
+    method public static long animate-90dr43Y(long target, androidx.animation.AnimationBuilder<androidx.ui.graphics.Color> animBuilder = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super androidx.ui.graphics.Color,kotlin.Unit>? endListener = null);
+  }
+
+  public final class TransitionKt {
+    method public static <T> void Transition(androidx.animation.TransitionDefinition<T> definition, T? toState, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current, T? initState = toState, kotlin.jvm.functions.Function1<? super T,kotlin.Unit>? onStateChangeFinished = null, kotlin.jvm.functions.Function1<? super androidx.animation.TransitionState,kotlin.Unit> children);
+    method public static boolean getTransitionsEnabled();
+    method public static void setTransitionsEnabled(boolean p);
+  }
+
+}
+
diff --git a/ui/ui-core/api/0.1.0-dev10.txt b/ui/ui-core/api/0.1.0-dev10.txt
index 0405755..da55017 100644
--- a/ui/ui-core/api/0.1.0-dev10.txt
+++ b/ui/ui-core/api/0.1.0-dev10.txt
@@ -260,26 +260,26 @@
     method @FloatRange(from=0.0, to=1.0) public default float getAlpha();
     method public default boolean getClipToBounds();
     method public default boolean getClipToOutline();
-    method @FloatRange(from=0.0) public default float getElevation();
     method public default androidx.ui.graphics.Shape? getOutlineShape();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationX();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationY();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationZ();
     method public default float getScaleX();
     method public default float getScaleY();
+    method @FloatRange(from=0.0) public default float getShadowElevation();
     method public default long getTransformOrigin();
     method public default float getTranslationX();
     method public default float getTranslationY();
     property @FloatRange(from=0.0, to=1.0) public default float alpha;
     property public default boolean clipToBounds;
     property public default boolean clipToOutline;
-    property @FloatRange(from=0.0) public default float elevation;
     property public default androidx.ui.graphics.Shape? outlineShape;
     property @FloatRange(from=0.0, to=360.0) public default float rotationX;
     property @FloatRange(from=0.0, to=360.0) public default float rotationY;
     property @FloatRange(from=0.0, to=360.0) public default float rotationZ;
     property public default float scaleX;
     property public default float scaleY;
+    property @FloatRange(from=0.0) public default float shadowElevation;
     property public default long transformOrigin;
     property public default float translationX;
     property public default float translationY;
@@ -287,7 +287,7 @@
 
   public final class DrawLayerModifierKt {
     method public static inline long TransformOrigin(float pivotFractionX, float pivotFractionY);
-    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float shadowElevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
     method @Deprecated public static androidx.ui.core.Modifier drawLayer-ebHciuY(float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
   }
 
@@ -323,16 +323,26 @@
 
   public interface IntrinsicMeasurable {
     method public Object? getParentData();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     property public abstract Object? parentData;
   }
 
   public final class IntrinsicMeasurableKt {
   }
 
+  public abstract class IntrinsicMeasureScope implements androidx.ui.unit.Density {
+    ctor public IntrinsicMeasureScope();
+    method public abstract androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public final int maxIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int maxIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    method public final int minIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int minIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+  }
+
   public interface LayoutCoordinates {
     method public androidx.ui.unit.PxBounds childBoundingBox(androidx.ui.core.LayoutCoordinates child);
     method public androidx.ui.unit.PxPosition childToLocal(androidx.ui.core.LayoutCoordinates child, androidx.ui.unit.PxPosition childLocal);
@@ -377,20 +387,21 @@
   }
 
   public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
-    method public default int maxIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int maxIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public interface Measurable extends androidx.ui.core.IntrinsicMeasurable {
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
-  public abstract class MeasureScope implements androidx.ui.unit.Density {
+  public abstract class MeasureScope extends androidx.ui.core.IntrinsicMeasureScope {
     ctor public MeasureScope();
     method public final androidx.ui.core.MeasureScope.MeasureResult layout-Ocy6_kE(int width, int height, java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines = emptyMap(), kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+    method public final androidx.ui.core.Placeable measure(androidx.ui.core.Measurable, androidx.ui.core.Constraints constraints);
   }
 
   public static interface MeasureScope.MeasureResult {
@@ -467,18 +478,22 @@
     property protected abstract androidx.ui.unit.IntPxSize measuredSize;
     property protected abstract androidx.ui.core.Constraints measurementConstraints;
     property public final int width;
-    field public static final androidx.ui.core.Placeable.PlacementScope! PlacementScope;
   }
 
-  public static final class Placeable.PlacementScope {
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method public abstract androidx.ui.core.LayoutDirection getParentLayoutDirection();
+    method public abstract int getParentWidth();
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    property public abstract androidx.ui.core.LayoutDirection parentLayoutDirection;
+    property public abstract int parentWidth;
   }
 
   public enum PointerEventPass {
@@ -584,6 +599,15 @@
     ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
   }
 
+  public interface ZIndexModifier extends androidx.ui.core.Modifier.Element {
+    method public float getZIndex();
+    property public abstract float zIndex;
+  }
+
+  public final class ZIndexModifierKt {
+    method public static androidx.ui.core.Modifier zIndex(androidx.ui.core.Modifier, float zIndex);
+  }
+
 }
 
 package androidx.ui.focus {
diff --git a/ui/ui-core/api/0.1.0-dev11.txt b/ui/ui-core/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..da55017
--- /dev/null
+++ b/ui/ui-core/api/0.1.0-dev11.txt
@@ -0,0 +1,726 @@
+// Signature format: 3.0
+package androidx.ui.autofill {
+
+  public interface Autofill {
+    method public void cancelAutofillForNode(androidx.ui.autofill.AutofillNode autofillNode);
+    method public void requestAutofillForNode(androidx.ui.autofill.AutofillNode autofillNode);
+  }
+
+  public final class AutofillNode {
+    ctor public AutofillNode(java.util.List<? extends androidx.ui.autofill.AutofillType> autofillTypes, android.graphics.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
+    method public java.util.List<androidx.ui.autofill.AutofillType> component1();
+    method public android.graphics.Rect? component2();
+    method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? component3();
+    method public androidx.ui.autofill.AutofillNode copy(java.util.List<? extends androidx.ui.autofill.AutofillType> autofillTypes, android.graphics.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
+    method public java.util.List<androidx.ui.autofill.AutofillType> getAutofillTypes();
+    method public android.graphics.Rect? getBoundingBox();
+    method public int getId();
+    method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? getOnFill();
+    method public void setBoundingBox(android.graphics.Rect? p);
+    property public final int id;
+  }
+
+  public final class AutofillTree {
+    ctor public AutofillTree();
+    method public java.util.Map<java.lang.Integer,androidx.ui.autofill.AutofillNode> getChildren();
+    method public kotlin.Unit? performAutofill(int id, String value);
+    method public operator void plusAssign(androidx.ui.autofill.AutofillNode autofillNode);
+    property public final java.util.Map<java.lang.Integer,androidx.ui.autofill.AutofillNode> children;
+  }
+
+  public enum AutofillType {
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressAuxiliaryDetails;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressCountry;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressLocality;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressRegion;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressStreet;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateDay;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateFull;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateMonth;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateYear;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationDate;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationDay;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationMonth;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationYear;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardNumber;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardSecurityCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType EmailAddress;
+    enum_constant public static final androidx.ui.autofill.AutofillType Gender;
+    enum_constant @Deprecated public static final androidx.ui.autofill.AutofillType Name;
+    enum_constant public static final androidx.ui.autofill.AutofillType NewPassword;
+    enum_constant public static final androidx.ui.autofill.AutofillType NewUsername;
+    enum_constant public static final androidx.ui.autofill.AutofillType Password;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonFirstName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonFullName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonLastName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonMiddleInitial;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonMiddleName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonNamePrefix;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonNameSuffix;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneCountryCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneNumber;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneNumberDevice;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneNumberNational;
+    enum_constant public static final androidx.ui.autofill.AutofillType PostalAddress;
+    enum_constant public static final androidx.ui.autofill.AutofillType PostalCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType PostalCodeExtended;
+    enum_constant public static final androidx.ui.autofill.AutofillType SmsOtpCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType Username;
+  }
+
+}
+
+package androidx.ui.core {
+
+  public final class Alignment {
+    ctor public Alignment(float verticalBias, float horizontalBias);
+    method public androidx.ui.unit.IntPxPosition align(androidx.ui.unit.IntPxSize size, androidx.ui.core.LayoutDirection layoutDirection = androidx.ui.core.LayoutDirection.Ltr);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.core.Alignment copy(float verticalBias, float horizontalBias);
+    method public float getHorizontalBias();
+    method public float getVerticalBias();
+    field public static final androidx.ui.core.Alignment.Companion! Companion;
+  }
+
+  public static final class Alignment.Companion {
+    method public androidx.ui.core.Alignment.Vertical getBottom();
+    method public androidx.ui.core.Alignment getBottomCenter();
+    method public androidx.ui.core.Alignment getBottomEnd();
+    method public androidx.ui.core.Alignment getBottomStart();
+    method public androidx.ui.core.Alignment getCenter();
+    method public androidx.ui.core.Alignment getCenterEnd();
+    method public androidx.ui.core.Alignment.Horizontal getCenterHorizontally();
+    method public androidx.ui.core.Alignment getCenterStart();
+    method public androidx.ui.core.Alignment.Vertical getCenterVertically();
+    method public androidx.ui.core.Alignment.Horizontal getEnd();
+    method public androidx.ui.core.Alignment.Horizontal getStart();
+    method public androidx.ui.core.Alignment.Vertical getTop();
+    method public androidx.ui.core.Alignment getTopCenter();
+    method public androidx.ui.core.Alignment getTopEnd();
+    method public androidx.ui.core.Alignment getTopStart();
+    property public final androidx.ui.core.Alignment.Vertical Bottom;
+    property public final androidx.ui.core.Alignment BottomCenter;
+    property public final androidx.ui.core.Alignment BottomEnd;
+    property public final androidx.ui.core.Alignment BottomStart;
+    property public final androidx.ui.core.Alignment Center;
+    property public final androidx.ui.core.Alignment CenterEnd;
+    property public final androidx.ui.core.Alignment.Horizontal CenterHorizontally;
+    property public final androidx.ui.core.Alignment CenterStart;
+    property public final androidx.ui.core.Alignment.Vertical CenterVertically;
+    property public final androidx.ui.core.Alignment.Horizontal End;
+    property public final androidx.ui.core.Alignment.Horizontal Start;
+    property public final androidx.ui.core.Alignment.Vertical Top;
+    property public final androidx.ui.core.Alignment TopCenter;
+    property public final androidx.ui.core.Alignment TopEnd;
+    property public final androidx.ui.core.Alignment TopStart;
+  }
+
+  public static final class Alignment.Horizontal {
+    ctor public Alignment.Horizontal(float bias);
+    method public int align-Ujlv2dA(int size, androidx.ui.core.LayoutDirection layoutDirection = androidx.ui.core.LayoutDirection.Ltr);
+    method public float component1();
+    method public androidx.ui.core.Alignment.Horizontal copy(float bias);
+    method public float getBias();
+  }
+
+  public static final class Alignment.Vertical {
+    ctor public Alignment.Vertical(float bias);
+    method public int align-gshw56o(int size);
+    method public float component1();
+    method public androidx.ui.core.Alignment.Vertical copy(float bias);
+    method public float getBias();
+  }
+
+  public abstract sealed class AlignmentLine {
+  }
+
+  public final class AlignmentLineKt {
+    method public static int merge-CBRbNzc(androidx.ui.core.AlignmentLine, int position1, int position2);
+  }
+
+  public final class Constraints {
+    method public int component1();
+    method public int component2();
+    method public int component3();
+    method public int component4();
+    method public androidx.ui.core.Constraints copy-Q13GOEE(int minWidth, int maxWidth, int minHeight, int maxHeight);
+    method public int getMaxHeight();
+    method public int getMaxWidth();
+    method public int getMinHeight();
+    method public int getMinWidth();
+    field public static final androidx.ui.core.Constraints.Companion! Companion;
+  }
+
+  public static final class Constraints.Companion {
+    method public androidx.ui.core.Constraints fixed-rRMsBxU(int width, int height);
+    method public androidx.ui.core.Constraints fixedHeight-gshw56o(int height);
+    method public androidx.ui.core.Constraints fixedWidth-gshw56o(int width);
+  }
+
+  public final inline class Constraints2 {
+    ctor public Constraints2();
+    method public static long constructor-impl(internal long value);
+    method public static long copy-impl(long $this, int minWidth = this.minWidth, int maxWidth = this.maxWidth, int minHeight = this.minHeight, int maxHeight = this.maxHeight);
+    method public static 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 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 public static int hashCode-impl(long p);
+    method public static String toString-impl(long p);
+    field public static final androidx.ui.core.Constraints2.Companion! Companion;
+    field public static final int Infinity = -1073741824; // 0xc0000000
+  }
+
+  public static final class Constraints2.Companion {
+    method public long fixed(int width, int height);
+    method public long fixedHeight(int height);
+    method public long fixedWidth(int width);
+  }
+
+  public final class Constraints2Kt {
+    method public static long Constraints2(@IntRange(from=0) int minWidth = 0, int maxWidth = -1073741824, @IntRange(from=0) int minHeight = 0, int maxHeight = -1073741824);
+    method public static long constrain-M1ogGms(long, long size);
+    method public static long enforce-uQjoOwo(long, long otherConstraints);
+    method public static boolean getHasFixedHeight-ybNdgAI(long);
+    method public static boolean getHasFixedWidth-ybNdgAI(long);
+    method public static boolean isZero-ybNdgAI(long);
+    method public static long offset-xOKVbDg(long, int horizontal = 0, int vertical = 0);
+    method public static boolean satisfiedBy-M1ogGms(long, long size);
+  }
+
+  public final class ConstraintsKt {
+    method public static androidx.ui.unit.IntPxSize constrain(androidx.ui.core.Constraints, androidx.ui.unit.IntPxSize size);
+    method public static androidx.ui.core.Constraints enforce(androidx.ui.core.Constraints, androidx.ui.core.Constraints otherConstraints);
+    method public static boolean getHasBoundedHeight(androidx.ui.core.Constraints);
+    method public static boolean getHasBoundedWidth(androidx.ui.core.Constraints);
+    method public static boolean getHasFixedHeight(androidx.ui.core.Constraints);
+    method public static boolean getHasFixedWidth(androidx.ui.core.Constraints);
+    method public static boolean isZero(androidx.ui.core.Constraints);
+    method public static androidx.ui.core.Constraints offset-3L2DHGc(androidx.ui.core.Constraints, int horizontal = 0.ipx, int vertical = 0.ipx);
+    method public static boolean satisfiedBy(androidx.ui.core.Constraints, androidx.ui.unit.IntPxSize size);
+  }
+
+  public final class ConsumedData {
+    ctor public ConsumedData(androidx.ui.unit.PxPosition positionChange, boolean downChange);
+    ctor public ConsumedData();
+    method public androidx.ui.unit.PxPosition component1();
+    method public boolean component2();
+    method public androidx.ui.core.ConsumedData copy(androidx.ui.unit.PxPosition positionChange, boolean downChange);
+    method public boolean getDownChange();
+    method public androidx.ui.unit.PxPosition getPositionChange();
+  }
+
+  public interface ContentDrawScope extends androidx.ui.core.DrawScope {
+    method public void drawContent();
+  }
+
+  public interface ContentScale {
+    method public float scale(androidx.ui.unit.PxSize srcSize, androidx.ui.unit.PxSize dstSize);
+    field public static final androidx.ui.core.ContentScale.Companion! Companion;
+  }
+
+  public static final class ContentScale.Companion {
+    method public androidx.ui.core.ContentScale getCrop();
+    method public androidx.ui.core.ContentScale getFillHeight();
+    method public androidx.ui.core.ContentScale getFillWidth();
+    method public androidx.ui.core.ContentScale getFit();
+    method public androidx.ui.core.ContentScale getInside();
+    method public androidx.ui.core.FixedScale getNone();
+    property public final androidx.ui.core.ContentScale Crop;
+    property public final androidx.ui.core.ContentScale FillHeight;
+    property public final androidx.ui.core.ContentScale FillWidth;
+    property public final androidx.ui.core.ContentScale Fit;
+    property public final androidx.ui.core.ContentScale Inside;
+    property public final androidx.ui.core.FixedScale None;
+  }
+
+  public final class ContentScaleKt {
+  }
+
+  public interface CustomEvent {
+  }
+
+  public interface CustomEventDispatcher {
+    method public void dispatchCustomEvent(androidx.ui.core.CustomEvent event);
+  }
+
+  public enum Direction {
+    enum_constant public static final androidx.ui.core.Direction DOWN;
+    enum_constant public static final androidx.ui.core.Direction LEFT;
+    enum_constant public static final androidx.ui.core.Direction RIGHT;
+    enum_constant public static final androidx.ui.core.Direction UP;
+  }
+
+  public interface DrawLayerModifier extends androidx.ui.core.Modifier.Element {
+    method @FloatRange(from=0.0, to=1.0) public default float getAlpha();
+    method public default boolean getClipToBounds();
+    method public default boolean getClipToOutline();
+    method public default androidx.ui.graphics.Shape? getOutlineShape();
+    method @FloatRange(from=0.0, to=360.0) public default float getRotationX();
+    method @FloatRange(from=0.0, to=360.0) public default float getRotationY();
+    method @FloatRange(from=0.0, to=360.0) public default float getRotationZ();
+    method public default float getScaleX();
+    method public default float getScaleY();
+    method @FloatRange(from=0.0) public default float getShadowElevation();
+    method public default long getTransformOrigin();
+    method public default float getTranslationX();
+    method public default float getTranslationY();
+    property @FloatRange(from=0.0, to=1.0) public default float alpha;
+    property public default boolean clipToBounds;
+    property public default boolean clipToOutline;
+    property public default androidx.ui.graphics.Shape? outlineShape;
+    property @FloatRange(from=0.0, to=360.0) public default float rotationX;
+    property @FloatRange(from=0.0, to=360.0) public default float rotationY;
+    property @FloatRange(from=0.0, to=360.0) public default float rotationZ;
+    property public default float scaleX;
+    property public default float scaleY;
+    property @FloatRange(from=0.0) public default float shadowElevation;
+    property public default long transformOrigin;
+    property public default float translationX;
+    property public default float translationY;
+  }
+
+  public final class DrawLayerModifierKt {
+    method public static inline long TransformOrigin(float pivotFractionX, float pivotFractionY);
+    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float shadowElevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+    method @Deprecated public static androidx.ui.core.Modifier drawLayer-ebHciuY(float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+  }
+
+  public interface DrawModifier extends androidx.ui.core.Modifier.Element {
+    method public void draw(androidx.ui.core.ContentDrawScope);
+  }
+
+  public final class DrawModifierKt {
+    method @Deprecated public static androidx.ui.core.DrawModifier draw(kotlin.jvm.functions.Function1<? super androidx.ui.core.DrawScope,kotlin.Unit> onDraw);
+    method public static androidx.ui.core.Modifier drawBehind(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.DrawScope,kotlin.Unit> onDraw);
+    method public static androidx.ui.core.Modifier drawWithContent(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.ContentDrawScope,kotlin.Unit> onDraw);
+    method @Deprecated public static androidx.ui.core.DrawModifier drawWithContent(kotlin.jvm.functions.Function1<? super androidx.ui.core.ContentDrawScope,kotlin.Unit> onDraw);
+  }
+
+  public interface DrawScope extends androidx.ui.graphics.Canvas androidx.ui.unit.Density {
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public androidx.ui.unit.PxSize getSize();
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+    property public abstract androidx.ui.unit.PxSize size;
+  }
+
+  public final class FixedScale implements androidx.ui.core.ContentScale {
+    ctor public FixedScale(float value);
+    method public float component1();
+    method public androidx.ui.core.FixedScale copy(float value);
+    method public float getValue();
+    method public float scale(androidx.ui.unit.PxSize srcSize, androidx.ui.unit.PxSize dstSize);
+  }
+
+  public final class HorizontalAlignmentLine extends androidx.ui.core.AlignmentLine {
+    ctor public HorizontalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
+  }
+
+  public interface IntrinsicMeasurable {
+    method public Object? getParentData();
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    property public abstract Object? parentData;
+  }
+
+  public final class IntrinsicMeasurableKt {
+  }
+
+  public abstract class IntrinsicMeasureScope implements androidx.ui.unit.Density {
+    ctor public IntrinsicMeasureScope();
+    method public abstract androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public final int maxIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int maxIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    method public final int minIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int minIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+  }
+
+  public interface LayoutCoordinates {
+    method public androidx.ui.unit.PxBounds childBoundingBox(androidx.ui.core.LayoutCoordinates child);
+    method public androidx.ui.unit.PxPosition childToLocal(androidx.ui.core.LayoutCoordinates child, androidx.ui.unit.PxPosition childLocal);
+    method public operator androidx.ui.unit.IntPx? get(androidx.ui.core.AlignmentLine line);
+    method public androidx.ui.core.LayoutCoordinates? getParentCoordinates();
+    method public java.util.Set<androidx.ui.core.AlignmentLine> getProvidedAlignmentLines();
+    method public androidx.ui.unit.IntPxSize getSize();
+    method public androidx.ui.unit.PxPosition globalToLocal(androidx.ui.unit.PxPosition global);
+    method public boolean isAttached();
+    method public androidx.ui.unit.PxPosition localToGlobal(androidx.ui.unit.PxPosition local);
+    method public androidx.ui.unit.PxPosition localToRoot(androidx.ui.unit.PxPosition local);
+    property public abstract boolean isAttached;
+    property public abstract androidx.ui.core.LayoutCoordinates? parentCoordinates;
+    property public abstract java.util.Set<androidx.ui.core.AlignmentLine> providedAlignmentLines;
+    property public abstract androidx.ui.unit.IntPxSize size;
+  }
+
+  public final class LayoutCoordinatesKt {
+    method public static androidx.ui.unit.PxBounds getBoundsInParent(androidx.ui.core.LayoutCoordinates);
+    method public static androidx.ui.unit.PxBounds getBoundsInRoot(androidx.ui.core.LayoutCoordinates);
+    method public static androidx.ui.unit.PxBounds getGlobalBounds(androidx.ui.core.LayoutCoordinates);
+    method public static inline androidx.ui.unit.PxPosition getGlobalPosition(androidx.ui.core.LayoutCoordinates);
+    method public static androidx.ui.unit.PxPosition getPositionInParent(androidx.ui.core.LayoutCoordinates);
+    method public static inline androidx.ui.unit.PxPosition getPositionInRoot(androidx.ui.core.LayoutCoordinates);
+  }
+
+  public enum LayoutDirection {
+    enum_constant public static final androidx.ui.core.LayoutDirection Ltr;
+    enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
+  }
+
+  @Deprecated public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
+    method @Deprecated public default int maxIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default int maxIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default int minIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default int minIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+  }
+
+  public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
+    method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public interface Measurable extends androidx.ui.core.IntrinsicMeasurable {
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public abstract class MeasureScope extends androidx.ui.core.IntrinsicMeasureScope {
+    ctor public MeasureScope();
+    method public final androidx.ui.core.MeasureScope.MeasureResult layout-Ocy6_kE(int width, int height, java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines = emptyMap(), kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+    method public final androidx.ui.core.Placeable measure(androidx.ui.core.Measurable, androidx.ui.core.Constraints constraints);
+  }
+
+  public static interface MeasureScope.MeasureResult {
+    method public java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> getAlignmentLines();
+    method public int getHeight();
+    method public int getWidth();
+    method public void placeChildren(androidx.ui.core.LayoutDirection layoutDirection);
+    property public abstract java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines;
+    property public abstract int height;
+    property public abstract int width;
+  }
+
+  public final class MeasureScopeKt {
+  }
+
+  public final class Measured {
+    ctor public Measured(internal androidx.ui.core.Placeable placeable);
+    method public operator androidx.ui.unit.IntPx? get(androidx.ui.core.AlignmentLine alignmentLine);
+    method public int getHeight();
+    method public int getWidth();
+    property public final int height;
+    property public final int width;
+  }
+
+  public interface Modifier {
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public default operator androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+    field public static final androidx.ui.core.Modifier.Companion! Companion;
+  }
+
+  public static final class Modifier.Companion implements androidx.ui.core.Modifier {
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method @Deprecated public androidx.ui.core.Modifier getNone();
+    property @Deprecated public final androidx.ui.core.Modifier None;
+  }
+
+  public static interface Modifier.Element extends androidx.ui.core.Modifier {
+    method public default <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public default <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public interface OnChildPositionedModifier extends androidx.ui.core.Modifier.Element {
+    method public void onChildPositioned(androidx.ui.core.LayoutCoordinates coordinates);
+  }
+
+  public interface OnPositionedModifier extends androidx.ui.core.Modifier.Element {
+    method public void onPositioned(androidx.ui.core.LayoutCoordinates coordinates);
+  }
+
+  public final class OnPositionedModifierKt {
+    method public static androidx.ui.core.Modifier onChildPositioned(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onChildPositioned);
+    method @Deprecated public static androidx.ui.core.Modifier onChildPositioned(kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onChildPositioned);
+    method public static androidx.ui.core.Modifier onPositioned(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onPositioned);
+    method @Deprecated public static androidx.ui.core.Modifier onPositioned(kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onPositioned);
+  }
+
+  public interface ParentDataModifier extends androidx.ui.core.Modifier.Element {
+    method public default Object? modifyParentData(androidx.ui.unit.Density, Object? parentData);
+  }
+
+  public abstract class Placeable {
+    ctor public Placeable();
+    method public abstract operator androidx.ui.unit.IntPx? get(androidx.ui.core.AlignmentLine line);
+    method protected final androidx.ui.unit.IntPxPosition getApparentToRealOffset();
+    method public final int getHeight();
+    method protected abstract androidx.ui.unit.IntPxSize getMeasuredSize();
+    method protected abstract androidx.ui.core.Constraints getMeasurementConstraints();
+    method public final int getWidth();
+    method protected abstract void place(androidx.ui.unit.IntPxPosition position);
+    property protected final androidx.ui.unit.IntPxPosition apparentToRealOffset;
+    property public final int height;
+    property protected abstract androidx.ui.unit.IntPxSize measuredSize;
+    property protected abstract androidx.ui.core.Constraints measurementConstraints;
+    property public final int width;
+  }
+
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method public abstract androidx.ui.core.LayoutDirection getParentLayoutDirection();
+    method public abstract int getParentWidth();
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    property public abstract androidx.ui.core.LayoutDirection parentLayoutDirection;
+    property public abstract int parentWidth;
+  }
+
+  public enum PointerEventPass {
+    enum_constant public static final androidx.ui.core.PointerEventPass InitialDown;
+    enum_constant public static final androidx.ui.core.PointerEventPass PostDown;
+    enum_constant public static final androidx.ui.core.PointerEventPass PostUp;
+    enum_constant public static final androidx.ui.core.PointerEventPass PreDown;
+    enum_constant public static final androidx.ui.core.PointerEventPass PreUp;
+  }
+
+  public final inline class PointerId {
+    ctor public PointerId();
+    method public static long constructor-impl(long value);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getValue();
+    method public static int hashCode-impl(long p);
+    method public static String toString-impl(long p);
+  }
+
+  public final class PointerInputChange {
+    method public long component1();
+    method public androidx.ui.core.PointerInputData component2();
+    method public androidx.ui.core.PointerInputData component3();
+    method public androidx.ui.core.ConsumedData component4();
+    method public androidx.ui.core.PointerInputChange copy-jh1A5Og(long id, androidx.ui.core.PointerInputData current, androidx.ui.core.PointerInputData previous, androidx.ui.core.ConsumedData consumed);
+    method public androidx.ui.core.ConsumedData getConsumed();
+    method public androidx.ui.core.PointerInputData getCurrent();
+    method public long getId();
+    method public androidx.ui.core.PointerInputData getPrevious();
+  }
+
+  public final class PointerInputData {
+    ctor public PointerInputData(androidx.ui.unit.Uptime? uptime, androidx.ui.unit.PxPosition? position, boolean down);
+    ctor public PointerInputData();
+    method public androidx.ui.unit.Uptime? component1();
+    method public androidx.ui.unit.PxPosition? component2();
+    method public boolean component3();
+    method public androidx.ui.core.PointerInputData copy(androidx.ui.unit.Uptime? uptime, androidx.ui.unit.PxPosition? position, boolean down);
+    method public boolean getDown();
+    method public androidx.ui.unit.PxPosition? getPosition();
+    method public androidx.ui.unit.Uptime? getUptime();
+  }
+
+  public final class PointerInputKt {
+    method public static boolean anyPositionChangeConsumed(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToDown(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToDownIgnoreConsumed(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToUp(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToUpIgnoreConsumed(androidx.ui.core.PointerInputChange);
+    method public static androidx.ui.core.PointerInputChange consumeDownChange(androidx.ui.core.PointerInputChange);
+    method public static androidx.ui.core.PointerInputChange consumePositionChange-3EnrK0w(androidx.ui.core.PointerInputChange, float consumedDx, float consumedDy);
+    method public static androidx.ui.unit.PxPosition positionChange(androidx.ui.core.PointerInputChange);
+    method public static androidx.ui.unit.PxPosition positionChangeIgnoreConsumed(androidx.ui.core.PointerInputChange);
+    method public static boolean positionChanged(androidx.ui.core.PointerInputChange);
+    method public static boolean positionChangedIgnoreConsumed(androidx.ui.core.PointerInputChange);
+  }
+
+  public final class Ref<T> {
+    ctor public Ref();
+    method public T? getValue();
+    method public void setValue(T? p);
+    property public final T? value;
+  }
+
+  @Deprecated public interface ScaleFit extends androidx.ui.core.ContentScale {
+    field @Deprecated public static final androidx.ui.core.ScaleFit.Companion! Companion;
+  }
+
+  @Deprecated public static final class ScaleFit.Companion {
+    method @Deprecated public androidx.ui.core.ContentScale getFillHeight();
+    method @Deprecated public androidx.ui.core.ContentScale getFillMaxDimension();
+    method @Deprecated public androidx.ui.core.ContentScale getFillMinDimension();
+    method @Deprecated public androidx.ui.core.ContentScale getFillWidth();
+    method @Deprecated public androidx.ui.core.ContentScale getFit();
+    method @Deprecated public androidx.ui.core.FixedScale getNone();
+    property @Deprecated public final androidx.ui.core.ContentScale FillHeight;
+    property @Deprecated public final androidx.ui.core.ContentScale FillMaxDimension;
+    property @Deprecated public final androidx.ui.core.ContentScale FillMinDimension;
+    property @Deprecated public final androidx.ui.core.ContentScale FillWidth;
+    property @Deprecated public final androidx.ui.core.ContentScale Fit;
+    property @Deprecated public final androidx.ui.core.FixedScale None;
+  }
+
+  public final inline class TransformOrigin {
+    ctor public TransformOrigin();
+    method public static long constructor-impl(internal long value);
+    method public static 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 public static int hashCode-impl(long p);
+    method public static String toString-impl(long p);
+    field public static final androidx.ui.core.TransformOrigin.Companion! Companion;
+  }
+
+  public static final class TransformOrigin.Companion {
+    method public long getCenter();
+    property public final long Center;
+  }
+
+  public final class VerticalAlignmentLine extends androidx.ui.core.AlignmentLine {
+    ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
+  }
+
+  public interface ZIndexModifier extends androidx.ui.core.Modifier.Element {
+    method public float getZIndex();
+    property public abstract float zIndex;
+  }
+
+  public final class ZIndexModifierKt {
+    method public static androidx.ui.core.Modifier zIndex(androidx.ui.core.Modifier, float zIndex);
+  }
+
+}
+
+package androidx.ui.focus {
+
+  public enum FocusDetailedState {
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Active;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState ActiveParent;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Captured;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Disabled;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Inactive;
+  }
+
+  public interface FocusModifier extends androidx.ui.core.Modifier.Element {
+    method public boolean captureFocus();
+    method public boolean freeFocus();
+    method public androidx.ui.focus.FocusDetailedState getFocusDetailedState();
+    method public void requestFocus();
+    property public abstract androidx.ui.focus.FocusDetailedState focusDetailedState;
+  }
+
+  public enum FocusState {
+    enum_constant public static final androidx.ui.focus.FocusState Focused;
+    enum_constant public static final androidx.ui.focus.FocusState NotFocusable;
+    enum_constant public static final androidx.ui.focus.FocusState NotFocused;
+  }
+
+  public final class FocusStateKt {
+    method public static androidx.ui.focus.FocusState focusState(androidx.ui.focus.FocusDetailedState);
+  }
+
+}
+
+package androidx.ui.semantics {
+
+  public final class AccessibilityAction<T extends kotlin.Function<? extends kotlin.Unit>> {
+    ctor public AccessibilityAction(String? label, T action);
+    method public String? component1();
+    method public T component2();
+    method public androidx.ui.semantics.AccessibilityAction<T> copy(String? label, T action);
+    method public T getAction();
+    method public String? getLabel();
+  }
+
+  public final class AccessibilityRangeInfo {
+    ctor public AccessibilityRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range);
+    method public float component1();
+    method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> component2();
+    method public androidx.ui.semantics.AccessibilityRangeInfo copy(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range);
+    method public float getCurrent();
+    method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> getRange();
+  }
+
+  public final class SemanticsActions {
+    ctor public SemanticsActions();
+    field public static final androidx.ui.semantics.SemanticsActions.Companion! Companion;
+  }
+
+  public static final class SemanticsActions.Companion {
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>>> getCustomActions();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> getOnClick();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>>> getScrollTo();
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>>> CustomActions;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> OnClick;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>>> ScrollTo;
+  }
+
+  public final class SemanticsProperties {
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getAccessibilityLabel();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> getAccessibilityRangeInfo();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getAccessibilityValue();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getEnabled();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getHidden();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Enabled;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Hidden;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
+    field public static final androidx.ui.semantics.SemanticsProperties! INSTANCE;
+  }
+
+  public class SemanticsPropertyKey<T> implements kotlin.properties.ReadWriteProperty<androidx.ui.semantics.SemanticsPropertyReceiver,T> {
+    ctor public SemanticsPropertyKey(String name);
+    method public final String getName();
+    method public final T! getValue(androidx.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property);
+    method public T! merge(T? existingValue, T? newValue);
+    method public final void setValue(androidx.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property, T? value);
+  }
+
+  public interface SemanticsPropertyReceiver {
+    method public operator <T> void set(androidx.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+  }
+
+}
+
+package androidx.ui.testutils {
+
+  public final class PointerInputTestUtilKt {
+    method public static androidx.ui.core.PointerInputChange consume(androidx.ui.core.PointerInputChange, float dx = 0f, float dy = 0f, boolean downChange = false);
+    method public static androidx.ui.core.PointerInputChange down(long id, androidx.ui.unit.Duration duration = Duration.Zero, float x = 0f, float y = 0f);
+    method public static androidx.ui.core.PointerInputChange invokeOverAllPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange pointerInputChanges, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static java.util.List<androidx.ui.core.PointerInputChange> invokeOverAllPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange![] pointerInputChanges, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static void invokeOverAllPasses(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>, androidx.ui.core.CustomEvent event);
+    method public static androidx.ui.core.PointerInputChange invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange pointerInputChange, androidx.ui.core.PointerEventPass pointerEventPass, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static java.util.List<androidx.ui.core.PointerInputChange> invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange![] pointerInputChanges, androidx.ui.core.PointerEventPass pointerEventPass, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static androidx.ui.core.PointerInputChange invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange pointerInputChange, androidx.ui.core.PointerEventPass![] pointerEventPasses, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static java.util.List<androidx.ui.core.PointerInputChange> invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, java.util.List<androidx.ui.core.PointerInputChange> pointerInputChanges, java.util.List<? extends androidx.ui.core.PointerEventPass> pointerEventPasses, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static void invokeOverPasses(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>, androidx.ui.core.CustomEvent event, java.util.List<? extends androidx.ui.core.PointerEventPass> pointerEventPasses);
+    method public static androidx.ui.core.PointerInputChange moveBy(androidx.ui.core.PointerInputChange, androidx.ui.unit.Duration duration, float dx = 0f, float dy = 0f);
+    method public static androidx.ui.core.PointerInputChange moveTo(androidx.ui.core.PointerInputChange, androidx.ui.unit.Duration duration, float x = 0f, float y = 0f);
+    method public static androidx.ui.core.PointerInputChange up(androidx.ui.core.PointerInputChange, androidx.ui.unit.Duration duration);
+  }
+
+}
+
diff --git a/ui/ui-core/api/current.txt b/ui/ui-core/api/current.txt
index 0405755..da55017 100644
--- a/ui/ui-core/api/current.txt
+++ b/ui/ui-core/api/current.txt
@@ -260,26 +260,26 @@
     method @FloatRange(from=0.0, to=1.0) public default float getAlpha();
     method public default boolean getClipToBounds();
     method public default boolean getClipToOutline();
-    method @FloatRange(from=0.0) public default float getElevation();
     method public default androidx.ui.graphics.Shape? getOutlineShape();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationX();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationY();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationZ();
     method public default float getScaleX();
     method public default float getScaleY();
+    method @FloatRange(from=0.0) public default float getShadowElevation();
     method public default long getTransformOrigin();
     method public default float getTranslationX();
     method public default float getTranslationY();
     property @FloatRange(from=0.0, to=1.0) public default float alpha;
     property public default boolean clipToBounds;
     property public default boolean clipToOutline;
-    property @FloatRange(from=0.0) public default float elevation;
     property public default androidx.ui.graphics.Shape? outlineShape;
     property @FloatRange(from=0.0, to=360.0) public default float rotationX;
     property @FloatRange(from=0.0, to=360.0) public default float rotationY;
     property @FloatRange(from=0.0, to=360.0) public default float rotationZ;
     property public default float scaleX;
     property public default float scaleY;
+    property @FloatRange(from=0.0) public default float shadowElevation;
     property public default long transformOrigin;
     property public default float translationX;
     property public default float translationY;
@@ -287,7 +287,7 @@
 
   public final class DrawLayerModifierKt {
     method public static inline long TransformOrigin(float pivotFractionX, float pivotFractionY);
-    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float shadowElevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
     method @Deprecated public static androidx.ui.core.Modifier drawLayer-ebHciuY(float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
   }
 
@@ -323,16 +323,26 @@
 
   public interface IntrinsicMeasurable {
     method public Object? getParentData();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     property public abstract Object? parentData;
   }
 
   public final class IntrinsicMeasurableKt {
   }
 
+  public abstract class IntrinsicMeasureScope implements androidx.ui.unit.Density {
+    ctor public IntrinsicMeasureScope();
+    method public abstract androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public final int maxIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int maxIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    method public final int minIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int minIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+  }
+
   public interface LayoutCoordinates {
     method public androidx.ui.unit.PxBounds childBoundingBox(androidx.ui.core.LayoutCoordinates child);
     method public androidx.ui.unit.PxPosition childToLocal(androidx.ui.core.LayoutCoordinates child, androidx.ui.unit.PxPosition childLocal);
@@ -377,20 +387,21 @@
   }
 
   public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
-    method public default int maxIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int maxIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public interface Measurable extends androidx.ui.core.IntrinsicMeasurable {
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
-  public abstract class MeasureScope implements androidx.ui.unit.Density {
+  public abstract class MeasureScope extends androidx.ui.core.IntrinsicMeasureScope {
     ctor public MeasureScope();
     method public final androidx.ui.core.MeasureScope.MeasureResult layout-Ocy6_kE(int width, int height, java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines = emptyMap(), kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+    method public final androidx.ui.core.Placeable measure(androidx.ui.core.Measurable, androidx.ui.core.Constraints constraints);
   }
 
   public static interface MeasureScope.MeasureResult {
@@ -467,18 +478,22 @@
     property protected abstract androidx.ui.unit.IntPxSize measuredSize;
     property protected abstract androidx.ui.core.Constraints measurementConstraints;
     property public final int width;
-    field public static final androidx.ui.core.Placeable.PlacementScope! PlacementScope;
   }
 
-  public static final class Placeable.PlacementScope {
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method public abstract androidx.ui.core.LayoutDirection getParentLayoutDirection();
+    method public abstract int getParentWidth();
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    property public abstract androidx.ui.core.LayoutDirection parentLayoutDirection;
+    property public abstract int parentWidth;
   }
 
   public enum PointerEventPass {
@@ -584,6 +599,15 @@
     ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
   }
 
+  public interface ZIndexModifier extends androidx.ui.core.Modifier.Element {
+    method public float getZIndex();
+    property public abstract float zIndex;
+  }
+
+  public final class ZIndexModifierKt {
+    method public static androidx.ui.core.Modifier zIndex(androidx.ui.core.Modifier, float zIndex);
+  }
+
 }
 
 package androidx.ui.focus {
diff --git a/ui/ui-core/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-core/api/public_plus_experimental_0.1.0-dev10.txt
index 0405755..da55017 100644
--- a/ui/ui-core/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/ui/ui-core/api/public_plus_experimental_0.1.0-dev10.txt
@@ -260,26 +260,26 @@
     method @FloatRange(from=0.0, to=1.0) public default float getAlpha();
     method public default boolean getClipToBounds();
     method public default boolean getClipToOutline();
-    method @FloatRange(from=0.0) public default float getElevation();
     method public default androidx.ui.graphics.Shape? getOutlineShape();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationX();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationY();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationZ();
     method public default float getScaleX();
     method public default float getScaleY();
+    method @FloatRange(from=0.0) public default float getShadowElevation();
     method public default long getTransformOrigin();
     method public default float getTranslationX();
     method public default float getTranslationY();
     property @FloatRange(from=0.0, to=1.0) public default float alpha;
     property public default boolean clipToBounds;
     property public default boolean clipToOutline;
-    property @FloatRange(from=0.0) public default float elevation;
     property public default androidx.ui.graphics.Shape? outlineShape;
     property @FloatRange(from=0.0, to=360.0) public default float rotationX;
     property @FloatRange(from=0.0, to=360.0) public default float rotationY;
     property @FloatRange(from=0.0, to=360.0) public default float rotationZ;
     property public default float scaleX;
     property public default float scaleY;
+    property @FloatRange(from=0.0) public default float shadowElevation;
     property public default long transformOrigin;
     property public default float translationX;
     property public default float translationY;
@@ -287,7 +287,7 @@
 
   public final class DrawLayerModifierKt {
     method public static inline long TransformOrigin(float pivotFractionX, float pivotFractionY);
-    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float shadowElevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
     method @Deprecated public static androidx.ui.core.Modifier drawLayer-ebHciuY(float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
   }
 
@@ -323,16 +323,26 @@
 
   public interface IntrinsicMeasurable {
     method public Object? getParentData();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     property public abstract Object? parentData;
   }
 
   public final class IntrinsicMeasurableKt {
   }
 
+  public abstract class IntrinsicMeasureScope implements androidx.ui.unit.Density {
+    ctor public IntrinsicMeasureScope();
+    method public abstract androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public final int maxIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int maxIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    method public final int minIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int minIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+  }
+
   public interface LayoutCoordinates {
     method public androidx.ui.unit.PxBounds childBoundingBox(androidx.ui.core.LayoutCoordinates child);
     method public androidx.ui.unit.PxPosition childToLocal(androidx.ui.core.LayoutCoordinates child, androidx.ui.unit.PxPosition childLocal);
@@ -377,20 +387,21 @@
   }
 
   public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
-    method public default int maxIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int maxIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public interface Measurable extends androidx.ui.core.IntrinsicMeasurable {
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
-  public abstract class MeasureScope implements androidx.ui.unit.Density {
+  public abstract class MeasureScope extends androidx.ui.core.IntrinsicMeasureScope {
     ctor public MeasureScope();
     method public final androidx.ui.core.MeasureScope.MeasureResult layout-Ocy6_kE(int width, int height, java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines = emptyMap(), kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+    method public final androidx.ui.core.Placeable measure(androidx.ui.core.Measurable, androidx.ui.core.Constraints constraints);
   }
 
   public static interface MeasureScope.MeasureResult {
@@ -467,18 +478,22 @@
     property protected abstract androidx.ui.unit.IntPxSize measuredSize;
     property protected abstract androidx.ui.core.Constraints measurementConstraints;
     property public final int width;
-    field public static final androidx.ui.core.Placeable.PlacementScope! PlacementScope;
   }
 
-  public static final class Placeable.PlacementScope {
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method public abstract androidx.ui.core.LayoutDirection getParentLayoutDirection();
+    method public abstract int getParentWidth();
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    property public abstract androidx.ui.core.LayoutDirection parentLayoutDirection;
+    property public abstract int parentWidth;
   }
 
   public enum PointerEventPass {
@@ -584,6 +599,15 @@
     ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
   }
 
+  public interface ZIndexModifier extends androidx.ui.core.Modifier.Element {
+    method public float getZIndex();
+    property public abstract float zIndex;
+  }
+
+  public final class ZIndexModifierKt {
+    method public static androidx.ui.core.Modifier zIndex(androidx.ui.core.Modifier, float zIndex);
+  }
+
 }
 
 package androidx.ui.focus {
diff --git a/ui/ui-core/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-core/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..da55017
--- /dev/null
+++ b/ui/ui-core/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,726 @@
+// Signature format: 3.0
+package androidx.ui.autofill {
+
+  public interface Autofill {
+    method public void cancelAutofillForNode(androidx.ui.autofill.AutofillNode autofillNode);
+    method public void requestAutofillForNode(androidx.ui.autofill.AutofillNode autofillNode);
+  }
+
+  public final class AutofillNode {
+    ctor public AutofillNode(java.util.List<? extends androidx.ui.autofill.AutofillType> autofillTypes, android.graphics.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
+    method public java.util.List<androidx.ui.autofill.AutofillType> component1();
+    method public android.graphics.Rect? component2();
+    method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? component3();
+    method public androidx.ui.autofill.AutofillNode copy(java.util.List<? extends androidx.ui.autofill.AutofillType> autofillTypes, android.graphics.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
+    method public java.util.List<androidx.ui.autofill.AutofillType> getAutofillTypes();
+    method public android.graphics.Rect? getBoundingBox();
+    method public int getId();
+    method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? getOnFill();
+    method public void setBoundingBox(android.graphics.Rect? p);
+    property public final int id;
+  }
+
+  public final class AutofillTree {
+    ctor public AutofillTree();
+    method public java.util.Map<java.lang.Integer,androidx.ui.autofill.AutofillNode> getChildren();
+    method public kotlin.Unit? performAutofill(int id, String value);
+    method public operator void plusAssign(androidx.ui.autofill.AutofillNode autofillNode);
+    property public final java.util.Map<java.lang.Integer,androidx.ui.autofill.AutofillNode> children;
+  }
+
+  public enum AutofillType {
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressAuxiliaryDetails;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressCountry;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressLocality;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressRegion;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressStreet;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateDay;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateFull;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateMonth;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateYear;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationDate;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationDay;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationMonth;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationYear;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardNumber;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardSecurityCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType EmailAddress;
+    enum_constant public static final androidx.ui.autofill.AutofillType Gender;
+    enum_constant @Deprecated public static final androidx.ui.autofill.AutofillType Name;
+    enum_constant public static final androidx.ui.autofill.AutofillType NewPassword;
+    enum_constant public static final androidx.ui.autofill.AutofillType NewUsername;
+    enum_constant public static final androidx.ui.autofill.AutofillType Password;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonFirstName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonFullName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonLastName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonMiddleInitial;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonMiddleName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonNamePrefix;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonNameSuffix;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneCountryCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneNumber;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneNumberDevice;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneNumberNational;
+    enum_constant public static final androidx.ui.autofill.AutofillType PostalAddress;
+    enum_constant public static final androidx.ui.autofill.AutofillType PostalCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType PostalCodeExtended;
+    enum_constant public static final androidx.ui.autofill.AutofillType SmsOtpCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType Username;
+  }
+
+}
+
+package androidx.ui.core {
+
+  public final class Alignment {
+    ctor public Alignment(float verticalBias, float horizontalBias);
+    method public androidx.ui.unit.IntPxPosition align(androidx.ui.unit.IntPxSize size, androidx.ui.core.LayoutDirection layoutDirection = androidx.ui.core.LayoutDirection.Ltr);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.core.Alignment copy(float verticalBias, float horizontalBias);
+    method public float getHorizontalBias();
+    method public float getVerticalBias();
+    field public static final androidx.ui.core.Alignment.Companion! Companion;
+  }
+
+  public static final class Alignment.Companion {
+    method public androidx.ui.core.Alignment.Vertical getBottom();
+    method public androidx.ui.core.Alignment getBottomCenter();
+    method public androidx.ui.core.Alignment getBottomEnd();
+    method public androidx.ui.core.Alignment getBottomStart();
+    method public androidx.ui.core.Alignment getCenter();
+    method public androidx.ui.core.Alignment getCenterEnd();
+    method public androidx.ui.core.Alignment.Horizontal getCenterHorizontally();
+    method public androidx.ui.core.Alignment getCenterStart();
+    method public androidx.ui.core.Alignment.Vertical getCenterVertically();
+    method public androidx.ui.core.Alignment.Horizontal getEnd();
+    method public androidx.ui.core.Alignment.Horizontal getStart();
+    method public androidx.ui.core.Alignment.Vertical getTop();
+    method public androidx.ui.core.Alignment getTopCenter();
+    method public androidx.ui.core.Alignment getTopEnd();
+    method public androidx.ui.core.Alignment getTopStart();
+    property public final androidx.ui.core.Alignment.Vertical Bottom;
+    property public final androidx.ui.core.Alignment BottomCenter;
+    property public final androidx.ui.core.Alignment BottomEnd;
+    property public final androidx.ui.core.Alignment BottomStart;
+    property public final androidx.ui.core.Alignment Center;
+    property public final androidx.ui.core.Alignment CenterEnd;
+    property public final androidx.ui.core.Alignment.Horizontal CenterHorizontally;
+    property public final androidx.ui.core.Alignment CenterStart;
+    property public final androidx.ui.core.Alignment.Vertical CenterVertically;
+    property public final androidx.ui.core.Alignment.Horizontal End;
+    property public final androidx.ui.core.Alignment.Horizontal Start;
+    property public final androidx.ui.core.Alignment.Vertical Top;
+    property public final androidx.ui.core.Alignment TopCenter;
+    property public final androidx.ui.core.Alignment TopEnd;
+    property public final androidx.ui.core.Alignment TopStart;
+  }
+
+  public static final class Alignment.Horizontal {
+    ctor public Alignment.Horizontal(float bias);
+    method public int align-Ujlv2dA(int size, androidx.ui.core.LayoutDirection layoutDirection = androidx.ui.core.LayoutDirection.Ltr);
+    method public float component1();
+    method public androidx.ui.core.Alignment.Horizontal copy(float bias);
+    method public float getBias();
+  }
+
+  public static final class Alignment.Vertical {
+    ctor public Alignment.Vertical(float bias);
+    method public int align-gshw56o(int size);
+    method public float component1();
+    method public androidx.ui.core.Alignment.Vertical copy(float bias);
+    method public float getBias();
+  }
+
+  public abstract sealed class AlignmentLine {
+  }
+
+  public final class AlignmentLineKt {
+    method public static int merge-CBRbNzc(androidx.ui.core.AlignmentLine, int position1, int position2);
+  }
+
+  public final class Constraints {
+    method public int component1();
+    method public int component2();
+    method public int component3();
+    method public int component4();
+    method public androidx.ui.core.Constraints copy-Q13GOEE(int minWidth, int maxWidth, int minHeight, int maxHeight);
+    method public int getMaxHeight();
+    method public int getMaxWidth();
+    method public int getMinHeight();
+    method public int getMinWidth();
+    field public static final androidx.ui.core.Constraints.Companion! Companion;
+  }
+
+  public static final class Constraints.Companion {
+    method public androidx.ui.core.Constraints fixed-rRMsBxU(int width, int height);
+    method public androidx.ui.core.Constraints fixedHeight-gshw56o(int height);
+    method public androidx.ui.core.Constraints fixedWidth-gshw56o(int width);
+  }
+
+  public final inline class Constraints2 {
+    ctor public Constraints2();
+    method public static long constructor-impl(internal long value);
+    method public static long copy-impl(long $this, int minWidth = this.minWidth, int maxWidth = this.maxWidth, int minHeight = this.minHeight, int maxHeight = this.maxHeight);
+    method public static 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 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 public static int hashCode-impl(long p);
+    method public static String toString-impl(long p);
+    field public static final androidx.ui.core.Constraints2.Companion! Companion;
+    field public static final int Infinity = -1073741824; // 0xc0000000
+  }
+
+  public static final class Constraints2.Companion {
+    method public long fixed(int width, int height);
+    method public long fixedHeight(int height);
+    method public long fixedWidth(int width);
+  }
+
+  public final class Constraints2Kt {
+    method public static long Constraints2(@IntRange(from=0) int minWidth = 0, int maxWidth = -1073741824, @IntRange(from=0) int minHeight = 0, int maxHeight = -1073741824);
+    method public static long constrain-M1ogGms(long, long size);
+    method public static long enforce-uQjoOwo(long, long otherConstraints);
+    method public static boolean getHasFixedHeight-ybNdgAI(long);
+    method public static boolean getHasFixedWidth-ybNdgAI(long);
+    method public static boolean isZero-ybNdgAI(long);
+    method public static long offset-xOKVbDg(long, int horizontal = 0, int vertical = 0);
+    method public static boolean satisfiedBy-M1ogGms(long, long size);
+  }
+
+  public final class ConstraintsKt {
+    method public static androidx.ui.unit.IntPxSize constrain(androidx.ui.core.Constraints, androidx.ui.unit.IntPxSize size);
+    method public static androidx.ui.core.Constraints enforce(androidx.ui.core.Constraints, androidx.ui.core.Constraints otherConstraints);
+    method public static boolean getHasBoundedHeight(androidx.ui.core.Constraints);
+    method public static boolean getHasBoundedWidth(androidx.ui.core.Constraints);
+    method public static boolean getHasFixedHeight(androidx.ui.core.Constraints);
+    method public static boolean getHasFixedWidth(androidx.ui.core.Constraints);
+    method public static boolean isZero(androidx.ui.core.Constraints);
+    method public static androidx.ui.core.Constraints offset-3L2DHGc(androidx.ui.core.Constraints, int horizontal = 0.ipx, int vertical = 0.ipx);
+    method public static boolean satisfiedBy(androidx.ui.core.Constraints, androidx.ui.unit.IntPxSize size);
+  }
+
+  public final class ConsumedData {
+    ctor public ConsumedData(androidx.ui.unit.PxPosition positionChange, boolean downChange);
+    ctor public ConsumedData();
+    method public androidx.ui.unit.PxPosition component1();
+    method public boolean component2();
+    method public androidx.ui.core.ConsumedData copy(androidx.ui.unit.PxPosition positionChange, boolean downChange);
+    method public boolean getDownChange();
+    method public androidx.ui.unit.PxPosition getPositionChange();
+  }
+
+  public interface ContentDrawScope extends androidx.ui.core.DrawScope {
+    method public void drawContent();
+  }
+
+  public interface ContentScale {
+    method public float scale(androidx.ui.unit.PxSize srcSize, androidx.ui.unit.PxSize dstSize);
+    field public static final androidx.ui.core.ContentScale.Companion! Companion;
+  }
+
+  public static final class ContentScale.Companion {
+    method public androidx.ui.core.ContentScale getCrop();
+    method public androidx.ui.core.ContentScale getFillHeight();
+    method public androidx.ui.core.ContentScale getFillWidth();
+    method public androidx.ui.core.ContentScale getFit();
+    method public androidx.ui.core.ContentScale getInside();
+    method public androidx.ui.core.FixedScale getNone();
+    property public final androidx.ui.core.ContentScale Crop;
+    property public final androidx.ui.core.ContentScale FillHeight;
+    property public final androidx.ui.core.ContentScale FillWidth;
+    property public final androidx.ui.core.ContentScale Fit;
+    property public final androidx.ui.core.ContentScale Inside;
+    property public final androidx.ui.core.FixedScale None;
+  }
+
+  public final class ContentScaleKt {
+  }
+
+  public interface CustomEvent {
+  }
+
+  public interface CustomEventDispatcher {
+    method public void dispatchCustomEvent(androidx.ui.core.CustomEvent event);
+  }
+
+  public enum Direction {
+    enum_constant public static final androidx.ui.core.Direction DOWN;
+    enum_constant public static final androidx.ui.core.Direction LEFT;
+    enum_constant public static final androidx.ui.core.Direction RIGHT;
+    enum_constant public static final androidx.ui.core.Direction UP;
+  }
+
+  public interface DrawLayerModifier extends androidx.ui.core.Modifier.Element {
+    method @FloatRange(from=0.0, to=1.0) public default float getAlpha();
+    method public default boolean getClipToBounds();
+    method public default boolean getClipToOutline();
+    method public default androidx.ui.graphics.Shape? getOutlineShape();
+    method @FloatRange(from=0.0, to=360.0) public default float getRotationX();
+    method @FloatRange(from=0.0, to=360.0) public default float getRotationY();
+    method @FloatRange(from=0.0, to=360.0) public default float getRotationZ();
+    method public default float getScaleX();
+    method public default float getScaleY();
+    method @FloatRange(from=0.0) public default float getShadowElevation();
+    method public default long getTransformOrigin();
+    method public default float getTranslationX();
+    method public default float getTranslationY();
+    property @FloatRange(from=0.0, to=1.0) public default float alpha;
+    property public default boolean clipToBounds;
+    property public default boolean clipToOutline;
+    property public default androidx.ui.graphics.Shape? outlineShape;
+    property @FloatRange(from=0.0, to=360.0) public default float rotationX;
+    property @FloatRange(from=0.0, to=360.0) public default float rotationY;
+    property @FloatRange(from=0.0, to=360.0) public default float rotationZ;
+    property public default float scaleX;
+    property public default float scaleY;
+    property @FloatRange(from=0.0) public default float shadowElevation;
+    property public default long transformOrigin;
+    property public default float translationX;
+    property public default float translationY;
+  }
+
+  public final class DrawLayerModifierKt {
+    method public static inline long TransformOrigin(float pivotFractionX, float pivotFractionY);
+    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float shadowElevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+    method @Deprecated public static androidx.ui.core.Modifier drawLayer-ebHciuY(float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+  }
+
+  public interface DrawModifier extends androidx.ui.core.Modifier.Element {
+    method public void draw(androidx.ui.core.ContentDrawScope);
+  }
+
+  public final class DrawModifierKt {
+    method @Deprecated public static androidx.ui.core.DrawModifier draw(kotlin.jvm.functions.Function1<? super androidx.ui.core.DrawScope,kotlin.Unit> onDraw);
+    method public static androidx.ui.core.Modifier drawBehind(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.DrawScope,kotlin.Unit> onDraw);
+    method public static androidx.ui.core.Modifier drawWithContent(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.ContentDrawScope,kotlin.Unit> onDraw);
+    method @Deprecated public static androidx.ui.core.DrawModifier drawWithContent(kotlin.jvm.functions.Function1<? super androidx.ui.core.ContentDrawScope,kotlin.Unit> onDraw);
+  }
+
+  public interface DrawScope extends androidx.ui.graphics.Canvas androidx.ui.unit.Density {
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public androidx.ui.unit.PxSize getSize();
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+    property public abstract androidx.ui.unit.PxSize size;
+  }
+
+  public final class FixedScale implements androidx.ui.core.ContentScale {
+    ctor public FixedScale(float value);
+    method public float component1();
+    method public androidx.ui.core.FixedScale copy(float value);
+    method public float getValue();
+    method public float scale(androidx.ui.unit.PxSize srcSize, androidx.ui.unit.PxSize dstSize);
+  }
+
+  public final class HorizontalAlignmentLine extends androidx.ui.core.AlignmentLine {
+    ctor public HorizontalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
+  }
+
+  public interface IntrinsicMeasurable {
+    method public Object? getParentData();
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    property public abstract Object? parentData;
+  }
+
+  public final class IntrinsicMeasurableKt {
+  }
+
+  public abstract class IntrinsicMeasureScope implements androidx.ui.unit.Density {
+    ctor public IntrinsicMeasureScope();
+    method public abstract androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public final int maxIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int maxIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    method public final int minIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int minIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+  }
+
+  public interface LayoutCoordinates {
+    method public androidx.ui.unit.PxBounds childBoundingBox(androidx.ui.core.LayoutCoordinates child);
+    method public androidx.ui.unit.PxPosition childToLocal(androidx.ui.core.LayoutCoordinates child, androidx.ui.unit.PxPosition childLocal);
+    method public operator androidx.ui.unit.IntPx? get(androidx.ui.core.AlignmentLine line);
+    method public androidx.ui.core.LayoutCoordinates? getParentCoordinates();
+    method public java.util.Set<androidx.ui.core.AlignmentLine> getProvidedAlignmentLines();
+    method public androidx.ui.unit.IntPxSize getSize();
+    method public androidx.ui.unit.PxPosition globalToLocal(androidx.ui.unit.PxPosition global);
+    method public boolean isAttached();
+    method public androidx.ui.unit.PxPosition localToGlobal(androidx.ui.unit.PxPosition local);
+    method public androidx.ui.unit.PxPosition localToRoot(androidx.ui.unit.PxPosition local);
+    property public abstract boolean isAttached;
+    property public abstract androidx.ui.core.LayoutCoordinates? parentCoordinates;
+    property public abstract java.util.Set<androidx.ui.core.AlignmentLine> providedAlignmentLines;
+    property public abstract androidx.ui.unit.IntPxSize size;
+  }
+
+  public final class LayoutCoordinatesKt {
+    method public static androidx.ui.unit.PxBounds getBoundsInParent(androidx.ui.core.LayoutCoordinates);
+    method public static androidx.ui.unit.PxBounds getBoundsInRoot(androidx.ui.core.LayoutCoordinates);
+    method public static androidx.ui.unit.PxBounds getGlobalBounds(androidx.ui.core.LayoutCoordinates);
+    method public static inline androidx.ui.unit.PxPosition getGlobalPosition(androidx.ui.core.LayoutCoordinates);
+    method public static androidx.ui.unit.PxPosition getPositionInParent(androidx.ui.core.LayoutCoordinates);
+    method public static inline androidx.ui.unit.PxPosition getPositionInRoot(androidx.ui.core.LayoutCoordinates);
+  }
+
+  public enum LayoutDirection {
+    enum_constant public static final androidx.ui.core.LayoutDirection Ltr;
+    enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
+  }
+
+  @Deprecated public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
+    method @Deprecated public default int maxIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default int maxIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default int minIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default int minIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+  }
+
+  public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
+    method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public interface Measurable extends androidx.ui.core.IntrinsicMeasurable {
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public abstract class MeasureScope extends androidx.ui.core.IntrinsicMeasureScope {
+    ctor public MeasureScope();
+    method public final androidx.ui.core.MeasureScope.MeasureResult layout-Ocy6_kE(int width, int height, java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines = emptyMap(), kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+    method public final androidx.ui.core.Placeable measure(androidx.ui.core.Measurable, androidx.ui.core.Constraints constraints);
+  }
+
+  public static interface MeasureScope.MeasureResult {
+    method public java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> getAlignmentLines();
+    method public int getHeight();
+    method public int getWidth();
+    method public void placeChildren(androidx.ui.core.LayoutDirection layoutDirection);
+    property public abstract java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines;
+    property public abstract int height;
+    property public abstract int width;
+  }
+
+  public final class MeasureScopeKt {
+  }
+
+  public final class Measured {
+    ctor public Measured(internal androidx.ui.core.Placeable placeable);
+    method public operator androidx.ui.unit.IntPx? get(androidx.ui.core.AlignmentLine alignmentLine);
+    method public int getHeight();
+    method public int getWidth();
+    property public final int height;
+    property public final int width;
+  }
+
+  public interface Modifier {
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public default operator androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+    field public static final androidx.ui.core.Modifier.Companion! Companion;
+  }
+
+  public static final class Modifier.Companion implements androidx.ui.core.Modifier {
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method @Deprecated public androidx.ui.core.Modifier getNone();
+    property @Deprecated public final androidx.ui.core.Modifier None;
+  }
+
+  public static interface Modifier.Element extends androidx.ui.core.Modifier {
+    method public default <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public default <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public interface OnChildPositionedModifier extends androidx.ui.core.Modifier.Element {
+    method public void onChildPositioned(androidx.ui.core.LayoutCoordinates coordinates);
+  }
+
+  public interface OnPositionedModifier extends androidx.ui.core.Modifier.Element {
+    method public void onPositioned(androidx.ui.core.LayoutCoordinates coordinates);
+  }
+
+  public final class OnPositionedModifierKt {
+    method public static androidx.ui.core.Modifier onChildPositioned(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onChildPositioned);
+    method @Deprecated public static androidx.ui.core.Modifier onChildPositioned(kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onChildPositioned);
+    method public static androidx.ui.core.Modifier onPositioned(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onPositioned);
+    method @Deprecated public static androidx.ui.core.Modifier onPositioned(kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onPositioned);
+  }
+
+  public interface ParentDataModifier extends androidx.ui.core.Modifier.Element {
+    method public default Object? modifyParentData(androidx.ui.unit.Density, Object? parentData);
+  }
+
+  public abstract class Placeable {
+    ctor public Placeable();
+    method public abstract operator androidx.ui.unit.IntPx? get(androidx.ui.core.AlignmentLine line);
+    method protected final androidx.ui.unit.IntPxPosition getApparentToRealOffset();
+    method public final int getHeight();
+    method protected abstract androidx.ui.unit.IntPxSize getMeasuredSize();
+    method protected abstract androidx.ui.core.Constraints getMeasurementConstraints();
+    method public final int getWidth();
+    method protected abstract void place(androidx.ui.unit.IntPxPosition position);
+    property protected final androidx.ui.unit.IntPxPosition apparentToRealOffset;
+    property public final int height;
+    property protected abstract androidx.ui.unit.IntPxSize measuredSize;
+    property protected abstract androidx.ui.core.Constraints measurementConstraints;
+    property public final int width;
+  }
+
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method public abstract androidx.ui.core.LayoutDirection getParentLayoutDirection();
+    method public abstract int getParentWidth();
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    property public abstract androidx.ui.core.LayoutDirection parentLayoutDirection;
+    property public abstract int parentWidth;
+  }
+
+  public enum PointerEventPass {
+    enum_constant public static final androidx.ui.core.PointerEventPass InitialDown;
+    enum_constant public static final androidx.ui.core.PointerEventPass PostDown;
+    enum_constant public static final androidx.ui.core.PointerEventPass PostUp;
+    enum_constant public static final androidx.ui.core.PointerEventPass PreDown;
+    enum_constant public static final androidx.ui.core.PointerEventPass PreUp;
+  }
+
+  public final inline class PointerId {
+    ctor public PointerId();
+    method public static long constructor-impl(long value);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getValue();
+    method public static int hashCode-impl(long p);
+    method public static String toString-impl(long p);
+  }
+
+  public final class PointerInputChange {
+    method public long component1();
+    method public androidx.ui.core.PointerInputData component2();
+    method public androidx.ui.core.PointerInputData component3();
+    method public androidx.ui.core.ConsumedData component4();
+    method public androidx.ui.core.PointerInputChange copy-jh1A5Og(long id, androidx.ui.core.PointerInputData current, androidx.ui.core.PointerInputData previous, androidx.ui.core.ConsumedData consumed);
+    method public androidx.ui.core.ConsumedData getConsumed();
+    method public androidx.ui.core.PointerInputData getCurrent();
+    method public long getId();
+    method public androidx.ui.core.PointerInputData getPrevious();
+  }
+
+  public final class PointerInputData {
+    ctor public PointerInputData(androidx.ui.unit.Uptime? uptime, androidx.ui.unit.PxPosition? position, boolean down);
+    ctor public PointerInputData();
+    method public androidx.ui.unit.Uptime? component1();
+    method public androidx.ui.unit.PxPosition? component2();
+    method public boolean component3();
+    method public androidx.ui.core.PointerInputData copy(androidx.ui.unit.Uptime? uptime, androidx.ui.unit.PxPosition? position, boolean down);
+    method public boolean getDown();
+    method public androidx.ui.unit.PxPosition? getPosition();
+    method public androidx.ui.unit.Uptime? getUptime();
+  }
+
+  public final class PointerInputKt {
+    method public static boolean anyPositionChangeConsumed(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToDown(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToDownIgnoreConsumed(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToUp(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToUpIgnoreConsumed(androidx.ui.core.PointerInputChange);
+    method public static androidx.ui.core.PointerInputChange consumeDownChange(androidx.ui.core.PointerInputChange);
+    method public static androidx.ui.core.PointerInputChange consumePositionChange-3EnrK0w(androidx.ui.core.PointerInputChange, float consumedDx, float consumedDy);
+    method public static androidx.ui.unit.PxPosition positionChange(androidx.ui.core.PointerInputChange);
+    method public static androidx.ui.unit.PxPosition positionChangeIgnoreConsumed(androidx.ui.core.PointerInputChange);
+    method public static boolean positionChanged(androidx.ui.core.PointerInputChange);
+    method public static boolean positionChangedIgnoreConsumed(androidx.ui.core.PointerInputChange);
+  }
+
+  public final class Ref<T> {
+    ctor public Ref();
+    method public T? getValue();
+    method public void setValue(T? p);
+    property public final T? value;
+  }
+
+  @Deprecated public interface ScaleFit extends androidx.ui.core.ContentScale {
+    field @Deprecated public static final androidx.ui.core.ScaleFit.Companion! Companion;
+  }
+
+  @Deprecated public static final class ScaleFit.Companion {
+    method @Deprecated public androidx.ui.core.ContentScale getFillHeight();
+    method @Deprecated public androidx.ui.core.ContentScale getFillMaxDimension();
+    method @Deprecated public androidx.ui.core.ContentScale getFillMinDimension();
+    method @Deprecated public androidx.ui.core.ContentScale getFillWidth();
+    method @Deprecated public androidx.ui.core.ContentScale getFit();
+    method @Deprecated public androidx.ui.core.FixedScale getNone();
+    property @Deprecated public final androidx.ui.core.ContentScale FillHeight;
+    property @Deprecated public final androidx.ui.core.ContentScale FillMaxDimension;
+    property @Deprecated public final androidx.ui.core.ContentScale FillMinDimension;
+    property @Deprecated public final androidx.ui.core.ContentScale FillWidth;
+    property @Deprecated public final androidx.ui.core.ContentScale Fit;
+    property @Deprecated public final androidx.ui.core.FixedScale None;
+  }
+
+  public final inline class TransformOrigin {
+    ctor public TransformOrigin();
+    method public static long constructor-impl(internal long value);
+    method public static 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 public static int hashCode-impl(long p);
+    method public static String toString-impl(long p);
+    field public static final androidx.ui.core.TransformOrigin.Companion! Companion;
+  }
+
+  public static final class TransformOrigin.Companion {
+    method public long getCenter();
+    property public final long Center;
+  }
+
+  public final class VerticalAlignmentLine extends androidx.ui.core.AlignmentLine {
+    ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
+  }
+
+  public interface ZIndexModifier extends androidx.ui.core.Modifier.Element {
+    method public float getZIndex();
+    property public abstract float zIndex;
+  }
+
+  public final class ZIndexModifierKt {
+    method public static androidx.ui.core.Modifier zIndex(androidx.ui.core.Modifier, float zIndex);
+  }
+
+}
+
+package androidx.ui.focus {
+
+  public enum FocusDetailedState {
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Active;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState ActiveParent;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Captured;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Disabled;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Inactive;
+  }
+
+  public interface FocusModifier extends androidx.ui.core.Modifier.Element {
+    method public boolean captureFocus();
+    method public boolean freeFocus();
+    method public androidx.ui.focus.FocusDetailedState getFocusDetailedState();
+    method public void requestFocus();
+    property public abstract androidx.ui.focus.FocusDetailedState focusDetailedState;
+  }
+
+  public enum FocusState {
+    enum_constant public static final androidx.ui.focus.FocusState Focused;
+    enum_constant public static final androidx.ui.focus.FocusState NotFocusable;
+    enum_constant public static final androidx.ui.focus.FocusState NotFocused;
+  }
+
+  public final class FocusStateKt {
+    method public static androidx.ui.focus.FocusState focusState(androidx.ui.focus.FocusDetailedState);
+  }
+
+}
+
+package androidx.ui.semantics {
+
+  public final class AccessibilityAction<T extends kotlin.Function<? extends kotlin.Unit>> {
+    ctor public AccessibilityAction(String? label, T action);
+    method public String? component1();
+    method public T component2();
+    method public androidx.ui.semantics.AccessibilityAction<T> copy(String? label, T action);
+    method public T getAction();
+    method public String? getLabel();
+  }
+
+  public final class AccessibilityRangeInfo {
+    ctor public AccessibilityRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range);
+    method public float component1();
+    method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> component2();
+    method public androidx.ui.semantics.AccessibilityRangeInfo copy(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range);
+    method public float getCurrent();
+    method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> getRange();
+  }
+
+  public final class SemanticsActions {
+    ctor public SemanticsActions();
+    field public static final androidx.ui.semantics.SemanticsActions.Companion! Companion;
+  }
+
+  public static final class SemanticsActions.Companion {
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>>> getCustomActions();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> getOnClick();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>>> getScrollTo();
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>>> CustomActions;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> OnClick;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>>> ScrollTo;
+  }
+
+  public final class SemanticsProperties {
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getAccessibilityLabel();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> getAccessibilityRangeInfo();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getAccessibilityValue();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getEnabled();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getHidden();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Enabled;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Hidden;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
+    field public static final androidx.ui.semantics.SemanticsProperties! INSTANCE;
+  }
+
+  public class SemanticsPropertyKey<T> implements kotlin.properties.ReadWriteProperty<androidx.ui.semantics.SemanticsPropertyReceiver,T> {
+    ctor public SemanticsPropertyKey(String name);
+    method public final String getName();
+    method public final T! getValue(androidx.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property);
+    method public T! merge(T? existingValue, T? newValue);
+    method public final void setValue(androidx.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property, T? value);
+  }
+
+  public interface SemanticsPropertyReceiver {
+    method public operator <T> void set(androidx.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+  }
+
+}
+
+package androidx.ui.testutils {
+
+  public final class PointerInputTestUtilKt {
+    method public static androidx.ui.core.PointerInputChange consume(androidx.ui.core.PointerInputChange, float dx = 0f, float dy = 0f, boolean downChange = false);
+    method public static androidx.ui.core.PointerInputChange down(long id, androidx.ui.unit.Duration duration = Duration.Zero, float x = 0f, float y = 0f);
+    method public static androidx.ui.core.PointerInputChange invokeOverAllPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange pointerInputChanges, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static java.util.List<androidx.ui.core.PointerInputChange> invokeOverAllPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange![] pointerInputChanges, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static void invokeOverAllPasses(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>, androidx.ui.core.CustomEvent event);
+    method public static androidx.ui.core.PointerInputChange invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange pointerInputChange, androidx.ui.core.PointerEventPass pointerEventPass, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static java.util.List<androidx.ui.core.PointerInputChange> invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange![] pointerInputChanges, androidx.ui.core.PointerEventPass pointerEventPass, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static androidx.ui.core.PointerInputChange invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange pointerInputChange, androidx.ui.core.PointerEventPass![] pointerEventPasses, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static java.util.List<androidx.ui.core.PointerInputChange> invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, java.util.List<androidx.ui.core.PointerInputChange> pointerInputChanges, java.util.List<? extends androidx.ui.core.PointerEventPass> pointerEventPasses, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static void invokeOverPasses(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>, androidx.ui.core.CustomEvent event, java.util.List<? extends androidx.ui.core.PointerEventPass> pointerEventPasses);
+    method public static androidx.ui.core.PointerInputChange moveBy(androidx.ui.core.PointerInputChange, androidx.ui.unit.Duration duration, float dx = 0f, float dy = 0f);
+    method public static androidx.ui.core.PointerInputChange moveTo(androidx.ui.core.PointerInputChange, androidx.ui.unit.Duration duration, float x = 0f, float y = 0f);
+    method public static androidx.ui.core.PointerInputChange up(androidx.ui.core.PointerInputChange, androidx.ui.unit.Duration duration);
+  }
+
+}
+
diff --git a/ui/ui-core/api/public_plus_experimental_current.txt b/ui/ui-core/api/public_plus_experimental_current.txt
index 0405755..da55017 100644
--- a/ui/ui-core/api/public_plus_experimental_current.txt
+++ b/ui/ui-core/api/public_plus_experimental_current.txt
@@ -260,26 +260,26 @@
     method @FloatRange(from=0.0, to=1.0) public default float getAlpha();
     method public default boolean getClipToBounds();
     method public default boolean getClipToOutline();
-    method @FloatRange(from=0.0) public default float getElevation();
     method public default androidx.ui.graphics.Shape? getOutlineShape();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationX();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationY();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationZ();
     method public default float getScaleX();
     method public default float getScaleY();
+    method @FloatRange(from=0.0) public default float getShadowElevation();
     method public default long getTransformOrigin();
     method public default float getTranslationX();
     method public default float getTranslationY();
     property @FloatRange(from=0.0, to=1.0) public default float alpha;
     property public default boolean clipToBounds;
     property public default boolean clipToOutline;
-    property @FloatRange(from=0.0) public default float elevation;
     property public default androidx.ui.graphics.Shape? outlineShape;
     property @FloatRange(from=0.0, to=360.0) public default float rotationX;
     property @FloatRange(from=0.0, to=360.0) public default float rotationY;
     property @FloatRange(from=0.0, to=360.0) public default float rotationZ;
     property public default float scaleX;
     property public default float scaleY;
+    property @FloatRange(from=0.0) public default float shadowElevation;
     property public default long transformOrigin;
     property public default float translationX;
     property public default float translationY;
@@ -287,7 +287,7 @@
 
   public final class DrawLayerModifierKt {
     method public static inline long TransformOrigin(float pivotFractionX, float pivotFractionY);
-    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float shadowElevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
     method @Deprecated public static androidx.ui.core.Modifier drawLayer-ebHciuY(float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
   }
 
@@ -323,16 +323,26 @@
 
   public interface IntrinsicMeasurable {
     method public Object? getParentData();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     property public abstract Object? parentData;
   }
 
   public final class IntrinsicMeasurableKt {
   }
 
+  public abstract class IntrinsicMeasureScope implements androidx.ui.unit.Density {
+    ctor public IntrinsicMeasureScope();
+    method public abstract androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public final int maxIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int maxIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    method public final int minIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int minIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+  }
+
   public interface LayoutCoordinates {
     method public androidx.ui.unit.PxBounds childBoundingBox(androidx.ui.core.LayoutCoordinates child);
     method public androidx.ui.unit.PxPosition childToLocal(androidx.ui.core.LayoutCoordinates child, androidx.ui.unit.PxPosition childLocal);
@@ -377,20 +387,21 @@
   }
 
   public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
-    method public default int maxIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int maxIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public interface Measurable extends androidx.ui.core.IntrinsicMeasurable {
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
-  public abstract class MeasureScope implements androidx.ui.unit.Density {
+  public abstract class MeasureScope extends androidx.ui.core.IntrinsicMeasureScope {
     ctor public MeasureScope();
     method public final androidx.ui.core.MeasureScope.MeasureResult layout-Ocy6_kE(int width, int height, java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines = emptyMap(), kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+    method public final androidx.ui.core.Placeable measure(androidx.ui.core.Measurable, androidx.ui.core.Constraints constraints);
   }
 
   public static interface MeasureScope.MeasureResult {
@@ -467,18 +478,22 @@
     property protected abstract androidx.ui.unit.IntPxSize measuredSize;
     property protected abstract androidx.ui.core.Constraints measurementConstraints;
     property public final int width;
-    field public static final androidx.ui.core.Placeable.PlacementScope! PlacementScope;
   }
 
-  public static final class Placeable.PlacementScope {
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method public abstract androidx.ui.core.LayoutDirection getParentLayoutDirection();
+    method public abstract int getParentWidth();
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    property public abstract androidx.ui.core.LayoutDirection parentLayoutDirection;
+    property public abstract int parentWidth;
   }
 
   public enum PointerEventPass {
@@ -584,6 +599,15 @@
     ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
   }
 
+  public interface ZIndexModifier extends androidx.ui.core.Modifier.Element {
+    method public float getZIndex();
+    property public abstract float zIndex;
+  }
+
+  public final class ZIndexModifierKt {
+    method public static androidx.ui.core.Modifier zIndex(androidx.ui.core.Modifier, float zIndex);
+  }
+
 }
 
 package androidx.ui.focus {
diff --git a/ui/ui-core/api/res-0.1.0-dev11.txt b/ui/ui-core/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-core/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-core/api/restricted_0.1.0-dev10.txt b/ui/ui-core/api/restricted_0.1.0-dev10.txt
index 0405755..da55017 100644
--- a/ui/ui-core/api/restricted_0.1.0-dev10.txt
+++ b/ui/ui-core/api/restricted_0.1.0-dev10.txt
@@ -260,26 +260,26 @@
     method @FloatRange(from=0.0, to=1.0) public default float getAlpha();
     method public default boolean getClipToBounds();
     method public default boolean getClipToOutline();
-    method @FloatRange(from=0.0) public default float getElevation();
     method public default androidx.ui.graphics.Shape? getOutlineShape();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationX();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationY();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationZ();
     method public default float getScaleX();
     method public default float getScaleY();
+    method @FloatRange(from=0.0) public default float getShadowElevation();
     method public default long getTransformOrigin();
     method public default float getTranslationX();
     method public default float getTranslationY();
     property @FloatRange(from=0.0, to=1.0) public default float alpha;
     property public default boolean clipToBounds;
     property public default boolean clipToOutline;
-    property @FloatRange(from=0.0) public default float elevation;
     property public default androidx.ui.graphics.Shape? outlineShape;
     property @FloatRange(from=0.0, to=360.0) public default float rotationX;
     property @FloatRange(from=0.0, to=360.0) public default float rotationY;
     property @FloatRange(from=0.0, to=360.0) public default float rotationZ;
     property public default float scaleX;
     property public default float scaleY;
+    property @FloatRange(from=0.0) public default float shadowElevation;
     property public default long transformOrigin;
     property public default float translationX;
     property public default float translationY;
@@ -287,7 +287,7 @@
 
   public final class DrawLayerModifierKt {
     method public static inline long TransformOrigin(float pivotFractionX, float pivotFractionY);
-    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float shadowElevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
     method @Deprecated public static androidx.ui.core.Modifier drawLayer-ebHciuY(float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
   }
 
@@ -323,16 +323,26 @@
 
   public interface IntrinsicMeasurable {
     method public Object? getParentData();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     property public abstract Object? parentData;
   }
 
   public final class IntrinsicMeasurableKt {
   }
 
+  public abstract class IntrinsicMeasureScope implements androidx.ui.unit.Density {
+    ctor public IntrinsicMeasureScope();
+    method public abstract androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public final int maxIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int maxIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    method public final int minIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int minIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+  }
+
   public interface LayoutCoordinates {
     method public androidx.ui.unit.PxBounds childBoundingBox(androidx.ui.core.LayoutCoordinates child);
     method public androidx.ui.unit.PxPosition childToLocal(androidx.ui.core.LayoutCoordinates child, androidx.ui.unit.PxPosition childLocal);
@@ -377,20 +387,21 @@
   }
 
   public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
-    method public default int maxIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int maxIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public interface Measurable extends androidx.ui.core.IntrinsicMeasurable {
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
-  public abstract class MeasureScope implements androidx.ui.unit.Density {
+  public abstract class MeasureScope extends androidx.ui.core.IntrinsicMeasureScope {
     ctor public MeasureScope();
     method public final androidx.ui.core.MeasureScope.MeasureResult layout-Ocy6_kE(int width, int height, java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines = emptyMap(), kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+    method public final androidx.ui.core.Placeable measure(androidx.ui.core.Measurable, androidx.ui.core.Constraints constraints);
   }
 
   public static interface MeasureScope.MeasureResult {
@@ -467,18 +478,22 @@
     property protected abstract androidx.ui.unit.IntPxSize measuredSize;
     property protected abstract androidx.ui.core.Constraints measurementConstraints;
     property public final int width;
-    field public static final androidx.ui.core.Placeable.PlacementScope! PlacementScope;
   }
 
-  public static final class Placeable.PlacementScope {
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method public abstract androidx.ui.core.LayoutDirection getParentLayoutDirection();
+    method public abstract int getParentWidth();
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    property public abstract androidx.ui.core.LayoutDirection parentLayoutDirection;
+    property public abstract int parentWidth;
   }
 
   public enum PointerEventPass {
@@ -584,6 +599,15 @@
     ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
   }
 
+  public interface ZIndexModifier extends androidx.ui.core.Modifier.Element {
+    method public float getZIndex();
+    property public abstract float zIndex;
+  }
+
+  public final class ZIndexModifierKt {
+    method public static androidx.ui.core.Modifier zIndex(androidx.ui.core.Modifier, float zIndex);
+  }
+
 }
 
 package androidx.ui.focus {
diff --git a/ui/ui-core/api/restricted_0.1.0-dev11.txt b/ui/ui-core/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..da55017
--- /dev/null
+++ b/ui/ui-core/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,726 @@
+// Signature format: 3.0
+package androidx.ui.autofill {
+
+  public interface Autofill {
+    method public void cancelAutofillForNode(androidx.ui.autofill.AutofillNode autofillNode);
+    method public void requestAutofillForNode(androidx.ui.autofill.AutofillNode autofillNode);
+  }
+
+  public final class AutofillNode {
+    ctor public AutofillNode(java.util.List<? extends androidx.ui.autofill.AutofillType> autofillTypes, android.graphics.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
+    method public java.util.List<androidx.ui.autofill.AutofillType> component1();
+    method public android.graphics.Rect? component2();
+    method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? component3();
+    method public androidx.ui.autofill.AutofillNode copy(java.util.List<? extends androidx.ui.autofill.AutofillType> autofillTypes, android.graphics.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
+    method public java.util.List<androidx.ui.autofill.AutofillType> getAutofillTypes();
+    method public android.graphics.Rect? getBoundingBox();
+    method public int getId();
+    method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? getOnFill();
+    method public void setBoundingBox(android.graphics.Rect? p);
+    property public final int id;
+  }
+
+  public final class AutofillTree {
+    ctor public AutofillTree();
+    method public java.util.Map<java.lang.Integer,androidx.ui.autofill.AutofillNode> getChildren();
+    method public kotlin.Unit? performAutofill(int id, String value);
+    method public operator void plusAssign(androidx.ui.autofill.AutofillNode autofillNode);
+    property public final java.util.Map<java.lang.Integer,androidx.ui.autofill.AutofillNode> children;
+  }
+
+  public enum AutofillType {
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressAuxiliaryDetails;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressCountry;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressLocality;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressRegion;
+    enum_constant public static final androidx.ui.autofill.AutofillType AddressStreet;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateDay;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateFull;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateMonth;
+    enum_constant public static final androidx.ui.autofill.AutofillType BirthDateYear;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationDate;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationDay;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationMonth;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardExpirationYear;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardNumber;
+    enum_constant public static final androidx.ui.autofill.AutofillType CreditCardSecurityCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType EmailAddress;
+    enum_constant public static final androidx.ui.autofill.AutofillType Gender;
+    enum_constant @Deprecated public static final androidx.ui.autofill.AutofillType Name;
+    enum_constant public static final androidx.ui.autofill.AutofillType NewPassword;
+    enum_constant public static final androidx.ui.autofill.AutofillType NewUsername;
+    enum_constant public static final androidx.ui.autofill.AutofillType Password;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonFirstName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonFullName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonLastName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonMiddleInitial;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonMiddleName;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonNamePrefix;
+    enum_constant public static final androidx.ui.autofill.AutofillType PersonNameSuffix;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneCountryCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneNumber;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneNumberDevice;
+    enum_constant public static final androidx.ui.autofill.AutofillType PhoneNumberNational;
+    enum_constant public static final androidx.ui.autofill.AutofillType PostalAddress;
+    enum_constant public static final androidx.ui.autofill.AutofillType PostalCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType PostalCodeExtended;
+    enum_constant public static final androidx.ui.autofill.AutofillType SmsOtpCode;
+    enum_constant public static final androidx.ui.autofill.AutofillType Username;
+  }
+
+}
+
+package androidx.ui.core {
+
+  public final class Alignment {
+    ctor public Alignment(float verticalBias, float horizontalBias);
+    method public androidx.ui.unit.IntPxPosition align(androidx.ui.unit.IntPxSize size, androidx.ui.core.LayoutDirection layoutDirection = androidx.ui.core.LayoutDirection.Ltr);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.core.Alignment copy(float verticalBias, float horizontalBias);
+    method public float getHorizontalBias();
+    method public float getVerticalBias();
+    field public static final androidx.ui.core.Alignment.Companion! Companion;
+  }
+
+  public static final class Alignment.Companion {
+    method public androidx.ui.core.Alignment.Vertical getBottom();
+    method public androidx.ui.core.Alignment getBottomCenter();
+    method public androidx.ui.core.Alignment getBottomEnd();
+    method public androidx.ui.core.Alignment getBottomStart();
+    method public androidx.ui.core.Alignment getCenter();
+    method public androidx.ui.core.Alignment getCenterEnd();
+    method public androidx.ui.core.Alignment.Horizontal getCenterHorizontally();
+    method public androidx.ui.core.Alignment getCenterStart();
+    method public androidx.ui.core.Alignment.Vertical getCenterVertically();
+    method public androidx.ui.core.Alignment.Horizontal getEnd();
+    method public androidx.ui.core.Alignment.Horizontal getStart();
+    method public androidx.ui.core.Alignment.Vertical getTop();
+    method public androidx.ui.core.Alignment getTopCenter();
+    method public androidx.ui.core.Alignment getTopEnd();
+    method public androidx.ui.core.Alignment getTopStart();
+    property public final androidx.ui.core.Alignment.Vertical Bottom;
+    property public final androidx.ui.core.Alignment BottomCenter;
+    property public final androidx.ui.core.Alignment BottomEnd;
+    property public final androidx.ui.core.Alignment BottomStart;
+    property public final androidx.ui.core.Alignment Center;
+    property public final androidx.ui.core.Alignment CenterEnd;
+    property public final androidx.ui.core.Alignment.Horizontal CenterHorizontally;
+    property public final androidx.ui.core.Alignment CenterStart;
+    property public final androidx.ui.core.Alignment.Vertical CenterVertically;
+    property public final androidx.ui.core.Alignment.Horizontal End;
+    property public final androidx.ui.core.Alignment.Horizontal Start;
+    property public final androidx.ui.core.Alignment.Vertical Top;
+    property public final androidx.ui.core.Alignment TopCenter;
+    property public final androidx.ui.core.Alignment TopEnd;
+    property public final androidx.ui.core.Alignment TopStart;
+  }
+
+  public static final class Alignment.Horizontal {
+    ctor public Alignment.Horizontal(float bias);
+    method public int align-Ujlv2dA(int size, androidx.ui.core.LayoutDirection layoutDirection = androidx.ui.core.LayoutDirection.Ltr);
+    method public float component1();
+    method public androidx.ui.core.Alignment.Horizontal copy(float bias);
+    method public float getBias();
+  }
+
+  public static final class Alignment.Vertical {
+    ctor public Alignment.Vertical(float bias);
+    method public int align-gshw56o(int size);
+    method public float component1();
+    method public androidx.ui.core.Alignment.Vertical copy(float bias);
+    method public float getBias();
+  }
+
+  public abstract sealed class AlignmentLine {
+  }
+
+  public final class AlignmentLineKt {
+    method public static int merge-CBRbNzc(androidx.ui.core.AlignmentLine, int position1, int position2);
+  }
+
+  public final class Constraints {
+    method public int component1();
+    method public int component2();
+    method public int component3();
+    method public int component4();
+    method public androidx.ui.core.Constraints copy-Q13GOEE(int minWidth, int maxWidth, int minHeight, int maxHeight);
+    method public int getMaxHeight();
+    method public int getMaxWidth();
+    method public int getMinHeight();
+    method public int getMinWidth();
+    field public static final androidx.ui.core.Constraints.Companion! Companion;
+  }
+
+  public static final class Constraints.Companion {
+    method public androidx.ui.core.Constraints fixed-rRMsBxU(int width, int height);
+    method public androidx.ui.core.Constraints fixedHeight-gshw56o(int height);
+    method public androidx.ui.core.Constraints fixedWidth-gshw56o(int width);
+  }
+
+  public final inline class Constraints2 {
+    ctor public Constraints2();
+    method public static long constructor-impl(internal long value);
+    method public static long copy-impl(long $this, int minWidth = this.minWidth, int maxWidth = this.maxWidth, int minHeight = this.minHeight, int maxHeight = this.maxHeight);
+    method public static 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 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 public static int hashCode-impl(long p);
+    method public static String toString-impl(long p);
+    field public static final androidx.ui.core.Constraints2.Companion! Companion;
+    field public static final int Infinity = -1073741824; // 0xc0000000
+  }
+
+  public static final class Constraints2.Companion {
+    method public long fixed(int width, int height);
+    method public long fixedHeight(int height);
+    method public long fixedWidth(int width);
+  }
+
+  public final class Constraints2Kt {
+    method public static long Constraints2(@IntRange(from=0) int minWidth = 0, int maxWidth = -1073741824, @IntRange(from=0) int minHeight = 0, int maxHeight = -1073741824);
+    method public static long constrain-M1ogGms(long, long size);
+    method public static long enforce-uQjoOwo(long, long otherConstraints);
+    method public static boolean getHasFixedHeight-ybNdgAI(long);
+    method public static boolean getHasFixedWidth-ybNdgAI(long);
+    method public static boolean isZero-ybNdgAI(long);
+    method public static long offset-xOKVbDg(long, int horizontal = 0, int vertical = 0);
+    method public static boolean satisfiedBy-M1ogGms(long, long size);
+  }
+
+  public final class ConstraintsKt {
+    method public static androidx.ui.unit.IntPxSize constrain(androidx.ui.core.Constraints, androidx.ui.unit.IntPxSize size);
+    method public static androidx.ui.core.Constraints enforce(androidx.ui.core.Constraints, androidx.ui.core.Constraints otherConstraints);
+    method public static boolean getHasBoundedHeight(androidx.ui.core.Constraints);
+    method public static boolean getHasBoundedWidth(androidx.ui.core.Constraints);
+    method public static boolean getHasFixedHeight(androidx.ui.core.Constraints);
+    method public static boolean getHasFixedWidth(androidx.ui.core.Constraints);
+    method public static boolean isZero(androidx.ui.core.Constraints);
+    method public static androidx.ui.core.Constraints offset-3L2DHGc(androidx.ui.core.Constraints, int horizontal = 0.ipx, int vertical = 0.ipx);
+    method public static boolean satisfiedBy(androidx.ui.core.Constraints, androidx.ui.unit.IntPxSize size);
+  }
+
+  public final class ConsumedData {
+    ctor public ConsumedData(androidx.ui.unit.PxPosition positionChange, boolean downChange);
+    ctor public ConsumedData();
+    method public androidx.ui.unit.PxPosition component1();
+    method public boolean component2();
+    method public androidx.ui.core.ConsumedData copy(androidx.ui.unit.PxPosition positionChange, boolean downChange);
+    method public boolean getDownChange();
+    method public androidx.ui.unit.PxPosition getPositionChange();
+  }
+
+  public interface ContentDrawScope extends androidx.ui.core.DrawScope {
+    method public void drawContent();
+  }
+
+  public interface ContentScale {
+    method public float scale(androidx.ui.unit.PxSize srcSize, androidx.ui.unit.PxSize dstSize);
+    field public static final androidx.ui.core.ContentScale.Companion! Companion;
+  }
+
+  public static final class ContentScale.Companion {
+    method public androidx.ui.core.ContentScale getCrop();
+    method public androidx.ui.core.ContentScale getFillHeight();
+    method public androidx.ui.core.ContentScale getFillWidth();
+    method public androidx.ui.core.ContentScale getFit();
+    method public androidx.ui.core.ContentScale getInside();
+    method public androidx.ui.core.FixedScale getNone();
+    property public final androidx.ui.core.ContentScale Crop;
+    property public final androidx.ui.core.ContentScale FillHeight;
+    property public final androidx.ui.core.ContentScale FillWidth;
+    property public final androidx.ui.core.ContentScale Fit;
+    property public final androidx.ui.core.ContentScale Inside;
+    property public final androidx.ui.core.FixedScale None;
+  }
+
+  public final class ContentScaleKt {
+  }
+
+  public interface CustomEvent {
+  }
+
+  public interface CustomEventDispatcher {
+    method public void dispatchCustomEvent(androidx.ui.core.CustomEvent event);
+  }
+
+  public enum Direction {
+    enum_constant public static final androidx.ui.core.Direction DOWN;
+    enum_constant public static final androidx.ui.core.Direction LEFT;
+    enum_constant public static final androidx.ui.core.Direction RIGHT;
+    enum_constant public static final androidx.ui.core.Direction UP;
+  }
+
+  public interface DrawLayerModifier extends androidx.ui.core.Modifier.Element {
+    method @FloatRange(from=0.0, to=1.0) public default float getAlpha();
+    method public default boolean getClipToBounds();
+    method public default boolean getClipToOutline();
+    method public default androidx.ui.graphics.Shape? getOutlineShape();
+    method @FloatRange(from=0.0, to=360.0) public default float getRotationX();
+    method @FloatRange(from=0.0, to=360.0) public default float getRotationY();
+    method @FloatRange(from=0.0, to=360.0) public default float getRotationZ();
+    method public default float getScaleX();
+    method public default float getScaleY();
+    method @FloatRange(from=0.0) public default float getShadowElevation();
+    method public default long getTransformOrigin();
+    method public default float getTranslationX();
+    method public default float getTranslationY();
+    property @FloatRange(from=0.0, to=1.0) public default float alpha;
+    property public default boolean clipToBounds;
+    property public default boolean clipToOutline;
+    property public default androidx.ui.graphics.Shape? outlineShape;
+    property @FloatRange(from=0.0, to=360.0) public default float rotationX;
+    property @FloatRange(from=0.0, to=360.0) public default float rotationY;
+    property @FloatRange(from=0.0, to=360.0) public default float rotationZ;
+    property public default float scaleX;
+    property public default float scaleY;
+    property @FloatRange(from=0.0) public default float shadowElevation;
+    property public default long transformOrigin;
+    property public default float translationX;
+    property public default float translationY;
+  }
+
+  public final class DrawLayerModifierKt {
+    method public static inline long TransformOrigin(float pivotFractionX, float pivotFractionY);
+    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float shadowElevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+    method @Deprecated public static androidx.ui.core.Modifier drawLayer-ebHciuY(float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+  }
+
+  public interface DrawModifier extends androidx.ui.core.Modifier.Element {
+    method public void draw(androidx.ui.core.ContentDrawScope);
+  }
+
+  public final class DrawModifierKt {
+    method @Deprecated public static androidx.ui.core.DrawModifier draw(kotlin.jvm.functions.Function1<? super androidx.ui.core.DrawScope,kotlin.Unit> onDraw);
+    method public static androidx.ui.core.Modifier drawBehind(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.DrawScope,kotlin.Unit> onDraw);
+    method public static androidx.ui.core.Modifier drawWithContent(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.ContentDrawScope,kotlin.Unit> onDraw);
+    method @Deprecated public static androidx.ui.core.DrawModifier drawWithContent(kotlin.jvm.functions.Function1<? super androidx.ui.core.ContentDrawScope,kotlin.Unit> onDraw);
+  }
+
+  public interface DrawScope extends androidx.ui.graphics.Canvas androidx.ui.unit.Density {
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public androidx.ui.unit.PxSize getSize();
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+    property public abstract androidx.ui.unit.PxSize size;
+  }
+
+  public final class FixedScale implements androidx.ui.core.ContentScale {
+    ctor public FixedScale(float value);
+    method public float component1();
+    method public androidx.ui.core.FixedScale copy(float value);
+    method public float getValue();
+    method public float scale(androidx.ui.unit.PxSize srcSize, androidx.ui.unit.PxSize dstSize);
+  }
+
+  public final class HorizontalAlignmentLine extends androidx.ui.core.AlignmentLine {
+    ctor public HorizontalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
+  }
+
+  public interface IntrinsicMeasurable {
+    method public Object? getParentData();
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    property public abstract Object? parentData;
+  }
+
+  public final class IntrinsicMeasurableKt {
+  }
+
+  public abstract class IntrinsicMeasureScope implements androidx.ui.unit.Density {
+    ctor public IntrinsicMeasureScope();
+    method public abstract androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public final int maxIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int maxIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    method public final int minIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int minIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+  }
+
+  public interface LayoutCoordinates {
+    method public androidx.ui.unit.PxBounds childBoundingBox(androidx.ui.core.LayoutCoordinates child);
+    method public androidx.ui.unit.PxPosition childToLocal(androidx.ui.core.LayoutCoordinates child, androidx.ui.unit.PxPosition childLocal);
+    method public operator androidx.ui.unit.IntPx? get(androidx.ui.core.AlignmentLine line);
+    method public androidx.ui.core.LayoutCoordinates? getParentCoordinates();
+    method public java.util.Set<androidx.ui.core.AlignmentLine> getProvidedAlignmentLines();
+    method public androidx.ui.unit.IntPxSize getSize();
+    method public androidx.ui.unit.PxPosition globalToLocal(androidx.ui.unit.PxPosition global);
+    method public boolean isAttached();
+    method public androidx.ui.unit.PxPosition localToGlobal(androidx.ui.unit.PxPosition local);
+    method public androidx.ui.unit.PxPosition localToRoot(androidx.ui.unit.PxPosition local);
+    property public abstract boolean isAttached;
+    property public abstract androidx.ui.core.LayoutCoordinates? parentCoordinates;
+    property public abstract java.util.Set<androidx.ui.core.AlignmentLine> providedAlignmentLines;
+    property public abstract androidx.ui.unit.IntPxSize size;
+  }
+
+  public final class LayoutCoordinatesKt {
+    method public static androidx.ui.unit.PxBounds getBoundsInParent(androidx.ui.core.LayoutCoordinates);
+    method public static androidx.ui.unit.PxBounds getBoundsInRoot(androidx.ui.core.LayoutCoordinates);
+    method public static androidx.ui.unit.PxBounds getGlobalBounds(androidx.ui.core.LayoutCoordinates);
+    method public static inline androidx.ui.unit.PxPosition getGlobalPosition(androidx.ui.core.LayoutCoordinates);
+    method public static androidx.ui.unit.PxPosition getPositionInParent(androidx.ui.core.LayoutCoordinates);
+    method public static inline androidx.ui.unit.PxPosition getPositionInRoot(androidx.ui.core.LayoutCoordinates);
+  }
+
+  public enum LayoutDirection {
+    enum_constant public static final androidx.ui.core.LayoutDirection Ltr;
+    enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
+  }
+
+  @Deprecated public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
+    method @Deprecated public default int maxIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default int maxIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default int minIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default int minIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method @Deprecated public default androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+  }
+
+  public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
+    method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public interface Measurable extends androidx.ui.core.IntrinsicMeasurable {
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public abstract class MeasureScope extends androidx.ui.core.IntrinsicMeasureScope {
+    ctor public MeasureScope();
+    method public final androidx.ui.core.MeasureScope.MeasureResult layout-Ocy6_kE(int width, int height, java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines = emptyMap(), kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+    method public final androidx.ui.core.Placeable measure(androidx.ui.core.Measurable, androidx.ui.core.Constraints constraints);
+  }
+
+  public static interface MeasureScope.MeasureResult {
+    method public java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> getAlignmentLines();
+    method public int getHeight();
+    method public int getWidth();
+    method public void placeChildren(androidx.ui.core.LayoutDirection layoutDirection);
+    property public abstract java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines;
+    property public abstract int height;
+    property public abstract int width;
+  }
+
+  public final class MeasureScopeKt {
+  }
+
+  public final class Measured {
+    ctor public Measured(internal androidx.ui.core.Placeable placeable);
+    method public operator androidx.ui.unit.IntPx? get(androidx.ui.core.AlignmentLine alignmentLine);
+    method public int getHeight();
+    method public int getWidth();
+    property public final int height;
+    property public final int width;
+  }
+
+  public interface Modifier {
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public default operator androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+    field public static final androidx.ui.core.Modifier.Companion! Companion;
+  }
+
+  public static final class Modifier.Companion implements androidx.ui.core.Modifier {
+    method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method @Deprecated public androidx.ui.core.Modifier getNone();
+    property @Deprecated public final androidx.ui.core.Modifier None;
+  }
+
+  public static interface Modifier.Element extends androidx.ui.core.Modifier {
+    method public default <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public default <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+  }
+
+  public interface OnChildPositionedModifier extends androidx.ui.core.Modifier.Element {
+    method public void onChildPositioned(androidx.ui.core.LayoutCoordinates coordinates);
+  }
+
+  public interface OnPositionedModifier extends androidx.ui.core.Modifier.Element {
+    method public void onPositioned(androidx.ui.core.LayoutCoordinates coordinates);
+  }
+
+  public final class OnPositionedModifierKt {
+    method public static androidx.ui.core.Modifier onChildPositioned(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onChildPositioned);
+    method @Deprecated public static androidx.ui.core.Modifier onChildPositioned(kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onChildPositioned);
+    method public static androidx.ui.core.Modifier onPositioned(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onPositioned);
+    method @Deprecated public static androidx.ui.core.Modifier onPositioned(kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutCoordinates,kotlin.Unit> onPositioned);
+  }
+
+  public interface ParentDataModifier extends androidx.ui.core.Modifier.Element {
+    method public default Object? modifyParentData(androidx.ui.unit.Density, Object? parentData);
+  }
+
+  public abstract class Placeable {
+    ctor public Placeable();
+    method public abstract operator androidx.ui.unit.IntPx? get(androidx.ui.core.AlignmentLine line);
+    method protected final androidx.ui.unit.IntPxPosition getApparentToRealOffset();
+    method public final int getHeight();
+    method protected abstract androidx.ui.unit.IntPxSize getMeasuredSize();
+    method protected abstract androidx.ui.core.Constraints getMeasurementConstraints();
+    method public final int getWidth();
+    method protected abstract void place(androidx.ui.unit.IntPxPosition position);
+    property protected final androidx.ui.unit.IntPxPosition apparentToRealOffset;
+    property public final int height;
+    property protected abstract androidx.ui.unit.IntPxSize measuredSize;
+    property protected abstract androidx.ui.core.Constraints measurementConstraints;
+    property public final int width;
+  }
+
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method public abstract androidx.ui.core.LayoutDirection getParentLayoutDirection();
+    method public abstract int getParentWidth();
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    property public abstract androidx.ui.core.LayoutDirection parentLayoutDirection;
+    property public abstract int parentWidth;
+  }
+
+  public enum PointerEventPass {
+    enum_constant public static final androidx.ui.core.PointerEventPass InitialDown;
+    enum_constant public static final androidx.ui.core.PointerEventPass PostDown;
+    enum_constant public static final androidx.ui.core.PointerEventPass PostUp;
+    enum_constant public static final androidx.ui.core.PointerEventPass PreDown;
+    enum_constant public static final androidx.ui.core.PointerEventPass PreUp;
+  }
+
+  public final inline class PointerId {
+    ctor public PointerId();
+    method public static long constructor-impl(long value);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getValue();
+    method public static int hashCode-impl(long p);
+    method public static String toString-impl(long p);
+  }
+
+  public final class PointerInputChange {
+    method public long component1();
+    method public androidx.ui.core.PointerInputData component2();
+    method public androidx.ui.core.PointerInputData component3();
+    method public androidx.ui.core.ConsumedData component4();
+    method public androidx.ui.core.PointerInputChange copy-jh1A5Og(long id, androidx.ui.core.PointerInputData current, androidx.ui.core.PointerInputData previous, androidx.ui.core.ConsumedData consumed);
+    method public androidx.ui.core.ConsumedData getConsumed();
+    method public androidx.ui.core.PointerInputData getCurrent();
+    method public long getId();
+    method public androidx.ui.core.PointerInputData getPrevious();
+  }
+
+  public final class PointerInputData {
+    ctor public PointerInputData(androidx.ui.unit.Uptime? uptime, androidx.ui.unit.PxPosition? position, boolean down);
+    ctor public PointerInputData();
+    method public androidx.ui.unit.Uptime? component1();
+    method public androidx.ui.unit.PxPosition? component2();
+    method public boolean component3();
+    method public androidx.ui.core.PointerInputData copy(androidx.ui.unit.Uptime? uptime, androidx.ui.unit.PxPosition? position, boolean down);
+    method public boolean getDown();
+    method public androidx.ui.unit.PxPosition? getPosition();
+    method public androidx.ui.unit.Uptime? getUptime();
+  }
+
+  public final class PointerInputKt {
+    method public static boolean anyPositionChangeConsumed(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToDown(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToDownIgnoreConsumed(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToUp(androidx.ui.core.PointerInputChange);
+    method public static boolean changedToUpIgnoreConsumed(androidx.ui.core.PointerInputChange);
+    method public static androidx.ui.core.PointerInputChange consumeDownChange(androidx.ui.core.PointerInputChange);
+    method public static androidx.ui.core.PointerInputChange consumePositionChange-3EnrK0w(androidx.ui.core.PointerInputChange, float consumedDx, float consumedDy);
+    method public static androidx.ui.unit.PxPosition positionChange(androidx.ui.core.PointerInputChange);
+    method public static androidx.ui.unit.PxPosition positionChangeIgnoreConsumed(androidx.ui.core.PointerInputChange);
+    method public static boolean positionChanged(androidx.ui.core.PointerInputChange);
+    method public static boolean positionChangedIgnoreConsumed(androidx.ui.core.PointerInputChange);
+  }
+
+  public final class Ref<T> {
+    ctor public Ref();
+    method public T? getValue();
+    method public void setValue(T? p);
+    property public final T? value;
+  }
+
+  @Deprecated public interface ScaleFit extends androidx.ui.core.ContentScale {
+    field @Deprecated public static final androidx.ui.core.ScaleFit.Companion! Companion;
+  }
+
+  @Deprecated public static final class ScaleFit.Companion {
+    method @Deprecated public androidx.ui.core.ContentScale getFillHeight();
+    method @Deprecated public androidx.ui.core.ContentScale getFillMaxDimension();
+    method @Deprecated public androidx.ui.core.ContentScale getFillMinDimension();
+    method @Deprecated public androidx.ui.core.ContentScale getFillWidth();
+    method @Deprecated public androidx.ui.core.ContentScale getFit();
+    method @Deprecated public androidx.ui.core.FixedScale getNone();
+    property @Deprecated public final androidx.ui.core.ContentScale FillHeight;
+    property @Deprecated public final androidx.ui.core.ContentScale FillMaxDimension;
+    property @Deprecated public final androidx.ui.core.ContentScale FillMinDimension;
+    property @Deprecated public final androidx.ui.core.ContentScale FillWidth;
+    property @Deprecated public final androidx.ui.core.ContentScale Fit;
+    property @Deprecated public final androidx.ui.core.FixedScale None;
+  }
+
+  public final inline class TransformOrigin {
+    ctor public TransformOrigin();
+    method public static long constructor-impl(internal long value);
+    method public static 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 public static int hashCode-impl(long p);
+    method public static String toString-impl(long p);
+    field public static final androidx.ui.core.TransformOrigin.Companion! Companion;
+  }
+
+  public static final class TransformOrigin.Companion {
+    method public long getCenter();
+    property public final long Center;
+  }
+
+  public final class VerticalAlignmentLine extends androidx.ui.core.AlignmentLine {
+    ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
+  }
+
+  public interface ZIndexModifier extends androidx.ui.core.Modifier.Element {
+    method public float getZIndex();
+    property public abstract float zIndex;
+  }
+
+  public final class ZIndexModifierKt {
+    method public static androidx.ui.core.Modifier zIndex(androidx.ui.core.Modifier, float zIndex);
+  }
+
+}
+
+package androidx.ui.focus {
+
+  public enum FocusDetailedState {
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Active;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState ActiveParent;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Captured;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Disabled;
+    enum_constant public static final androidx.ui.focus.FocusDetailedState Inactive;
+  }
+
+  public interface FocusModifier extends androidx.ui.core.Modifier.Element {
+    method public boolean captureFocus();
+    method public boolean freeFocus();
+    method public androidx.ui.focus.FocusDetailedState getFocusDetailedState();
+    method public void requestFocus();
+    property public abstract androidx.ui.focus.FocusDetailedState focusDetailedState;
+  }
+
+  public enum FocusState {
+    enum_constant public static final androidx.ui.focus.FocusState Focused;
+    enum_constant public static final androidx.ui.focus.FocusState NotFocusable;
+    enum_constant public static final androidx.ui.focus.FocusState NotFocused;
+  }
+
+  public final class FocusStateKt {
+    method public static androidx.ui.focus.FocusState focusState(androidx.ui.focus.FocusDetailedState);
+  }
+
+}
+
+package androidx.ui.semantics {
+
+  public final class AccessibilityAction<T extends kotlin.Function<? extends kotlin.Unit>> {
+    ctor public AccessibilityAction(String? label, T action);
+    method public String? component1();
+    method public T component2();
+    method public androidx.ui.semantics.AccessibilityAction<T> copy(String? label, T action);
+    method public T getAction();
+    method public String? getLabel();
+  }
+
+  public final class AccessibilityRangeInfo {
+    ctor public AccessibilityRangeInfo(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range);
+    method public float component1();
+    method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> component2();
+    method public androidx.ui.semantics.AccessibilityRangeInfo copy(float current, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> range);
+    method public float getCurrent();
+    method public kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> getRange();
+  }
+
+  public final class SemanticsActions {
+    ctor public SemanticsActions();
+    field public static final androidx.ui.semantics.SemanticsActions.Companion! Companion;
+  }
+
+  public static final class SemanticsActions.Companion {
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>>> getCustomActions();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> getOnClick();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>>> getScrollTo();
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>>> CustomActions;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> OnClick;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>>> ScrollTo;
+  }
+
+  public final class SemanticsProperties {
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getAccessibilityLabel();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> getAccessibilityRangeInfo();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getAccessibilityValue();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getEnabled();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getHidden();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Enabled;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Hidden;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
+    field public static final androidx.ui.semantics.SemanticsProperties! INSTANCE;
+  }
+
+  public class SemanticsPropertyKey<T> implements kotlin.properties.ReadWriteProperty<androidx.ui.semantics.SemanticsPropertyReceiver,T> {
+    ctor public SemanticsPropertyKey(String name);
+    method public final String getName();
+    method public final T! getValue(androidx.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property);
+    method public T! merge(T? existingValue, T? newValue);
+    method public final void setValue(androidx.ui.semantics.SemanticsPropertyReceiver thisRef, kotlin.reflect.KProperty<?> property, T? value);
+  }
+
+  public interface SemanticsPropertyReceiver {
+    method public operator <T> void set(androidx.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+  }
+
+}
+
+package androidx.ui.testutils {
+
+  public final class PointerInputTestUtilKt {
+    method public static androidx.ui.core.PointerInputChange consume(androidx.ui.core.PointerInputChange, float dx = 0f, float dy = 0f, boolean downChange = false);
+    method public static androidx.ui.core.PointerInputChange down(long id, androidx.ui.unit.Duration duration = Duration.Zero, float x = 0f, float y = 0f);
+    method public static androidx.ui.core.PointerInputChange invokeOverAllPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange pointerInputChanges, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static java.util.List<androidx.ui.core.PointerInputChange> invokeOverAllPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange![] pointerInputChanges, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static void invokeOverAllPasses(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>, androidx.ui.core.CustomEvent event);
+    method public static androidx.ui.core.PointerInputChange invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange pointerInputChange, androidx.ui.core.PointerEventPass pointerEventPass, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static java.util.List<androidx.ui.core.PointerInputChange> invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange![] pointerInputChanges, androidx.ui.core.PointerEventPass pointerEventPass, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static androidx.ui.core.PointerInputChange invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, androidx.ui.core.PointerInputChange pointerInputChange, androidx.ui.core.PointerEventPass![] pointerEventPasses, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static java.util.List<androidx.ui.core.PointerInputChange> invokeOverPasses(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>>, java.util.List<androidx.ui.core.PointerInputChange> pointerInputChanges, java.util.List<? extends androidx.ui.core.PointerEventPass> pointerEventPasses, androidx.ui.unit.IntPxSize size = IntPxSize(Int.MAX_VALUE.ipx, Int.MAX_VALUE.ipx));
+    method public static void invokeOverPasses(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>, androidx.ui.core.CustomEvent event, java.util.List<? extends androidx.ui.core.PointerEventPass> pointerEventPasses);
+    method public static androidx.ui.core.PointerInputChange moveBy(androidx.ui.core.PointerInputChange, androidx.ui.unit.Duration duration, float dx = 0f, float dy = 0f);
+    method public static androidx.ui.core.PointerInputChange moveTo(androidx.ui.core.PointerInputChange, androidx.ui.unit.Duration duration, float x = 0f, float y = 0f);
+    method public static androidx.ui.core.PointerInputChange up(androidx.ui.core.PointerInputChange, androidx.ui.unit.Duration duration);
+  }
+
+}
+
diff --git a/ui/ui-core/api/restricted_current.txt b/ui/ui-core/api/restricted_current.txt
index 0405755..da55017 100644
--- a/ui/ui-core/api/restricted_current.txt
+++ b/ui/ui-core/api/restricted_current.txt
@@ -260,26 +260,26 @@
     method @FloatRange(from=0.0, to=1.0) public default float getAlpha();
     method public default boolean getClipToBounds();
     method public default boolean getClipToOutline();
-    method @FloatRange(from=0.0) public default float getElevation();
     method public default androidx.ui.graphics.Shape? getOutlineShape();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationX();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationY();
     method @FloatRange(from=0.0, to=360.0) public default float getRotationZ();
     method public default float getScaleX();
     method public default float getScaleY();
+    method @FloatRange(from=0.0) public default float getShadowElevation();
     method public default long getTransformOrigin();
     method public default float getTranslationX();
     method public default float getTranslationY();
     property @FloatRange(from=0.0, to=1.0) public default float alpha;
     property public default boolean clipToBounds;
     property public default boolean clipToOutline;
-    property @FloatRange(from=0.0) public default float elevation;
     property public default androidx.ui.graphics.Shape? outlineShape;
     property @FloatRange(from=0.0, to=360.0) public default float rotationX;
     property @FloatRange(from=0.0, to=360.0) public default float rotationY;
     property @FloatRange(from=0.0, to=360.0) public default float rotationZ;
     property public default float scaleX;
     property public default float scaleY;
+    property @FloatRange(from=0.0) public default float shadowElevation;
     property public default long transformOrigin;
     property public default float translationX;
     property public default float translationY;
@@ -287,7 +287,7 @@
 
   public final class DrawLayerModifierKt {
     method public static inline long TransformOrigin(float pivotFractionX, float pivotFractionY);
-    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
+    method public static androidx.ui.core.Modifier drawLayer-Z3WMmso(androidx.ui.core.Modifier, float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float shadowElevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
     method @Deprecated public static androidx.ui.core.Modifier drawLayer-ebHciuY(float scaleX = 1f, float scaleY = 1f, float alpha = 1f, float translationX = 0f, float translationY = 0f, float elevation = 0f, float rotationX = 0f, float rotationY = 0f, float rotationZ = 0f, long transformOrigin = TransformOrigin.Center, androidx.ui.graphics.Shape? outlineShape = null, boolean clipToBounds = false, boolean clipToOutline = false);
   }
 
@@ -323,16 +323,26 @@
 
   public interface IntrinsicMeasurable {
     method public Object? getParentData();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     property public abstract Object? parentData;
   }
 
   public final class IntrinsicMeasurableKt {
   }
 
+  public abstract class IntrinsicMeasureScope implements androidx.ui.unit.Density {
+    ctor public IntrinsicMeasureScope();
+    method public abstract androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public final int maxIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int maxIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    method public final int minIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int width);
+    method public final int minIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int height);
+    property public abstract androidx.ui.core.LayoutDirection layoutDirection;
+  }
+
   public interface LayoutCoordinates {
     method public androidx.ui.unit.PxBounds childBoundingBox(androidx.ui.core.LayoutCoordinates child);
     method public androidx.ui.unit.PxPosition childToLocal(androidx.ui.core.LayoutCoordinates child, androidx.ui.unit.PxPosition childLocal);
@@ -377,20 +387,21 @@
   }
 
   public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
-    method public default int maxIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int maxIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicHeight-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
-    method public default int minIntrinsicWidth-1_Ebvac(androidx.ui.unit.Density, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public default int minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public interface Measurable extends androidx.ui.core.IntrinsicMeasurable {
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
-  public abstract class MeasureScope implements androidx.ui.unit.Density {
+  public abstract class MeasureScope extends androidx.ui.core.IntrinsicMeasureScope {
     ctor public MeasureScope();
     method public final androidx.ui.core.MeasureScope.MeasureResult layout-Ocy6_kE(int width, int height, java.util.Map<androidx.ui.core.AlignmentLine,androidx.ui.unit.IntPx> alignmentLines = emptyMap(), kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable.PlacementScope,kotlin.Unit> placementBlock);
+    method public final androidx.ui.core.Placeable measure(androidx.ui.core.Measurable, androidx.ui.core.Constraints constraints);
   }
 
   public static interface MeasureScope.MeasureResult {
@@ -467,18 +478,22 @@
     property protected abstract androidx.ui.unit.IntPxSize measuredSize;
     property protected abstract androidx.ui.core.Constraints measurementConstraints;
     property public final int width;
-    field public static final androidx.ui.core.Placeable.PlacementScope! PlacementScope;
   }
 
-  public static final class Placeable.PlacementScope {
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
-    method public void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
-    method public void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
-    method public void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+  public abstract static class Placeable.PlacementScope {
+    ctor public Placeable.PlacementScope();
+    method public abstract androidx.ui.core.LayoutDirection getParentLayoutDirection();
+    method public abstract int getParentWidth();
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void place(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void place-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void place-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.PxPosition position);
+    method public final void placeAbsolute(androidx.ui.core.Placeable, androidx.ui.unit.IntPxPosition position);
+    method public final void placeAbsolute-Guq6mTs(androidx.ui.core.Placeable, float x, float y);
+    method public final void placeAbsolute-sXe7h04(androidx.ui.core.Placeable, int x, int y);
+    property public abstract androidx.ui.core.LayoutDirection parentLayoutDirection;
+    property public abstract int parentWidth;
   }
 
   public enum PointerEventPass {
@@ -584,6 +599,15 @@
     ctor public VerticalAlignmentLine(kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> merger);
   }
 
+  public interface ZIndexModifier extends androidx.ui.core.Modifier.Element {
+    method public float getZIndex();
+    property public abstract float zIndex;
+  }
+
+  public final class ZIndexModifierKt {
+    method public static androidx.ui.core.Modifier zIndex(androidx.ui.core.Modifier, float zIndex);
+  }
+
 }
 
 package androidx.ui.focus {
diff --git a/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/ZIndexModifierSample.kt b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/ZIndexModifierSample.kt
new file mode 100644
index 0000000..f097730
--- /dev/null
+++ b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/ZIndexModifierSample.kt
@@ -0,0 +1,33 @@
+/*
+ * 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.ui.core.samples
+
+import androidx.annotation.Sampled
+import androidx.compose.Composable
+import androidx.ui.core.Modifier
+import androidx.ui.core.zIndex
+import androidx.ui.foundation.Text
+import androidx.ui.layout.Stack
+
+@Sampled
+@Composable
+fun ZIndexModifierSample() {
+    Stack {
+        Text("Drawn second", Modifier.zIndex(1f))
+        Text("Drawn first")
+    }
+}
\ No newline at end of file
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/DrawLayerModifier.kt b/ui/ui-core/src/main/java/androidx/ui/core/DrawLayerModifier.kt
index 15e5523..63aa227 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/DrawLayerModifier.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/DrawLayerModifier.kt
@@ -102,11 +102,11 @@
     val translationY: Float get() = 0f
 
     /**
-     * Sets the Z coordinate of the layer in pixels. With [outlineShape] set, this will cause
-     * a shadow. Varying the [elevation] can also change the order in which layers are drawn.
+     * Sets the elevation for the shadow in pixels. With the [shadowElevation] > 0f and
+     * [outlineShape] set, a shadow is produced.
      */
     @get:FloatRange(from = 0.0)
-    val elevation: Float get() = 0f
+    val shadowElevation: Float get() = 0f
 
     /**
      * The rotation of the contents around the horizontal axis in degrees.
@@ -134,7 +134,7 @@
     val transformOrigin: TransformOrigin get() = TransformOrigin.Center
 
     /**
-     * The [Shape] of the layer. When [elevation] is non-zero and [outlineShape] is non-null,
+     * The [Shape] of the layer. When [shadowElevation] is non-zero and [outlineShape] is non-null,
      * a shadow is produced. When [clipToOutline] is `true` and [outlineShape] is non-null, the
      * contents will be clipped to the outline.
      */
@@ -164,7 +164,7 @@
     override val alpha: Float,
     override val translationX: Float,
     override val translationY: Float,
-    override val elevation: Float,
+    override val shadowElevation: Float,
     override val rotationX: Float,
     override val rotationY: Float,
     override val rotationZ: Float,
@@ -184,7 +184,7 @@
  * @param alpha [DrawLayerModifier.alpha]
  * @param translationX [DrawLayerModifier.translationX]
  * @param translationY [DrawLayerModifier.translationY]
- * @param elevation [DrawLayerModifier.elevation]
+ * @param elevation [DrawLayerModifier.shadowElevation]
  * @param rotationX [DrawLayerModifier.rotationX]
  * @param rotationY [DrawLayerModifier.rotationY]
  * @param rotationZ [DrawLayerModifier.rotationZ]
@@ -222,7 +222,7 @@
     alpha = alpha,
     translationX = translationX,
     translationY = translationY,
-    elevation = elevation,
+    shadowElevation = elevation,
     rotationX = rotationX,
     rotationY = rotationY,
     rotationZ = rotationZ,
@@ -240,7 +240,7 @@
  * @param scaleX [DrawLayerModifier.scaleX]
  * @param scaleY [DrawLayerModifier.scaleY]
  * @param alpha [DrawLayerModifier.alpha]
- * @param elevation [DrawLayerModifier.elevation]
+ * @param shadowElevation [DrawLayerModifier.shadowElevation]
  * @param rotationX [DrawLayerModifier.rotationX]
  * @param rotationY [DrawLayerModifier.rotationY]
  * @param rotationZ [DrawLayerModifier.rotationZ]
@@ -254,7 +254,7 @@
     alpha: Float = 1f,
     translationX: Float = 0f,
     translationY: Float = 0f,
-    elevation: Float = 0f,
+    shadowElevation: Float = 0f,
     rotationX: Float = 0f,
     rotationY: Float = 0f,
     rotationZ: Float = 0f,
@@ -268,7 +268,7 @@
     alpha = alpha,
     translationX = translationX,
     translationY = translationY,
-    elevation = elevation,
+    shadowElevation = shadowElevation,
     rotationX = rotationX,
     rotationY = rotationY,
     rotationZ = rotationZ,
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/IntrinsicMeasurable.kt b/ui/ui-core/src/main/java/androidx/ui/core/IntrinsicMeasurable.kt
index 377aa5f..1a2edd6 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/IntrinsicMeasurable.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/IntrinsicMeasurable.kt
@@ -16,7 +16,6 @@
 
 package androidx.ui.core
 
-import androidx.ui.unit.Density
 import androidx.ui.unit.IntPx
 
 /**
@@ -33,29 +32,29 @@
      * Calculates the minimum width that the layout can be such that
      * the content of the layout will be painted correctly.
      */
-    fun minIntrinsicWidth(height: IntPx): IntPx
+    fun minIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx
 
     /**
      * Calculates the smallest width beyond which increasing the width never
      * decreases the height.
      */
-    fun maxIntrinsicWidth(height: IntPx): IntPx
+    fun maxIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx
 
     /**
      * Calculates the minimum height that the layout can be such that
      * the content of the layout will be painted correctly.
      */
-    fun minIntrinsicHeight(width: IntPx): IntPx
+    fun minIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx
 
     /**
      * Calculates the smallest height beyond which increasing the height never
      * decreases the width.
      */
-    fun maxIntrinsicHeight(width: IntPx): IntPx
+    fun maxIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx
 }
 
 /**
  * A function for performing intrinsic measurement.
  */
 typealias IntrinsicMeasureBlock =
-        Density.(List<IntrinsicMeasurable>, IntPx, LayoutDirection) -> IntPx
\ No newline at end of file
+        IntrinsicMeasureScope.(List<IntrinsicMeasurable>, IntPx, LayoutDirection) -> IntPx
\ No newline at end of file
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/IntrinsicMeasureScope.kt b/ui/ui-core/src/main/java/androidx/ui/core/IntrinsicMeasureScope.kt
new file mode 100644
index 0000000..4413d01
--- /dev/null
+++ b/ui/ui-core/src/main/java/androidx/ui/core/IntrinsicMeasureScope.kt
@@ -0,0 +1,60 @@
+/*
+ * 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.ui.core
+
+import androidx.ui.unit.Density
+import androidx.ui.unit.IntPx
+
+/**
+ * The receiver scope of a layout's intrinsic measurements lambdas.
+ */
+abstract class IntrinsicMeasureScope : Density {
+    /**
+     * The [LayoutDirection] of the `Layout` or `LayoutModifier2` using the measure scope
+     * to measure their children.
+     */
+    // TODO(popam): Try to make this protected after the modules structure is updated.
+    abstract val layoutDirection: LayoutDirection
+
+    /**
+     * Calculates the minimum width that the layout can be such that
+     * the content of the layout will be painted correctly.
+     */
+    fun IntrinsicMeasurable.minIntrinsicWidth(height: IntPx) =
+        minIntrinsicWidth(height, layoutDirection)
+
+    /**
+     * Calculates the smallest width beyond which increasing the width never
+     * decreases the height.
+     */
+    fun IntrinsicMeasurable.maxIntrinsicWidth(height: IntPx) =
+        maxIntrinsicWidth(height, layoutDirection)
+
+    /**
+     * Calculates the minimum height that the layout can be such that
+     * the content of the layout will be painted correctly.
+     */
+    fun IntrinsicMeasurable.minIntrinsicHeight(width: IntPx) =
+        minIntrinsicHeight(width, layoutDirection)
+
+    /**
+     * Calculates the smallest height beyond which increasing the height never
+     * decreases the width.
+     */
+    fun IntrinsicMeasurable.maxIntrinsicHeight(width: IntPx) =
+        maxIntrinsicHeight(width, layoutDirection)
+}
\ No newline at end of file
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/LayoutModifier.kt b/ui/ui-core/src/main/java/androidx/ui/core/LayoutModifier.kt
index 14bb83a..0ab381a 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/LayoutModifier.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/LayoutModifier.kt
@@ -52,7 +52,7 @@
     /**
      * The function used to calculate [IntrinsicMeasurable.minIntrinsicWidth].
      */
-    fun Density.minIntrinsicWidth(
+    fun IntrinsicMeasureScope.minIntrinsicWidth(
         measurable: IntrinsicMeasurable,
         height: IntPx,
         layoutDirection: LayoutDirection
@@ -67,7 +67,7 @@
     /**
      * The lambda used to calculate [IntrinsicMeasurable.minIntrinsicHeight].
      */
-    fun Density.minIntrinsicHeight(
+    fun IntrinsicMeasureScope.minIntrinsicHeight(
         measurable: IntrinsicMeasurable,
         width: IntPx,
         layoutDirection: LayoutDirection
@@ -82,7 +82,7 @@
     /**
      * The function used to calculate [IntrinsicMeasurable.maxIntrinsicWidth].
      */
-    fun Density.maxIntrinsicWidth(
+    fun IntrinsicMeasureScope.maxIntrinsicWidth(
         measurable: IntrinsicMeasurable,
         height: IntPx,
         layoutDirection: LayoutDirection
@@ -97,7 +97,7 @@
     /**
      * The lambda used to calculate [IntrinsicMeasurable.maxIntrinsicHeight].
      */
-    fun Density.maxIntrinsicHeight(
+    fun IntrinsicMeasureScope.maxIntrinsicHeight(
         measurable: IntrinsicMeasurable,
         width: IntPx,
         layoutDirection: LayoutDirection
@@ -126,7 +126,8 @@
         )
         val constraints = Constraints(maxHeight = h)
         val layoutResult = with(modifier) {
-            IntrinsicsMeasureScope(density).measure(measurable, constraints, layoutDirection)
+            val receiver = IntrinsicsMeasureScope(density, layoutDirection)
+            receiver.measure(measurable, constraints, layoutDirection)
         }
         return layoutResult.width
     }
@@ -145,7 +146,8 @@
         )
         val constraints = Constraints(maxWidth = w)
         val layoutResult = with(modifier) {
-            IntrinsicsMeasureScope(density).measure(measurable, constraints, layoutDirection)
+            val receiver = IntrinsicsMeasureScope(density, layoutDirection)
+            receiver.measure(measurable, constraints, layoutDirection)
         }
         return layoutResult.height
     }
@@ -164,7 +166,8 @@
         )
         val constraints = Constraints(maxHeight = h)
         val layoutResult = with(modifier) {
-            IntrinsicsMeasureScope(density).measure(measurable, constraints, layoutDirection)
+            val receiver = IntrinsicsMeasureScope(density, layoutDirection)
+            receiver.measure(measurable, constraints, layoutDirection)
         }
         return layoutResult.width
     }
@@ -183,7 +186,8 @@
         )
         val constraints = Constraints(maxWidth = w)
         val layoutResult = with(modifier) {
-            IntrinsicsMeasureScope(density).measure(measurable, constraints, layoutDirection)
+            val receiver = IntrinsicsMeasureScope(density, layoutDirection)
+            receiver.measure(measurable, constraints, layoutDirection)
         }
         return layoutResult.height
     }
@@ -196,42 +200,46 @@
         override val parentData: Any?
             get() = measurable.parentData
 
-        override fun measure(constraints: Constraints): Placeable {
+        override fun measure(
+            constraints: Constraints,
+            layoutDirection: LayoutDirection
+        ): Placeable {
             if (widthHeight == IntrinsicWidthHeight.Width) {
                 val width = if (minMax == IntrinsicMinMax.Max) {
-                    measurable.maxIntrinsicWidth(constraints.maxHeight)
+                    measurable.maxIntrinsicWidth(constraints.maxHeight, layoutDirection)
                 } else {
-                    measurable.minIntrinsicWidth(constraints.maxHeight)
+                    measurable.minIntrinsicWidth(constraints.maxHeight, layoutDirection)
                 }
                 return DummyPlaceable(width, constraints.maxHeight)
             }
             val height = if (minMax == IntrinsicMinMax.Max) {
-                measurable.maxIntrinsicHeight(constraints.maxWidth)
+                measurable.maxIntrinsicHeight(constraints.maxWidth, layoutDirection)
             } else {
-                measurable.minIntrinsicHeight(constraints.maxWidth)
+                measurable.minIntrinsicHeight(constraints.maxWidth, layoutDirection)
             }
             return DummyPlaceable(constraints.maxWidth, height)
         }
 
-        override fun minIntrinsicWidth(height: IntPx): IntPx {
-            return measurable.minIntrinsicWidth(height)
+        override fun minIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx {
+            return measurable.minIntrinsicWidth(height, layoutDirection)
         }
 
-        override fun maxIntrinsicWidth(height: IntPx): IntPx {
-            return measurable.maxIntrinsicWidth(height)
+        override fun maxIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx {
+            return measurable.maxIntrinsicWidth(height, layoutDirection)
         }
 
-        override fun minIntrinsicHeight(width: IntPx): IntPx {
-            return measurable.minIntrinsicHeight(width)
+        override fun minIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx {
+            return measurable.minIntrinsicHeight(width, layoutDirection)
         }
 
-        override fun maxIntrinsicHeight(width: IntPx): IntPx {
-            return measurable.maxIntrinsicHeight(width)
+        override fun maxIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx {
+            return measurable.maxIntrinsicHeight(width, layoutDirection)
         }
     }
 
     private class IntrinsicsMeasureScope(
-        density: Density
+        density: Density,
+        override val layoutDirection: LayoutDirection
     ) : MeasureScope(), Density by density
 
     private class DummyPlaceable(width: IntPx, height: IntPx) : Placeable() {
@@ -285,8 +293,10 @@
         layoutDirection: LayoutDirection
     ): IntPx {
         val constraints = Constraints(maxHeight = height)
-        val layoutWidth =
-            measurable.minIntrinsicWidth(modifyConstraints(constraints, layoutDirection).maxHeight)
+        val layoutWidth = measurable.minIntrinsicWidth(
+            modifyConstraints(constraints, layoutDirection).maxHeight,
+            layoutDirection
+        )
         return modifySize(constraints, layoutDirection, IntPxSize(layoutWidth, height)).width
     }
 
@@ -300,8 +310,10 @@
         layoutDirection: LayoutDirection
     ): IntPx {
         val constraints = Constraints(maxHeight = height)
-        val layoutWidth =
-            measurable.maxIntrinsicWidth(modifyConstraints(constraints, layoutDirection).maxHeight)
+        val layoutWidth = measurable.maxIntrinsicWidth(
+            modifyConstraints(constraints, layoutDirection).maxHeight,
+            layoutDirection
+        )
         return modifySize(constraints, layoutDirection, IntPxSize(layoutWidth, height)).width
     }
 
@@ -315,8 +327,10 @@
         layoutDirection: LayoutDirection
     ): IntPx {
         val constraints = Constraints(maxWidth = width)
-        val layoutHeight =
-            measurable.minIntrinsicHeight(modifyConstraints(constraints, layoutDirection).maxWidth)
+        val layoutHeight = measurable.minIntrinsicHeight(
+            modifyConstraints(constraints, layoutDirection).maxWidth,
+            layoutDirection
+        )
         return modifySize(constraints, layoutDirection, IntPxSize(width, layoutHeight)).height
     }
 
@@ -330,8 +344,10 @@
         layoutDirection: LayoutDirection
     ): IntPx {
         val constraints = Constraints(maxWidth = width)
-        val layoutHeight =
-            measurable.maxIntrinsicHeight(modifyConstraints(constraints, layoutDirection).maxWidth)
+        val layoutHeight = measurable.maxIntrinsicHeight(
+            modifyConstraints(constraints, layoutDirection).maxWidth,
+            layoutDirection
+        )
         return modifySize(constraints, layoutDirection, IntPxSize(width, layoutHeight)).height
     }
 
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/Measurable.kt b/ui/ui-core/src/main/java/androidx/ui/core/Measurable.kt
index 8b28e80..fa2d9ab 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/Measurable.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/Measurable.kt
@@ -22,9 +22,9 @@
  */
 interface Measurable : IntrinsicMeasurable {
     /**
-     * Resizes the layout based on [constraints], returning a [Placeable]
-     * layout that has its new size. A `Measurable` can only be measured
-     * once inside a layout pass.
+     * Measures the layout with [constraints] and a [layoutDirection],
+     * returning a [Placeable] layout that has its new size. A [Measurable]
+     * can only be measured once inside a layout pass.
      */
-    fun measure(constraints: Constraints): Placeable
+    fun measure(constraints: Constraints, layoutDirection: LayoutDirection): Placeable
 }
\ No newline at end of file
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/MeasureScope.kt b/ui/ui-core/src/main/java/androidx/ui/core/MeasureScope.kt
index 09fe5c7..ba4dfa3 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/MeasureScope.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/MeasureScope.kt
@@ -16,14 +16,21 @@
 
 package androidx.ui.core
 
-import androidx.ui.unit.Density
 import androidx.ui.unit.IntPx
 
 /**
  * The receiver scope of a layout's measure lambda. The return value of the
  * measure lambda is [MeasureResult], which should be returned by [layout]
  */
-abstract class MeasureScope : Density {
+abstract class MeasureScope : IntrinsicMeasureScope() {
+    /**
+     * Measures the layout with [constraints], returning a [Placeable]
+     * layout that has its new size. A [Measurable] can only be measured
+     * once inside a layout pass. The layout will inherit the layout
+     * direction from its parent layout.
+     */
+    fun Measurable.measure(constraints: Constraints) = measure(constraints, layoutDirection)
+
     /**
      * Interface holding the size and alignment lines of the measured layout, as well as the
      * children positioning logic.
@@ -65,7 +72,7 @@
         override val height = height
         override val alignmentLines = alignmentLines
         override fun placeChildren(layoutDirection: LayoutDirection) {
-            with(Placeable.PlacementScope) {
+            with(InnerPlacementScope) {
                 this.parentLayoutDirection = layoutDirection
                 val previousParentWidth = parentWidth
                 parentWidth = width
@@ -74,6 +81,13 @@
             }
         }
     }
+
+    internal companion object {
+        object InnerPlacementScope : Placeable.PlacementScope() {
+            override var parentLayoutDirection = LayoutDirection.Ltr
+            override var parentWidth = IntPx.Zero
+        }
+    }
 }
 
 /**
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/Placeable.kt b/ui/ui-core/src/main/java/androidx/ui/core/Placeable.kt
index fa2f30a..60c257b 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/Placeable.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/Placeable.kt
@@ -98,22 +98,21 @@
      * contexts using the [place] methods available in the scope. If the automatic mirroring is not
      * desired, [placeAbsolute] should be used instead.
      */
-    // TODO(b/150276678): this API is incomplete and should accept the parent width in constructor
-    //  to be used correctly outside the MeasureScope.layout() call.
-    companion object PlacementScope {
+    // TODO(b/150276678): using the PlacementScope to place outside the layout pass is not working.
+    abstract class PlacementScope {
         /**
          * Keeps the parent layout node's width to make the automatic mirroring of the position
          * in RTL environment. If the value is zero, than the [Placeable] will be be placed to
          * the original position (position will not be mirrored).
          */
-        internal var parentWidth = IntPx.Zero
+        abstract val parentWidth: IntPx
 
         /**
          * Keeps the layout direction of the parent of the placeable that is being places using
          * current [PlacementScope]. Used to support automatic position mirroring for convenient
          * RTL support in custom layouts.
          */
-        internal var parentLayoutDirection = LayoutDirection.Ltr
+        abstract val parentLayoutDirection: LayoutDirection
 
         /**
          * Place a [Placeable] at [position] in its parent's coordinate system.
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/ZIndexModifier.kt b/ui/ui-core/src/main/java/androidx/ui/core/ZIndexModifier.kt
new file mode 100644
index 0000000..ff88370
--- /dev/null
+++ b/ui/ui-core/src/main/java/androidx/ui/core/ZIndexModifier.kt
@@ -0,0 +1,47 @@
+/*
+ * 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.ui.core
+
+/**
+ * A [Modifier.Element] that controls the drawing order for the children of the same layout
+ * parent. A child with larger [zIndex] will be drawn after all the children with smaller [zIndex].
+ * When children have the same [zIndex] the original order in which the items were added into the
+ * parent layout is applied.
+ * Note that if there would be multiple [ZIndexModifier] modifiers applied for the same layout
+ * only the first one in the modifiers chain will be used. If no [ZIndexModifier]s applied for the
+ * layout then zIndex for this Layout is 0.
+ *
+ * @see [Modifier.zIndex]
+ */
+interface ZIndexModifier : Modifier.Element {
+    val zIndex: Float
+}
+
+/**
+ * Creates a [ZIndexModifier] that controls the drawing order for the children of the same layout
+ * parent. A child with larger [zIndex] will be drawn after all the children with smaller [zIndex].
+ * When children have the same [zIndex] the original order in which the items were added into the
+ * parent layout is applied.
+ * Note that if there would be multiple [ZIndexModifier] modifiers applied for the same layout
+ * only the first one in the modifiers chain will be used. If no [ZIndexModifier]s applied for the
+ * layout then zIndex for this Layout is 0.
+ *
+ * @sample androidx.ui.core.samples.ZIndexModifierSample
+ */
+fun Modifier.zIndex(zIndex: Float): Modifier = this + SimpleZIndexModifier(zIndex)
+
+private data class SimpleZIndexModifier(override val zIndex: Float) : ZIndexModifier
diff --git a/ui/ui-foundation/api/0.1.0-dev10.txt b/ui/ui-foundation/api/0.1.0-dev10.txt
index e829d4d..2d13d9b 100644
--- a/ui/ui-foundation/api/0.1.0-dev10.txt
+++ b/ui/ui-foundation/api/0.1.0-dev10.txt
@@ -20,8 +20,8 @@
 
   public final class BoxKt {
     method public static void Box-TInkGdk(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long backgroundColor = Color.Transparent, androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp padding = elvis {
-    @null var var41190502: androidx.ui.unit.Dp = border?.size
-    if (var41190502 != null) var41190502 else 0.dp
+    @null var var411903ba: androidx.ui.unit.Dp = border?.size
+    if (var411903ba != null) var411903ba else 0.dp
 }, androidx.ui.unit.Dp paddingStart = Dp.Unspecified, androidx.ui.unit.Dp paddingTop = Dp.Unspecified, androidx.ui.unit.Dp paddingEnd = Dp.Unspecified, androidx.ui.unit.Dp paddingBottom = Dp.Unspecified, androidx.ui.core.Alignment gravity = ContentGravity.TopStart, kotlin.jvm.functions.Function0<kotlin.Unit> children = emptyContent());
   }
 
@@ -30,7 +30,7 @@
   }
 
   public final class ClickableKt {
-    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, androidx.ui.foundation.InteractionState? interactionState = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ClickableTextKt {
@@ -111,6 +111,26 @@
     method @Deprecated public static void SimpleImage--SSR55g(androidx.ui.graphics.ImageAsset image, long tint = Color.Unset);
   }
 
+  public interface Interaction {
+  }
+
+  public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+  }
+
+  public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+  }
+
+  public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
+    ctor public InteractionState();
+    method public void addInteraction(androidx.ui.foundation.Interaction interaction);
+    method public operator boolean contains(androidx.ui.foundation.Interaction interaction);
+    method public java.util.Set<androidx.ui.foundation.Interaction> getValue();
+    method public void removeInteraction(androidx.ui.foundation.Interaction interaction);
+    property public java.util.Set<androidx.ui.foundation.Interaction> value;
+  }
+
   public final class ScrollerKt {
     method public static void HorizontalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
     method public static androidx.ui.foundation.ScrollerPosition ScrollerPosition(float initial = 0f);
@@ -150,7 +170,7 @@
   }
 
   public final class TextFieldKt {
-    method public static void TextField-QMJQIkg(androidx.ui.foundation.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static void TextField-8MLV-t4(androidx.ui.foundation.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
   }
 
   public final class TextFieldValue {
@@ -261,7 +281,7 @@
   }
 
   public final class DraggableKt {
-    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
+    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, androidx.ui.foundation.InteractionState? interactionState = null, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
   }
 
   public final class ScrollableKt {
@@ -333,7 +353,7 @@
   }
 
   public final class RectangleShapeKt {
-    method public static androidx.ui.graphics.Shape getRectangleShape();
+    method @Deprecated public static androidx.ui.graphics.Shape getRectangleShape();
   }
 
 }
diff --git a/ui/ui-foundation/api/0.1.0-dev11.txt b/ui/ui-foundation/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..b83981e
--- /dev/null
+++ b/ui/ui-foundation/api/0.1.0-dev11.txt
@@ -0,0 +1,421 @@
+// Signature format: 3.0
+package androidx.ui.foundation {
+
+  public final class AdapterListKt {
+    method public static <T> void AdapterList(java.util.List<? extends T> data, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> itemCallback);
+  }
+
+  public final class Border {
+    ctor public Border(androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.graphics.Brush component2();
+    method public androidx.ui.foundation.Border copy(androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush);
+    method public androidx.ui.graphics.Brush getBrush();
+    method public androidx.ui.unit.Dp getSize();
+  }
+
+  public final class BorderKt {
+    method public static androidx.ui.foundation.Border Border-YSZAjy0(androidx.ui.unit.Dp size, long color);
+  }
+
+  public final class BoxKt {
+    method public static void Box-TInkGdk(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long backgroundColor = Color.Transparent, androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp padding = elvis {
+    @null var var411903ba: androidx.ui.unit.Dp = border?.size
+    if (var411903ba != null) var411903ba else 0.dp
+}, androidx.ui.unit.Dp paddingStart = Dp.Unspecified, androidx.ui.unit.Dp paddingTop = Dp.Unspecified, androidx.ui.unit.Dp paddingEnd = Dp.Unspecified, androidx.ui.unit.Dp paddingBottom = Dp.Unspecified, androidx.ui.core.Alignment gravity = ContentGravity.TopStart, kotlin.jvm.functions.Function0<kotlin.Unit> children = emptyContent());
+  }
+
+  public final class CanvasKt {
+    method public static void Canvas(androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.DrawScope,kotlin.Unit> onCanvas);
+  }
+
+  public final class ClickableKt {
+    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, androidx.ui.foundation.InteractionState? interactionState = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class ClickableTextKt {
+    method public static void ClickableText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {}, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+  }
+
+  public final class ColoredRectKt {
+    method @Deprecated public static void ColoredRect(androidx.ui.graphics.Brush brush, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
+    method @Deprecated public static void ColoredRect-rR94L9Y(long color, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
+  }
+
+  public final class ContentColorKt {
+    method public static long contentColor();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.graphics.Color> getContentColorAmbient();
+  }
+
+  public final class DarkThemeKt {
+    method public static boolean isSystemInDarkTheme();
+  }
+
+  public final class DeterminateProgressIndicatorKt {
+    method public static void DeterminateProgressIndicator(@FloatRange(from=0.0, to=1.0) float progress, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class DialogKt {
+    method public static void Dialog(kotlin.jvm.functions.Function0<kotlin.Unit> onCloseRequest, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class DrawBackground implements androidx.ui.core.DrawModifier {
+    method public androidx.ui.foundation.DrawBackground copy(androidx.ui.graphics.Paint paint, androidx.ui.graphics.Shape shape);
+    method public void draw(androidx.ui.core.ContentDrawScope);
+  }
+
+  public final class DrawBackgroundKt {
+    method @Deprecated public static androidx.ui.foundation.DrawBackground DrawBackground(androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape = RectangleShape);
+    method @Deprecated public static androidx.ui.foundation.DrawBackground DrawBackground-qSsqlCY(long color, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBackground(androidx.ui.core.Modifier, androidx.ui.graphics.Paint paint, androidx.ui.graphics.Shape shape);
+    method public static androidx.ui.core.Modifier drawBackground(androidx.ui.core.Modifier, androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBackground-IZZjS-Q(androidx.ui.core.Modifier, long color, androidx.ui.graphics.Shape shape = RectangleShape);
+  }
+
+  public final class DrawBorder implements androidx.ui.core.DrawModifier {
+    method public void draw(androidx.ui.core.ContentDrawScope);
+  }
+
+  public final class DrawBorderKt {
+    method @Deprecated public static androidx.ui.core.Modifier DrawBorder(androidx.ui.foundation.Border border, androidx.ui.graphics.Shape shape = RectangleShape);
+    method @Deprecated public static androidx.ui.foundation.DrawBorder DrawBorder(androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape);
+    method @Deprecated public static androidx.ui.core.Modifier DrawBorder-Wounw_8(androidx.ui.unit.Dp size, long color, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBorder(androidx.ui.core.Modifier, androidx.ui.foundation.Border border, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBorder(androidx.ui.core.Modifier, androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape);
+    method public static androidx.ui.core.Modifier drawBorder-ik3FbJE(androidx.ui.core.Modifier, androidx.ui.unit.Dp size, long color, androidx.ui.graphics.Shape shape = RectangleShape);
+  }
+
+  public final class DrawBordersReceiver {
+    method public void all(androidx.ui.foundation.Border border = defaultBorder);
+    method public void allHorizontal(androidx.ui.foundation.Border border = defaultBorder);
+    method public void allVertical(androidx.ui.foundation.Border border = defaultBorder);
+    method public void bottom(androidx.ui.foundation.Border border = defaultBorder);
+    method public void horizontal(int row, kotlin.ranges.IntRange columns = 0 <other> columnCount, androidx.ui.foundation.Border border = defaultBorder);
+    method public void left(androidx.ui.foundation.Border border = defaultBorder);
+    method public void outer(androidx.ui.foundation.Border border = defaultBorder);
+    method public void right(androidx.ui.foundation.Border border = defaultBorder);
+    method public void top(androidx.ui.foundation.Border border = defaultBorder);
+    method public void vertical(int column, kotlin.ranges.IntRange rows = 0 <other> rowCount, androidx.ui.foundation.Border border = defaultBorder);
+  }
+
+  public final class IconKt {
+    method public static void Icon-A4lfJGc(androidx.ui.graphics.vector.VectorAsset asset, androidx.ui.core.Modifier modifier = Modifier, long tint = contentColor());
+    method public static void Icon-RCipKA8(androidx.ui.graphics.painter.Painter painter, androidx.ui.core.Modifier modifier = Modifier, long tint = contentColor());
+    method public static void Icon-smRaMnI(androidx.ui.graphics.ImageAsset asset, androidx.ui.core.Modifier modifier = Modifier, long tint = contentColor());
+  }
+
+  public final class ImageKt {
+    method public static inline void Image(androidx.ui.graphics.ImageAsset asset, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null);
+    method public static inline void Image(androidx.ui.graphics.vector.VectorAsset asset, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null);
+    method public static void Image(androidx.ui.graphics.painter.Painter painter, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null);
+    method @Deprecated public static void SimpleImage--SSR55g(androidx.ui.graphics.ImageAsset image, long tint = Color.Unset);
+  }
+
+  public interface Interaction {
+  }
+
+  public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+  }
+
+  public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+  }
+
+  public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
+    ctor public InteractionState();
+    method public void addInteraction(androidx.ui.foundation.Interaction interaction);
+    method public operator boolean contains(androidx.ui.foundation.Interaction interaction);
+    method public java.util.Set<androidx.ui.foundation.Interaction> getValue();
+    method public void removeInteraction(androidx.ui.foundation.Interaction interaction);
+    property public java.util.Set<androidx.ui.foundation.Interaction> value;
+  }
+
+  public final class ScrollerKt {
+    method public static void HorizontalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
+    method public static androidx.ui.foundation.ScrollerPosition ScrollerPosition(float initial = 0f);
+    method public static void VerticalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
+  }
+
+  public final class ScrollerPosition {
+    ctor public ScrollerPosition(androidx.ui.foundation.animation.FlingConfig flingConfig, float initial, androidx.animation.AnimationClockObservable animationClock);
+    method public float getMaxPosition();
+    method public float getValue();
+    method public boolean isAnimating();
+    method public void scrollBy(float value);
+    method public void scrollTo(float value);
+    method public void smoothScrollBy(float value, kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super java.lang.Float,kotlin.Unit> onEnd = { _, _ ->  });
+    method public void smoothScrollTo(float value, kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super java.lang.Float,kotlin.Unit> onEnd = { _, _ ->  });
+    property public final boolean isAnimating;
+    property public final float maxPosition;
+    property public final float value;
+  }
+
+  public final class Strings {
+    method public String getChecked();
+    method public String getIndeterminate();
+    method public String getNotSelected();
+    method public String getSelected();
+    method public String getUnchecked();
+    property public final String Checked;
+    property public final String Indeterminate;
+    property public final String NotSelected;
+    property public final String Selected;
+    property public final String Unchecked;
+    field public static final androidx.ui.foundation.Strings! INSTANCE;
+  }
+
+  public final class TableBordersKt {
+    method public static void drawBorders(androidx.ui.layout.TableChildren, androidx.ui.foundation.Border defaultBorder = Border(Color.Black, Dp.Hairline), kotlin.jvm.functions.Function1<? super androidx.ui.foundation.DrawBordersReceiver,kotlin.Unit> block);
+  }
+
+  public final class TextFieldKt {
+    method public static void TextField-QMJQIkg(androidx.ui.foundation.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+  }
+
+  public final class TextFieldValue {
+    ctor public TextFieldValue(String text, androidx.ui.text.TextRange selection);
+    ctor public TextFieldValue();
+    method public String component1();
+    method public androidx.ui.text.TextRange component2();
+    method public androidx.ui.foundation.TextFieldValue copy(String text, androidx.ui.text.TextRange selection);
+    method public androidx.ui.text.TextRange getSelection();
+    method public String getText();
+  }
+
+  public final class TextKt {
+    method public static void ProvideTextStyle(androidx.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Text-7SQZnBs(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, androidx.ui.text.TextStyle style = currentTextStyle(), boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static void Text-oHc3XQk(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, androidx.ui.text.TextStyle style = currentTextStyle(), boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static androidx.ui.text.TextStyle currentTextStyle();
+  }
+
+}
+
+package androidx.ui.foundation.animation {
+
+  public final class AndroidFlingCalculator {
+    ctor public AndroidFlingCalculator(androidx.ui.unit.Density density);
+    method public float flingDistance(float velocity);
+    method public long flingDuration(float velocity);
+    method public androidx.ui.foundation.animation.AndroidFlingCalculator.FlingInfo flingInfo(float velocity);
+    method public androidx.ui.unit.Density getDensity();
+  }
+
+  public static final class AndroidFlingCalculator.FlingInfo {
+    ctor public AndroidFlingCalculator.FlingInfo(float initialVelocity, float distance, long duration);
+    method public float component1();
+    method public float component2();
+    method public long component3();
+    method public androidx.ui.foundation.animation.AndroidFlingCalculator.FlingInfo copy(float initialVelocity, float distance, long duration);
+    method public float getDistance();
+    method public long getDuration();
+    method public float getInitialVelocity();
+    method public float position(long time);
+    method public float velocity(long time);
+  }
+
+  public final class AndroidFlingCalculatorKt {
+  }
+
+  public final class AndroidFlingDecayAnimation implements androidx.animation.DecayAnimation {
+    ctor public AndroidFlingDecayAnimation(androidx.ui.foundation.animation.AndroidFlingCalculator flingCalculator);
+    method public float getAbsVelocityThreshold();
+    method public long getDurationMillis(float start, float startVelocity);
+    method public androidx.ui.foundation.animation.AndroidFlingCalculator getFlingCalculator();
+    method public float getTarget(float start, float startVelocity);
+    method public float getValue(long playTime, float start, float startVelocity);
+    method public float getVelocity(long playTime, float start, float startVelocity);
+    property public float absVelocityThreshold;
+    property public final androidx.ui.foundation.animation.AndroidFlingCalculator flingCalculator;
+  }
+
+  public final class AndroidFlingSpline {
+    method public double deceleration(float velocity, float friction);
+    method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult flingPosition(float time);
+    field public static final androidx.ui.foundation.animation.AndroidFlingSpline! INSTANCE;
+  }
+
+  public static final class AndroidFlingSpline.FlingResult {
+    ctor public AndroidFlingSpline.FlingResult(float distanceCoefficient, float velocityCoefficient);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult copy(float distanceCoefficient, float velocityCoefficient);
+    method public float getDistanceCoefficient();
+    method public float getVelocityCoefficient();
+  }
+
+  public final class AndroidFlingSplineKt {
+  }
+
+  public final class FlingConfig {
+    ctor public FlingConfig(androidx.animation.DecayAnimation decayAnimation, kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd, kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget);
+    method public androidx.animation.DecayAnimation component1();
+    method public kotlin.jvm.functions.Function3<androidx.animation.AnimationEndReason,java.lang.Float,java.lang.Float,kotlin.Unit>? component2();
+    method public kotlin.jvm.functions.Function1<java.lang.Float,androidx.animation.TargetAnimation> component3();
+    method public androidx.ui.foundation.animation.FlingConfig copy(androidx.animation.DecayAnimation decayAnimation, kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd, kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget);
+    method public kotlin.jvm.functions.Function1<java.lang.Float,androidx.animation.TargetAnimation> getAdjustTarget();
+    method public androidx.animation.DecayAnimation getDecayAnimation();
+    method public kotlin.jvm.functions.Function3<androidx.animation.AnimationEndReason,java.lang.Float,java.lang.Float,kotlin.Unit>? getOnAnimationEnd();
+  }
+
+  public final class FlingConfigKt {
+    method public static androidx.ui.foundation.animation.FlingConfig AnchorsFlingConfig(java.util.List<java.lang.Float> anchors, androidx.animation.AnimationBuilder<java.lang.Float> animationBuilder = androidx.animation.PhysicsBuilder(), kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd = null, androidx.animation.DecayAnimation decayAnimation = androidx.animation.ExponentialDecay());
+    method public static androidx.ui.foundation.animation.FlingConfig FlingConfig(kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd = null, kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget = { null });
+    method public static void fling(androidx.animation.AnimatedFloat, androidx.ui.foundation.animation.FlingConfig config, float startVelocity);
+  }
+
+}
+
+package androidx.ui.foundation.gestures {
+
+  public abstract sealed class DragDirection {
+  }
+
+  public static final class DragDirection.Horizontal extends androidx.ui.foundation.gestures.DragDirection {
+    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal! INSTANCE;
+  }
+
+  public static final class DragDirection.Vertical extends androidx.ui.foundation.gestures.DragDirection {
+    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical! INSTANCE;
+  }
+
+  public final class DraggableKt {
+    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, androidx.ui.foundation.InteractionState? interactionState = null, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
+  }
+
+  public final class ScrollableKt {
+    method public static androidx.ui.foundation.gestures.ScrollableState ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onScrollDeltaConsumptionRequested);
+    method public static androidx.ui.core.Modifier scrollable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, androidx.ui.foundation.gestures.ScrollableState scrollableState, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onScrollStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onScrollStopped = {}, boolean enabled = true);
+  }
+
+  public final class ScrollableState {
+    ctor public ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onScrollDeltaConsumptionRequested, androidx.ui.foundation.animation.FlingConfig flingConfig, androidx.animation.AnimationClockObservable animationClock);
+    method public androidx.ui.foundation.animation.FlingConfig getFlingConfig();
+    method public kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> getOnScrollDeltaConsumptionRequested();
+    method public boolean isAnimating();
+    method public void smoothScrollBy(float value, kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super java.lang.Float,kotlin.Unit> onEnd = { _, _ ->  });
+    method public void stopAnimation();
+    property public final boolean isAnimating;
+  }
+
+}
+
+package androidx.ui.foundation.selection {
+
+  public final class MutuallyExclusiveSetItemKt {
+    method public static void MutuallyExclusiveSetItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class ToggleableKt {
+    method public static void Toggleable(boolean value, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static androidx.ui.foundation.selection.ToggleableState ToggleableState(boolean value);
+    method public static void TriStateToggleable(androidx.ui.foundation.selection.ToggleableState state = androidx.ui.foundation.selection.ToggleableState.On, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public enum ToggleableState {
+    enum_constant public static final androidx.ui.foundation.selection.ToggleableState Indeterminate;
+    enum_constant public static final androidx.ui.foundation.selection.ToggleableState Off;
+    enum_constant public static final androidx.ui.foundation.selection.ToggleableState On;
+  }
+
+}
+
+package androidx.ui.foundation.semantics {
+
+  public final class FoundationSemanticsProperties {
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getInMutuallyExclusiveGroup();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSelected();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> getToggleableState();
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> InMutuallyExclusiveGroup;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> ToggleableState;
+    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties! INSTANCE;
+  }
+
+  public final class FoundationSemanticsPropertiesKt {
+    method public static boolean getInMutuallyExclusiveGroup(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getSelected(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.foundation.selection.ToggleableState getToggleableState(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static void setInMutuallyExclusiveGroup(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setSelected(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setToggleableState(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.foundation.selection.ToggleableState p);
+  }
+
+}
+
+package androidx.ui.foundation.shape {
+
+  public final class GenericShape implements androidx.ui.graphics.Shape {
+    ctor public GenericShape(kotlin.jvm.functions.Function2<? super androidx.ui.graphics.Path,? super androidx.ui.unit.PxSize,kotlin.Unit> builder);
+    method public androidx.ui.foundation.shape.GenericShape copy(kotlin.jvm.functions.Function2<? super androidx.ui.graphics.Path,? super androidx.ui.unit.PxSize,kotlin.Unit> builder);
+    method public androidx.ui.graphics.Outline createOutline(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+  }
+
+  public final class RectangleShapeKt {
+    method @Deprecated public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
+}
+
+package androidx.ui.foundation.shape.corner {
+
+  public abstract class CornerBasedShape implements androidx.ui.graphics.Shape {
+    ctor public CornerBasedShape(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public abstract androidx.ui.foundation.shape.corner.CornerBasedShape copy(androidx.ui.foundation.shape.corner.CornerSize topLeft = topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight = topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight = bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft = bottomLeft);
+    method public final androidx.ui.foundation.shape.corner.CornerBasedShape copy(androidx.ui.foundation.shape.corner.CornerSize all);
+    method public final androidx.ui.graphics.Outline createOutline(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+    method public abstract androidx.ui.graphics.Outline createOutline-45bKZN0(androidx.ui.unit.PxSize size, float topLeft, float topRight, float bottomRight, float bottomLeft);
+    method public final androidx.ui.foundation.shape.corner.CornerSize getBottomLeft();
+    method public final androidx.ui.foundation.shape.corner.CornerSize getBottomRight();
+    method public final androidx.ui.foundation.shape.corner.CornerSize getTopLeft();
+    method public final androidx.ui.foundation.shape.corner.CornerSize getTopRight();
+  }
+
+  public interface CornerSize {
+    method public float toPx(androidx.ui.unit.PxSize shapeSize, androidx.ui.unit.Density density);
+  }
+
+  public final class CornerSizeKt {
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize(androidx.ui.unit.Dp size);
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize(@IntRange(from=0, to=50) int percent);
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize(@FloatRange(from=0.0, to=50.0) float percent);
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize-NgWp0Z8(float size);
+    method public static androidx.ui.foundation.shape.corner.CornerSize getZeroCornerSize();
+  }
+
+  public final class CutCornerShape extends androidx.ui.foundation.shape.corner.CornerBasedShape {
+    ctor public CutCornerShape(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.foundation.shape.corner.CutCornerShape copy(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.graphics.Outline createOutline-45bKZN0(androidx.ui.unit.PxSize size, float topLeft, float topRight, float bottomRight, float bottomLeft);
+  }
+
+  public final class CutCornerShapeKt {
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(androidx.ui.foundation.shape.corner.CornerSize corner);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(androidx.ui.unit.Dp size);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(int percent);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(androidx.ui.unit.Dp topLeft = 0.dp, androidx.ui.unit.Dp topRight = 0.dp, androidx.ui.unit.Dp bottomRight = 0.dp, androidx.ui.unit.Dp bottomLeft = 0.dp);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(@IntRange(from=0, to=50) int topLeftPercent = 0, @IntRange(from=0, to=50) int topRightPercent = 0, @IntRange(from=0, to=50) int bottomRightPercent = 0, @IntRange(from=0, to=50) int bottomLeftPercent = 0);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape-NgWp0Z8(float size);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape-wHlpFhg(float topLeft = 0.px, float topRight = 0.px, float bottomRight = 0.px, float bottomLeft = 0.px);
+  }
+
+  public final class RoundedCornerShape extends androidx.ui.foundation.shape.corner.CornerBasedShape {
+    ctor public RoundedCornerShape(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.foundation.shape.corner.RoundedCornerShape copy(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.graphics.Outline createOutline-45bKZN0(androidx.ui.unit.PxSize size, float topLeft, float topRight, float bottomRight, float bottomLeft);
+  }
+
+  public final class RoundedCornerShapeKt {
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(androidx.ui.foundation.shape.corner.CornerSize corner);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(androidx.ui.unit.Dp size);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(int percent);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(androidx.ui.unit.Dp topLeft = 0.dp, androidx.ui.unit.Dp topRight = 0.dp, androidx.ui.unit.Dp bottomRight = 0.dp, androidx.ui.unit.Dp bottomLeft = 0.dp);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(@IntRange(from=0, to=50) int topLeftPercent = 0, @IntRange(from=0, to=50) int topRightPercent = 0, @IntRange(from=0, to=50) int bottomRightPercent = 0, @IntRange(from=0, to=50) int bottomLeftPercent = 0);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape-NgWp0Z8(float size);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape-wHlpFhg(float topLeft = 0.px, float topRight = 0.px, float bottomRight = 0.px, float bottomLeft = 0.px);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape getCircleShape();
+  }
+
+}
+
diff --git a/ui/ui-foundation/api/current.txt b/ui/ui-foundation/api/current.txt
index e829d4d..2d13d9b 100644
--- a/ui/ui-foundation/api/current.txt
+++ b/ui/ui-foundation/api/current.txt
@@ -20,8 +20,8 @@
 
   public final class BoxKt {
     method public static void Box-TInkGdk(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long backgroundColor = Color.Transparent, androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp padding = elvis {
-    @null var var41190502: androidx.ui.unit.Dp = border?.size
-    if (var41190502 != null) var41190502 else 0.dp
+    @null var var411903ba: androidx.ui.unit.Dp = border?.size
+    if (var411903ba != null) var411903ba else 0.dp
 }, androidx.ui.unit.Dp paddingStart = Dp.Unspecified, androidx.ui.unit.Dp paddingTop = Dp.Unspecified, androidx.ui.unit.Dp paddingEnd = Dp.Unspecified, androidx.ui.unit.Dp paddingBottom = Dp.Unspecified, androidx.ui.core.Alignment gravity = ContentGravity.TopStart, kotlin.jvm.functions.Function0<kotlin.Unit> children = emptyContent());
   }
 
@@ -30,7 +30,7 @@
   }
 
   public final class ClickableKt {
-    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, androidx.ui.foundation.InteractionState? interactionState = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ClickableTextKt {
@@ -111,6 +111,26 @@
     method @Deprecated public static void SimpleImage--SSR55g(androidx.ui.graphics.ImageAsset image, long tint = Color.Unset);
   }
 
+  public interface Interaction {
+  }
+
+  public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+  }
+
+  public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+  }
+
+  public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
+    ctor public InteractionState();
+    method public void addInteraction(androidx.ui.foundation.Interaction interaction);
+    method public operator boolean contains(androidx.ui.foundation.Interaction interaction);
+    method public java.util.Set<androidx.ui.foundation.Interaction> getValue();
+    method public void removeInteraction(androidx.ui.foundation.Interaction interaction);
+    property public java.util.Set<androidx.ui.foundation.Interaction> value;
+  }
+
   public final class ScrollerKt {
     method public static void HorizontalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
     method public static androidx.ui.foundation.ScrollerPosition ScrollerPosition(float initial = 0f);
@@ -150,7 +170,7 @@
   }
 
   public final class TextFieldKt {
-    method public static void TextField-QMJQIkg(androidx.ui.foundation.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static void TextField-8MLV-t4(androidx.ui.foundation.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
   }
 
   public final class TextFieldValue {
@@ -261,7 +281,7 @@
   }
 
   public final class DraggableKt {
-    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
+    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, androidx.ui.foundation.InteractionState? interactionState = null, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
   }
 
   public final class ScrollableKt {
@@ -333,7 +353,7 @@
   }
 
   public final class RectangleShapeKt {
-    method public static androidx.ui.graphics.Shape getRectangleShape();
+    method @Deprecated public static androidx.ui.graphics.Shape getRectangleShape();
   }
 
 }
diff --git a/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev10.txt
index e829d4d..2d13d9b 100644
--- a/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev10.txt
@@ -20,8 +20,8 @@
 
   public final class BoxKt {
     method public static void Box-TInkGdk(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long backgroundColor = Color.Transparent, androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp padding = elvis {
-    @null var var41190502: androidx.ui.unit.Dp = border?.size
-    if (var41190502 != null) var41190502 else 0.dp
+    @null var var411903ba: androidx.ui.unit.Dp = border?.size
+    if (var411903ba != null) var411903ba else 0.dp
 }, androidx.ui.unit.Dp paddingStart = Dp.Unspecified, androidx.ui.unit.Dp paddingTop = Dp.Unspecified, androidx.ui.unit.Dp paddingEnd = Dp.Unspecified, androidx.ui.unit.Dp paddingBottom = Dp.Unspecified, androidx.ui.core.Alignment gravity = ContentGravity.TopStart, kotlin.jvm.functions.Function0<kotlin.Unit> children = emptyContent());
   }
 
@@ -30,7 +30,7 @@
   }
 
   public final class ClickableKt {
-    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, androidx.ui.foundation.InteractionState? interactionState = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ClickableTextKt {
@@ -111,6 +111,26 @@
     method @Deprecated public static void SimpleImage--SSR55g(androidx.ui.graphics.ImageAsset image, long tint = Color.Unset);
   }
 
+  public interface Interaction {
+  }
+
+  public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+  }
+
+  public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+  }
+
+  public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
+    ctor public InteractionState();
+    method public void addInteraction(androidx.ui.foundation.Interaction interaction);
+    method public operator boolean contains(androidx.ui.foundation.Interaction interaction);
+    method public java.util.Set<androidx.ui.foundation.Interaction> getValue();
+    method public void removeInteraction(androidx.ui.foundation.Interaction interaction);
+    property public java.util.Set<androidx.ui.foundation.Interaction> value;
+  }
+
   public final class ScrollerKt {
     method public static void HorizontalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
     method public static androidx.ui.foundation.ScrollerPosition ScrollerPosition(float initial = 0f);
@@ -150,7 +170,7 @@
   }
 
   public final class TextFieldKt {
-    method public static void TextField-QMJQIkg(androidx.ui.foundation.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static void TextField-8MLV-t4(androidx.ui.foundation.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
   }
 
   public final class TextFieldValue {
@@ -261,7 +281,7 @@
   }
 
   public final class DraggableKt {
-    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
+    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, androidx.ui.foundation.InteractionState? interactionState = null, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
   }
 
   public final class ScrollableKt {
@@ -333,7 +353,7 @@
   }
 
   public final class RectangleShapeKt {
-    method public static androidx.ui.graphics.Shape getRectangleShape();
+    method @Deprecated public static androidx.ui.graphics.Shape getRectangleShape();
   }
 
 }
diff --git a/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..b83981e
--- /dev/null
+++ b/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,421 @@
+// Signature format: 3.0
+package androidx.ui.foundation {
+
+  public final class AdapterListKt {
+    method public static <T> void AdapterList(java.util.List<? extends T> data, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> itemCallback);
+  }
+
+  public final class Border {
+    ctor public Border(androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.graphics.Brush component2();
+    method public androidx.ui.foundation.Border copy(androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush);
+    method public androidx.ui.graphics.Brush getBrush();
+    method public androidx.ui.unit.Dp getSize();
+  }
+
+  public final class BorderKt {
+    method public static androidx.ui.foundation.Border Border-YSZAjy0(androidx.ui.unit.Dp size, long color);
+  }
+
+  public final class BoxKt {
+    method public static void Box-TInkGdk(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long backgroundColor = Color.Transparent, androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp padding = elvis {
+    @null var var411903ba: androidx.ui.unit.Dp = border?.size
+    if (var411903ba != null) var411903ba else 0.dp
+}, androidx.ui.unit.Dp paddingStart = Dp.Unspecified, androidx.ui.unit.Dp paddingTop = Dp.Unspecified, androidx.ui.unit.Dp paddingEnd = Dp.Unspecified, androidx.ui.unit.Dp paddingBottom = Dp.Unspecified, androidx.ui.core.Alignment gravity = ContentGravity.TopStart, kotlin.jvm.functions.Function0<kotlin.Unit> children = emptyContent());
+  }
+
+  public final class CanvasKt {
+    method public static void Canvas(androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.DrawScope,kotlin.Unit> onCanvas);
+  }
+
+  public final class ClickableKt {
+    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, androidx.ui.foundation.InteractionState? interactionState = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class ClickableTextKt {
+    method public static void ClickableText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {}, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+  }
+
+  public final class ColoredRectKt {
+    method @Deprecated public static void ColoredRect(androidx.ui.graphics.Brush brush, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
+    method @Deprecated public static void ColoredRect-rR94L9Y(long color, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
+  }
+
+  public final class ContentColorKt {
+    method public static long contentColor();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.graphics.Color> getContentColorAmbient();
+  }
+
+  public final class DarkThemeKt {
+    method public static boolean isSystemInDarkTheme();
+  }
+
+  public final class DeterminateProgressIndicatorKt {
+    method public static void DeterminateProgressIndicator(@FloatRange(from=0.0, to=1.0) float progress, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class DialogKt {
+    method public static void Dialog(kotlin.jvm.functions.Function0<kotlin.Unit> onCloseRequest, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class DrawBackground implements androidx.ui.core.DrawModifier {
+    method public androidx.ui.foundation.DrawBackground copy(androidx.ui.graphics.Paint paint, androidx.ui.graphics.Shape shape);
+    method public void draw(androidx.ui.core.ContentDrawScope);
+  }
+
+  public final class DrawBackgroundKt {
+    method @Deprecated public static androidx.ui.foundation.DrawBackground DrawBackground(androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape = RectangleShape);
+    method @Deprecated public static androidx.ui.foundation.DrawBackground DrawBackground-qSsqlCY(long color, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBackground(androidx.ui.core.Modifier, androidx.ui.graphics.Paint paint, androidx.ui.graphics.Shape shape);
+    method public static androidx.ui.core.Modifier drawBackground(androidx.ui.core.Modifier, androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBackground-IZZjS-Q(androidx.ui.core.Modifier, long color, androidx.ui.graphics.Shape shape = RectangleShape);
+  }
+
+  public final class DrawBorder implements androidx.ui.core.DrawModifier {
+    method public void draw(androidx.ui.core.ContentDrawScope);
+  }
+
+  public final class DrawBorderKt {
+    method @Deprecated public static androidx.ui.core.Modifier DrawBorder(androidx.ui.foundation.Border border, androidx.ui.graphics.Shape shape = RectangleShape);
+    method @Deprecated public static androidx.ui.foundation.DrawBorder DrawBorder(androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape);
+    method @Deprecated public static androidx.ui.core.Modifier DrawBorder-Wounw_8(androidx.ui.unit.Dp size, long color, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBorder(androidx.ui.core.Modifier, androidx.ui.foundation.Border border, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBorder(androidx.ui.core.Modifier, androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape);
+    method public static androidx.ui.core.Modifier drawBorder-ik3FbJE(androidx.ui.core.Modifier, androidx.ui.unit.Dp size, long color, androidx.ui.graphics.Shape shape = RectangleShape);
+  }
+
+  public final class DrawBordersReceiver {
+    method public void all(androidx.ui.foundation.Border border = defaultBorder);
+    method public void allHorizontal(androidx.ui.foundation.Border border = defaultBorder);
+    method public void allVertical(androidx.ui.foundation.Border border = defaultBorder);
+    method public void bottom(androidx.ui.foundation.Border border = defaultBorder);
+    method public void horizontal(int row, kotlin.ranges.IntRange columns = 0 <other> columnCount, androidx.ui.foundation.Border border = defaultBorder);
+    method public void left(androidx.ui.foundation.Border border = defaultBorder);
+    method public void outer(androidx.ui.foundation.Border border = defaultBorder);
+    method public void right(androidx.ui.foundation.Border border = defaultBorder);
+    method public void top(androidx.ui.foundation.Border border = defaultBorder);
+    method public void vertical(int column, kotlin.ranges.IntRange rows = 0 <other> rowCount, androidx.ui.foundation.Border border = defaultBorder);
+  }
+
+  public final class IconKt {
+    method public static void Icon-A4lfJGc(androidx.ui.graphics.vector.VectorAsset asset, androidx.ui.core.Modifier modifier = Modifier, long tint = contentColor());
+    method public static void Icon-RCipKA8(androidx.ui.graphics.painter.Painter painter, androidx.ui.core.Modifier modifier = Modifier, long tint = contentColor());
+    method public static void Icon-smRaMnI(androidx.ui.graphics.ImageAsset asset, androidx.ui.core.Modifier modifier = Modifier, long tint = contentColor());
+  }
+
+  public final class ImageKt {
+    method public static inline void Image(androidx.ui.graphics.ImageAsset asset, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null);
+    method public static inline void Image(androidx.ui.graphics.vector.VectorAsset asset, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null);
+    method public static void Image(androidx.ui.graphics.painter.Painter painter, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null);
+    method @Deprecated public static void SimpleImage--SSR55g(androidx.ui.graphics.ImageAsset image, long tint = Color.Unset);
+  }
+
+  public interface Interaction {
+  }
+
+  public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+  }
+
+  public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+  }
+
+  public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
+    ctor public InteractionState();
+    method public void addInteraction(androidx.ui.foundation.Interaction interaction);
+    method public operator boolean contains(androidx.ui.foundation.Interaction interaction);
+    method public java.util.Set<androidx.ui.foundation.Interaction> getValue();
+    method public void removeInteraction(androidx.ui.foundation.Interaction interaction);
+    property public java.util.Set<androidx.ui.foundation.Interaction> value;
+  }
+
+  public final class ScrollerKt {
+    method public static void HorizontalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
+    method public static androidx.ui.foundation.ScrollerPosition ScrollerPosition(float initial = 0f);
+    method public static void VerticalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
+  }
+
+  public final class ScrollerPosition {
+    ctor public ScrollerPosition(androidx.ui.foundation.animation.FlingConfig flingConfig, float initial, androidx.animation.AnimationClockObservable animationClock);
+    method public float getMaxPosition();
+    method public float getValue();
+    method public boolean isAnimating();
+    method public void scrollBy(float value);
+    method public void scrollTo(float value);
+    method public void smoothScrollBy(float value, kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super java.lang.Float,kotlin.Unit> onEnd = { _, _ ->  });
+    method public void smoothScrollTo(float value, kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super java.lang.Float,kotlin.Unit> onEnd = { _, _ ->  });
+    property public final boolean isAnimating;
+    property public final float maxPosition;
+    property public final float value;
+  }
+
+  public final class Strings {
+    method public String getChecked();
+    method public String getIndeterminate();
+    method public String getNotSelected();
+    method public String getSelected();
+    method public String getUnchecked();
+    property public final String Checked;
+    property public final String Indeterminate;
+    property public final String NotSelected;
+    property public final String Selected;
+    property public final String Unchecked;
+    field public static final androidx.ui.foundation.Strings! INSTANCE;
+  }
+
+  public final class TableBordersKt {
+    method public static void drawBorders(androidx.ui.layout.TableChildren, androidx.ui.foundation.Border defaultBorder = Border(Color.Black, Dp.Hairline), kotlin.jvm.functions.Function1<? super androidx.ui.foundation.DrawBordersReceiver,kotlin.Unit> block);
+  }
+
+  public final class TextFieldKt {
+    method public static void TextField-QMJQIkg(androidx.ui.foundation.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+  }
+
+  public final class TextFieldValue {
+    ctor public TextFieldValue(String text, androidx.ui.text.TextRange selection);
+    ctor public TextFieldValue();
+    method public String component1();
+    method public androidx.ui.text.TextRange component2();
+    method public androidx.ui.foundation.TextFieldValue copy(String text, androidx.ui.text.TextRange selection);
+    method public androidx.ui.text.TextRange getSelection();
+    method public String getText();
+  }
+
+  public final class TextKt {
+    method public static void ProvideTextStyle(androidx.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Text-7SQZnBs(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, androidx.ui.text.TextStyle style = currentTextStyle(), boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static void Text-oHc3XQk(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, androidx.ui.text.TextStyle style = currentTextStyle(), boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static androidx.ui.text.TextStyle currentTextStyle();
+  }
+
+}
+
+package androidx.ui.foundation.animation {
+
+  public final class AndroidFlingCalculator {
+    ctor public AndroidFlingCalculator(androidx.ui.unit.Density density);
+    method public float flingDistance(float velocity);
+    method public long flingDuration(float velocity);
+    method public androidx.ui.foundation.animation.AndroidFlingCalculator.FlingInfo flingInfo(float velocity);
+    method public androidx.ui.unit.Density getDensity();
+  }
+
+  public static final class AndroidFlingCalculator.FlingInfo {
+    ctor public AndroidFlingCalculator.FlingInfo(float initialVelocity, float distance, long duration);
+    method public float component1();
+    method public float component2();
+    method public long component3();
+    method public androidx.ui.foundation.animation.AndroidFlingCalculator.FlingInfo copy(float initialVelocity, float distance, long duration);
+    method public float getDistance();
+    method public long getDuration();
+    method public float getInitialVelocity();
+    method public float position(long time);
+    method public float velocity(long time);
+  }
+
+  public final class AndroidFlingCalculatorKt {
+  }
+
+  public final class AndroidFlingDecayAnimation implements androidx.animation.DecayAnimation {
+    ctor public AndroidFlingDecayAnimation(androidx.ui.foundation.animation.AndroidFlingCalculator flingCalculator);
+    method public float getAbsVelocityThreshold();
+    method public long getDurationMillis(float start, float startVelocity);
+    method public androidx.ui.foundation.animation.AndroidFlingCalculator getFlingCalculator();
+    method public float getTarget(float start, float startVelocity);
+    method public float getValue(long playTime, float start, float startVelocity);
+    method public float getVelocity(long playTime, float start, float startVelocity);
+    property public float absVelocityThreshold;
+    property public final androidx.ui.foundation.animation.AndroidFlingCalculator flingCalculator;
+  }
+
+  public final class AndroidFlingSpline {
+    method public double deceleration(float velocity, float friction);
+    method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult flingPosition(float time);
+    field public static final androidx.ui.foundation.animation.AndroidFlingSpline! INSTANCE;
+  }
+
+  public static final class AndroidFlingSpline.FlingResult {
+    ctor public AndroidFlingSpline.FlingResult(float distanceCoefficient, float velocityCoefficient);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult copy(float distanceCoefficient, float velocityCoefficient);
+    method public float getDistanceCoefficient();
+    method public float getVelocityCoefficient();
+  }
+
+  public final class AndroidFlingSplineKt {
+  }
+
+  public final class FlingConfig {
+    ctor public FlingConfig(androidx.animation.DecayAnimation decayAnimation, kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd, kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget);
+    method public androidx.animation.DecayAnimation component1();
+    method public kotlin.jvm.functions.Function3<androidx.animation.AnimationEndReason,java.lang.Float,java.lang.Float,kotlin.Unit>? component2();
+    method public kotlin.jvm.functions.Function1<java.lang.Float,androidx.animation.TargetAnimation> component3();
+    method public androidx.ui.foundation.animation.FlingConfig copy(androidx.animation.DecayAnimation decayAnimation, kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd, kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget);
+    method public kotlin.jvm.functions.Function1<java.lang.Float,androidx.animation.TargetAnimation> getAdjustTarget();
+    method public androidx.animation.DecayAnimation getDecayAnimation();
+    method public kotlin.jvm.functions.Function3<androidx.animation.AnimationEndReason,java.lang.Float,java.lang.Float,kotlin.Unit>? getOnAnimationEnd();
+  }
+
+  public final class FlingConfigKt {
+    method public static androidx.ui.foundation.animation.FlingConfig AnchorsFlingConfig(java.util.List<java.lang.Float> anchors, androidx.animation.AnimationBuilder<java.lang.Float> animationBuilder = androidx.animation.PhysicsBuilder(), kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd = null, androidx.animation.DecayAnimation decayAnimation = androidx.animation.ExponentialDecay());
+    method public static androidx.ui.foundation.animation.FlingConfig FlingConfig(kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd = null, kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget = { null });
+    method public static void fling(androidx.animation.AnimatedFloat, androidx.ui.foundation.animation.FlingConfig config, float startVelocity);
+  }
+
+}
+
+package androidx.ui.foundation.gestures {
+
+  public abstract sealed class DragDirection {
+  }
+
+  public static final class DragDirection.Horizontal extends androidx.ui.foundation.gestures.DragDirection {
+    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal! INSTANCE;
+  }
+
+  public static final class DragDirection.Vertical extends androidx.ui.foundation.gestures.DragDirection {
+    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical! INSTANCE;
+  }
+
+  public final class DraggableKt {
+    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, androidx.ui.foundation.InteractionState? interactionState = null, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
+  }
+
+  public final class ScrollableKt {
+    method public static androidx.ui.foundation.gestures.ScrollableState ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onScrollDeltaConsumptionRequested);
+    method public static androidx.ui.core.Modifier scrollable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, androidx.ui.foundation.gestures.ScrollableState scrollableState, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onScrollStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onScrollStopped = {}, boolean enabled = true);
+  }
+
+  public final class ScrollableState {
+    ctor public ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onScrollDeltaConsumptionRequested, androidx.ui.foundation.animation.FlingConfig flingConfig, androidx.animation.AnimationClockObservable animationClock);
+    method public androidx.ui.foundation.animation.FlingConfig getFlingConfig();
+    method public kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> getOnScrollDeltaConsumptionRequested();
+    method public boolean isAnimating();
+    method public void smoothScrollBy(float value, kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super java.lang.Float,kotlin.Unit> onEnd = { _, _ ->  });
+    method public void stopAnimation();
+    property public final boolean isAnimating;
+  }
+
+}
+
+package androidx.ui.foundation.selection {
+
+  public final class MutuallyExclusiveSetItemKt {
+    method public static void MutuallyExclusiveSetItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class ToggleableKt {
+    method public static void Toggleable(boolean value, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static androidx.ui.foundation.selection.ToggleableState ToggleableState(boolean value);
+    method public static void TriStateToggleable(androidx.ui.foundation.selection.ToggleableState state = androidx.ui.foundation.selection.ToggleableState.On, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public enum ToggleableState {
+    enum_constant public static final androidx.ui.foundation.selection.ToggleableState Indeterminate;
+    enum_constant public static final androidx.ui.foundation.selection.ToggleableState Off;
+    enum_constant public static final androidx.ui.foundation.selection.ToggleableState On;
+  }
+
+}
+
+package androidx.ui.foundation.semantics {
+
+  public final class FoundationSemanticsProperties {
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getInMutuallyExclusiveGroup();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSelected();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> getToggleableState();
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> InMutuallyExclusiveGroup;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> ToggleableState;
+    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties! INSTANCE;
+  }
+
+  public final class FoundationSemanticsPropertiesKt {
+    method public static boolean getInMutuallyExclusiveGroup(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getSelected(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.foundation.selection.ToggleableState getToggleableState(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static void setInMutuallyExclusiveGroup(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setSelected(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setToggleableState(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.foundation.selection.ToggleableState p);
+  }
+
+}
+
+package androidx.ui.foundation.shape {
+
+  public final class GenericShape implements androidx.ui.graphics.Shape {
+    ctor public GenericShape(kotlin.jvm.functions.Function2<? super androidx.ui.graphics.Path,? super androidx.ui.unit.PxSize,kotlin.Unit> builder);
+    method public androidx.ui.foundation.shape.GenericShape copy(kotlin.jvm.functions.Function2<? super androidx.ui.graphics.Path,? super androidx.ui.unit.PxSize,kotlin.Unit> builder);
+    method public androidx.ui.graphics.Outline createOutline(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+  }
+
+  public final class RectangleShapeKt {
+    method @Deprecated public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
+}
+
+package androidx.ui.foundation.shape.corner {
+
+  public abstract class CornerBasedShape implements androidx.ui.graphics.Shape {
+    ctor public CornerBasedShape(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public abstract androidx.ui.foundation.shape.corner.CornerBasedShape copy(androidx.ui.foundation.shape.corner.CornerSize topLeft = topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight = topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight = bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft = bottomLeft);
+    method public final androidx.ui.foundation.shape.corner.CornerBasedShape copy(androidx.ui.foundation.shape.corner.CornerSize all);
+    method public final androidx.ui.graphics.Outline createOutline(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+    method public abstract androidx.ui.graphics.Outline createOutline-45bKZN0(androidx.ui.unit.PxSize size, float topLeft, float topRight, float bottomRight, float bottomLeft);
+    method public final androidx.ui.foundation.shape.corner.CornerSize getBottomLeft();
+    method public final androidx.ui.foundation.shape.corner.CornerSize getBottomRight();
+    method public final androidx.ui.foundation.shape.corner.CornerSize getTopLeft();
+    method public final androidx.ui.foundation.shape.corner.CornerSize getTopRight();
+  }
+
+  public interface CornerSize {
+    method public float toPx(androidx.ui.unit.PxSize shapeSize, androidx.ui.unit.Density density);
+  }
+
+  public final class CornerSizeKt {
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize(androidx.ui.unit.Dp size);
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize(@IntRange(from=0, to=50) int percent);
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize(@FloatRange(from=0.0, to=50.0) float percent);
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize-NgWp0Z8(float size);
+    method public static androidx.ui.foundation.shape.corner.CornerSize getZeroCornerSize();
+  }
+
+  public final class CutCornerShape extends androidx.ui.foundation.shape.corner.CornerBasedShape {
+    ctor public CutCornerShape(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.foundation.shape.corner.CutCornerShape copy(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.graphics.Outline createOutline-45bKZN0(androidx.ui.unit.PxSize size, float topLeft, float topRight, float bottomRight, float bottomLeft);
+  }
+
+  public final class CutCornerShapeKt {
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(androidx.ui.foundation.shape.corner.CornerSize corner);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(androidx.ui.unit.Dp size);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(int percent);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(androidx.ui.unit.Dp topLeft = 0.dp, androidx.ui.unit.Dp topRight = 0.dp, androidx.ui.unit.Dp bottomRight = 0.dp, androidx.ui.unit.Dp bottomLeft = 0.dp);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(@IntRange(from=0, to=50) int topLeftPercent = 0, @IntRange(from=0, to=50) int topRightPercent = 0, @IntRange(from=0, to=50) int bottomRightPercent = 0, @IntRange(from=0, to=50) int bottomLeftPercent = 0);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape-NgWp0Z8(float size);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape-wHlpFhg(float topLeft = 0.px, float topRight = 0.px, float bottomRight = 0.px, float bottomLeft = 0.px);
+  }
+
+  public final class RoundedCornerShape extends androidx.ui.foundation.shape.corner.CornerBasedShape {
+    ctor public RoundedCornerShape(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.foundation.shape.corner.RoundedCornerShape copy(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.graphics.Outline createOutline-45bKZN0(androidx.ui.unit.PxSize size, float topLeft, float topRight, float bottomRight, float bottomLeft);
+  }
+
+  public final class RoundedCornerShapeKt {
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(androidx.ui.foundation.shape.corner.CornerSize corner);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(androidx.ui.unit.Dp size);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(int percent);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(androidx.ui.unit.Dp topLeft = 0.dp, androidx.ui.unit.Dp topRight = 0.dp, androidx.ui.unit.Dp bottomRight = 0.dp, androidx.ui.unit.Dp bottomLeft = 0.dp);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(@IntRange(from=0, to=50) int topLeftPercent = 0, @IntRange(from=0, to=50) int topRightPercent = 0, @IntRange(from=0, to=50) int bottomRightPercent = 0, @IntRange(from=0, to=50) int bottomLeftPercent = 0);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape-NgWp0Z8(float size);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape-wHlpFhg(float topLeft = 0.px, float topRight = 0.px, float bottomRight = 0.px, float bottomLeft = 0.px);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape getCircleShape();
+  }
+
+}
+
diff --git a/ui/ui-foundation/api/public_plus_experimental_current.txt b/ui/ui-foundation/api/public_plus_experimental_current.txt
index e829d4d..2d13d9b 100644
--- a/ui/ui-foundation/api/public_plus_experimental_current.txt
+++ b/ui/ui-foundation/api/public_plus_experimental_current.txt
@@ -20,8 +20,8 @@
 
   public final class BoxKt {
     method public static void Box-TInkGdk(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long backgroundColor = Color.Transparent, androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp padding = elvis {
-    @null var var41190502: androidx.ui.unit.Dp = border?.size
-    if (var41190502 != null) var41190502 else 0.dp
+    @null var var411903ba: androidx.ui.unit.Dp = border?.size
+    if (var411903ba != null) var411903ba else 0.dp
 }, androidx.ui.unit.Dp paddingStart = Dp.Unspecified, androidx.ui.unit.Dp paddingTop = Dp.Unspecified, androidx.ui.unit.Dp paddingEnd = Dp.Unspecified, androidx.ui.unit.Dp paddingBottom = Dp.Unspecified, androidx.ui.core.Alignment gravity = ContentGravity.TopStart, kotlin.jvm.functions.Function0<kotlin.Unit> children = emptyContent());
   }
 
@@ -30,7 +30,7 @@
   }
 
   public final class ClickableKt {
-    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, androidx.ui.foundation.InteractionState? interactionState = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ClickableTextKt {
@@ -111,6 +111,26 @@
     method @Deprecated public static void SimpleImage--SSR55g(androidx.ui.graphics.ImageAsset image, long tint = Color.Unset);
   }
 
+  public interface Interaction {
+  }
+
+  public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+  }
+
+  public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+  }
+
+  public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
+    ctor public InteractionState();
+    method public void addInteraction(androidx.ui.foundation.Interaction interaction);
+    method public operator boolean contains(androidx.ui.foundation.Interaction interaction);
+    method public java.util.Set<androidx.ui.foundation.Interaction> getValue();
+    method public void removeInteraction(androidx.ui.foundation.Interaction interaction);
+    property public java.util.Set<androidx.ui.foundation.Interaction> value;
+  }
+
   public final class ScrollerKt {
     method public static void HorizontalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
     method public static androidx.ui.foundation.ScrollerPosition ScrollerPosition(float initial = 0f);
@@ -150,7 +170,7 @@
   }
 
   public final class TextFieldKt {
-    method public static void TextField-QMJQIkg(androidx.ui.foundation.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static void TextField-8MLV-t4(androidx.ui.foundation.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
   }
 
   public final class TextFieldValue {
@@ -261,7 +281,7 @@
   }
 
   public final class DraggableKt {
-    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
+    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, androidx.ui.foundation.InteractionState? interactionState = null, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
   }
 
   public final class ScrollableKt {
@@ -333,7 +353,7 @@
   }
 
   public final class RectangleShapeKt {
-    method public static androidx.ui.graphics.Shape getRectangleShape();
+    method @Deprecated public static androidx.ui.graphics.Shape getRectangleShape();
   }
 
 }
diff --git a/ui/ui-foundation/api/res-0.1.0-dev11.txt b/ui/ui-foundation/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-foundation/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-foundation/api/restricted_0.1.0-dev10.txt b/ui/ui-foundation/api/restricted_0.1.0-dev10.txt
index e829d4d..2d13d9b 100644
--- a/ui/ui-foundation/api/restricted_0.1.0-dev10.txt
+++ b/ui/ui-foundation/api/restricted_0.1.0-dev10.txt
@@ -20,8 +20,8 @@
 
   public final class BoxKt {
     method public static void Box-TInkGdk(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long backgroundColor = Color.Transparent, androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp padding = elvis {
-    @null var var41190502: androidx.ui.unit.Dp = border?.size
-    if (var41190502 != null) var41190502 else 0.dp
+    @null var var411903ba: androidx.ui.unit.Dp = border?.size
+    if (var411903ba != null) var411903ba else 0.dp
 }, androidx.ui.unit.Dp paddingStart = Dp.Unspecified, androidx.ui.unit.Dp paddingTop = Dp.Unspecified, androidx.ui.unit.Dp paddingEnd = Dp.Unspecified, androidx.ui.unit.Dp paddingBottom = Dp.Unspecified, androidx.ui.core.Alignment gravity = ContentGravity.TopStart, kotlin.jvm.functions.Function0<kotlin.Unit> children = emptyContent());
   }
 
@@ -30,7 +30,7 @@
   }
 
   public final class ClickableKt {
-    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, androidx.ui.foundation.InteractionState? interactionState = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ClickableTextKt {
@@ -111,6 +111,26 @@
     method @Deprecated public static void SimpleImage--SSR55g(androidx.ui.graphics.ImageAsset image, long tint = Color.Unset);
   }
 
+  public interface Interaction {
+  }
+
+  public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+  }
+
+  public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+  }
+
+  public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
+    ctor public InteractionState();
+    method public void addInteraction(androidx.ui.foundation.Interaction interaction);
+    method public operator boolean contains(androidx.ui.foundation.Interaction interaction);
+    method public java.util.Set<androidx.ui.foundation.Interaction> getValue();
+    method public void removeInteraction(androidx.ui.foundation.Interaction interaction);
+    property public java.util.Set<androidx.ui.foundation.Interaction> value;
+  }
+
   public final class ScrollerKt {
     method public static void HorizontalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
     method public static androidx.ui.foundation.ScrollerPosition ScrollerPosition(float initial = 0f);
@@ -150,7 +170,7 @@
   }
 
   public final class TextFieldKt {
-    method public static void TextField-QMJQIkg(androidx.ui.foundation.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static void TextField-8MLV-t4(androidx.ui.foundation.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
   }
 
   public final class TextFieldValue {
@@ -261,7 +281,7 @@
   }
 
   public final class DraggableKt {
-    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
+    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, androidx.ui.foundation.InteractionState? interactionState = null, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
   }
 
   public final class ScrollableKt {
@@ -333,7 +353,7 @@
   }
 
   public final class RectangleShapeKt {
-    method public static androidx.ui.graphics.Shape getRectangleShape();
+    method @Deprecated public static androidx.ui.graphics.Shape getRectangleShape();
   }
 
 }
diff --git a/ui/ui-foundation/api/restricted_0.1.0-dev11.txt b/ui/ui-foundation/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..b83981e
--- /dev/null
+++ b/ui/ui-foundation/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,421 @@
+// Signature format: 3.0
+package androidx.ui.foundation {
+
+  public final class AdapterListKt {
+    method public static <T> void AdapterList(java.util.List<? extends T> data, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> itemCallback);
+  }
+
+  public final class Border {
+    ctor public Border(androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.graphics.Brush component2();
+    method public androidx.ui.foundation.Border copy(androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush);
+    method public androidx.ui.graphics.Brush getBrush();
+    method public androidx.ui.unit.Dp getSize();
+  }
+
+  public final class BorderKt {
+    method public static androidx.ui.foundation.Border Border-YSZAjy0(androidx.ui.unit.Dp size, long color);
+  }
+
+  public final class BoxKt {
+    method public static void Box-TInkGdk(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long backgroundColor = Color.Transparent, androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp padding = elvis {
+    @null var var411903ba: androidx.ui.unit.Dp = border?.size
+    if (var411903ba != null) var411903ba else 0.dp
+}, androidx.ui.unit.Dp paddingStart = Dp.Unspecified, androidx.ui.unit.Dp paddingTop = Dp.Unspecified, androidx.ui.unit.Dp paddingEnd = Dp.Unspecified, androidx.ui.unit.Dp paddingBottom = Dp.Unspecified, androidx.ui.core.Alignment gravity = ContentGravity.TopStart, kotlin.jvm.functions.Function0<kotlin.Unit> children = emptyContent());
+  }
+
+  public final class CanvasKt {
+    method public static void Canvas(androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.DrawScope,kotlin.Unit> onCanvas);
+  }
+
+  public final class ClickableKt {
+    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, androidx.ui.foundation.InteractionState? interactionState = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class ClickableTextKt {
+    method public static void ClickableText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {}, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+  }
+
+  public final class ColoredRectKt {
+    method @Deprecated public static void ColoredRect(androidx.ui.graphics.Brush brush, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
+    method @Deprecated public static void ColoredRect-rR94L9Y(long color, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
+  }
+
+  public final class ContentColorKt {
+    method public static long contentColor();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.graphics.Color> getContentColorAmbient();
+  }
+
+  public final class DarkThemeKt {
+    method public static boolean isSystemInDarkTheme();
+  }
+
+  public final class DeterminateProgressIndicatorKt {
+    method public static void DeterminateProgressIndicator(@FloatRange(from=0.0, to=1.0) float progress, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class DialogKt {
+    method public static void Dialog(kotlin.jvm.functions.Function0<kotlin.Unit> onCloseRequest, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class DrawBackground implements androidx.ui.core.DrawModifier {
+    method public androidx.ui.foundation.DrawBackground copy(androidx.ui.graphics.Paint paint, androidx.ui.graphics.Shape shape);
+    method public void draw(androidx.ui.core.ContentDrawScope);
+  }
+
+  public final class DrawBackgroundKt {
+    method @Deprecated public static androidx.ui.foundation.DrawBackground DrawBackground(androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape = RectangleShape);
+    method @Deprecated public static androidx.ui.foundation.DrawBackground DrawBackground-qSsqlCY(long color, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBackground(androidx.ui.core.Modifier, androidx.ui.graphics.Paint paint, androidx.ui.graphics.Shape shape);
+    method public static androidx.ui.core.Modifier drawBackground(androidx.ui.core.Modifier, androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBackground-IZZjS-Q(androidx.ui.core.Modifier, long color, androidx.ui.graphics.Shape shape = RectangleShape);
+  }
+
+  public final class DrawBorder implements androidx.ui.core.DrawModifier {
+    method public void draw(androidx.ui.core.ContentDrawScope);
+  }
+
+  public final class DrawBorderKt {
+    method @Deprecated public static androidx.ui.core.Modifier DrawBorder(androidx.ui.foundation.Border border, androidx.ui.graphics.Shape shape = RectangleShape);
+    method @Deprecated public static androidx.ui.foundation.DrawBorder DrawBorder(androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape);
+    method @Deprecated public static androidx.ui.core.Modifier DrawBorder-Wounw_8(androidx.ui.unit.Dp size, long color, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBorder(androidx.ui.core.Modifier, androidx.ui.foundation.Border border, androidx.ui.graphics.Shape shape = RectangleShape);
+    method public static androidx.ui.core.Modifier drawBorder(androidx.ui.core.Modifier, androidx.ui.unit.Dp size, androidx.ui.graphics.Brush brush, androidx.ui.graphics.Shape shape);
+    method public static androidx.ui.core.Modifier drawBorder-ik3FbJE(androidx.ui.core.Modifier, androidx.ui.unit.Dp size, long color, androidx.ui.graphics.Shape shape = RectangleShape);
+  }
+
+  public final class DrawBordersReceiver {
+    method public void all(androidx.ui.foundation.Border border = defaultBorder);
+    method public void allHorizontal(androidx.ui.foundation.Border border = defaultBorder);
+    method public void allVertical(androidx.ui.foundation.Border border = defaultBorder);
+    method public void bottom(androidx.ui.foundation.Border border = defaultBorder);
+    method public void horizontal(int row, kotlin.ranges.IntRange columns = 0 <other> columnCount, androidx.ui.foundation.Border border = defaultBorder);
+    method public void left(androidx.ui.foundation.Border border = defaultBorder);
+    method public void outer(androidx.ui.foundation.Border border = defaultBorder);
+    method public void right(androidx.ui.foundation.Border border = defaultBorder);
+    method public void top(androidx.ui.foundation.Border border = defaultBorder);
+    method public void vertical(int column, kotlin.ranges.IntRange rows = 0 <other> rowCount, androidx.ui.foundation.Border border = defaultBorder);
+  }
+
+  public final class IconKt {
+    method public static void Icon-A4lfJGc(androidx.ui.graphics.vector.VectorAsset asset, androidx.ui.core.Modifier modifier = Modifier, long tint = contentColor());
+    method public static void Icon-RCipKA8(androidx.ui.graphics.painter.Painter painter, androidx.ui.core.Modifier modifier = Modifier, long tint = contentColor());
+    method public static void Icon-smRaMnI(androidx.ui.graphics.ImageAsset asset, androidx.ui.core.Modifier modifier = Modifier, long tint = contentColor());
+  }
+
+  public final class ImageKt {
+    method public static inline void Image(androidx.ui.graphics.ImageAsset asset, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null);
+    method public static inline void Image(androidx.ui.graphics.vector.VectorAsset asset, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null);
+    method public static void Image(androidx.ui.graphics.painter.Painter painter, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null);
+    method @Deprecated public static void SimpleImage--SSR55g(androidx.ui.graphics.ImageAsset image, long tint = Color.Unset);
+  }
+
+  public interface Interaction {
+  }
+
+  public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+  }
+
+  public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+  }
+
+  public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
+    ctor public InteractionState();
+    method public void addInteraction(androidx.ui.foundation.Interaction interaction);
+    method public operator boolean contains(androidx.ui.foundation.Interaction interaction);
+    method public java.util.Set<androidx.ui.foundation.Interaction> getValue();
+    method public void removeInteraction(androidx.ui.foundation.Interaction interaction);
+    property public java.util.Set<androidx.ui.foundation.Interaction> value;
+  }
+
+  public final class ScrollerKt {
+    method public static void HorizontalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
+    method public static androidx.ui.foundation.ScrollerPosition ScrollerPosition(float initial = 0f);
+    method public static void VerticalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
+  }
+
+  public final class ScrollerPosition {
+    ctor public ScrollerPosition(androidx.ui.foundation.animation.FlingConfig flingConfig, float initial, androidx.animation.AnimationClockObservable animationClock);
+    method public float getMaxPosition();
+    method public float getValue();
+    method public boolean isAnimating();
+    method public void scrollBy(float value);
+    method public void scrollTo(float value);
+    method public void smoothScrollBy(float value, kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super java.lang.Float,kotlin.Unit> onEnd = { _, _ ->  });
+    method public void smoothScrollTo(float value, kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super java.lang.Float,kotlin.Unit> onEnd = { _, _ ->  });
+    property public final boolean isAnimating;
+    property public final float maxPosition;
+    property public final float value;
+  }
+
+  public final class Strings {
+    method public String getChecked();
+    method public String getIndeterminate();
+    method public String getNotSelected();
+    method public String getSelected();
+    method public String getUnchecked();
+    property public final String Checked;
+    property public final String Indeterminate;
+    property public final String NotSelected;
+    property public final String Selected;
+    property public final String Unchecked;
+    field public static final androidx.ui.foundation.Strings! INSTANCE;
+  }
+
+  public final class TableBordersKt {
+    method public static void drawBorders(androidx.ui.layout.TableChildren, androidx.ui.foundation.Border defaultBorder = Border(Color.Black, Dp.Hairline), kotlin.jvm.functions.Function1<? super androidx.ui.foundation.DrawBordersReceiver,kotlin.Unit> block);
+  }
+
+  public final class TextFieldKt {
+    method public static void TextField-QMJQIkg(androidx.ui.foundation.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+  }
+
+  public final class TextFieldValue {
+    ctor public TextFieldValue(String text, androidx.ui.text.TextRange selection);
+    ctor public TextFieldValue();
+    method public String component1();
+    method public androidx.ui.text.TextRange component2();
+    method public androidx.ui.foundation.TextFieldValue copy(String text, androidx.ui.text.TextRange selection);
+    method public androidx.ui.text.TextRange getSelection();
+    method public String getText();
+  }
+
+  public final class TextKt {
+    method public static void ProvideTextStyle(androidx.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Text-7SQZnBs(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, androidx.ui.text.TextStyle style = currentTextStyle(), boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static void Text-oHc3XQk(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, androidx.ui.text.TextStyle style = currentTextStyle(), boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static androidx.ui.text.TextStyle currentTextStyle();
+  }
+
+}
+
+package androidx.ui.foundation.animation {
+
+  public final class AndroidFlingCalculator {
+    ctor public AndroidFlingCalculator(androidx.ui.unit.Density density);
+    method public float flingDistance(float velocity);
+    method public long flingDuration(float velocity);
+    method public androidx.ui.foundation.animation.AndroidFlingCalculator.FlingInfo flingInfo(float velocity);
+    method public androidx.ui.unit.Density getDensity();
+  }
+
+  public static final class AndroidFlingCalculator.FlingInfo {
+    ctor public AndroidFlingCalculator.FlingInfo(float initialVelocity, float distance, long duration);
+    method public float component1();
+    method public float component2();
+    method public long component3();
+    method public androidx.ui.foundation.animation.AndroidFlingCalculator.FlingInfo copy(float initialVelocity, float distance, long duration);
+    method public float getDistance();
+    method public long getDuration();
+    method public float getInitialVelocity();
+    method public float position(long time);
+    method public float velocity(long time);
+  }
+
+  public final class AndroidFlingCalculatorKt {
+  }
+
+  public final class AndroidFlingDecayAnimation implements androidx.animation.DecayAnimation {
+    ctor public AndroidFlingDecayAnimation(androidx.ui.foundation.animation.AndroidFlingCalculator flingCalculator);
+    method public float getAbsVelocityThreshold();
+    method public long getDurationMillis(float start, float startVelocity);
+    method public androidx.ui.foundation.animation.AndroidFlingCalculator getFlingCalculator();
+    method public float getTarget(float start, float startVelocity);
+    method public float getValue(long playTime, float start, float startVelocity);
+    method public float getVelocity(long playTime, float start, float startVelocity);
+    property public float absVelocityThreshold;
+    property public final androidx.ui.foundation.animation.AndroidFlingCalculator flingCalculator;
+  }
+
+  public final class AndroidFlingSpline {
+    method public double deceleration(float velocity, float friction);
+    method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult flingPosition(float time);
+    field public static final androidx.ui.foundation.animation.AndroidFlingSpline! INSTANCE;
+  }
+
+  public static final class AndroidFlingSpline.FlingResult {
+    ctor public AndroidFlingSpline.FlingResult(float distanceCoefficient, float velocityCoefficient);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult copy(float distanceCoefficient, float velocityCoefficient);
+    method public float getDistanceCoefficient();
+    method public float getVelocityCoefficient();
+  }
+
+  public final class AndroidFlingSplineKt {
+  }
+
+  public final class FlingConfig {
+    ctor public FlingConfig(androidx.animation.DecayAnimation decayAnimation, kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd, kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget);
+    method public androidx.animation.DecayAnimation component1();
+    method public kotlin.jvm.functions.Function3<androidx.animation.AnimationEndReason,java.lang.Float,java.lang.Float,kotlin.Unit>? component2();
+    method public kotlin.jvm.functions.Function1<java.lang.Float,androidx.animation.TargetAnimation> component3();
+    method public androidx.ui.foundation.animation.FlingConfig copy(androidx.animation.DecayAnimation decayAnimation, kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd, kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget);
+    method public kotlin.jvm.functions.Function1<java.lang.Float,androidx.animation.TargetAnimation> getAdjustTarget();
+    method public androidx.animation.DecayAnimation getDecayAnimation();
+    method public kotlin.jvm.functions.Function3<androidx.animation.AnimationEndReason,java.lang.Float,java.lang.Float,kotlin.Unit>? getOnAnimationEnd();
+  }
+
+  public final class FlingConfigKt {
+    method public static androidx.ui.foundation.animation.FlingConfig AnchorsFlingConfig(java.util.List<java.lang.Float> anchors, androidx.animation.AnimationBuilder<java.lang.Float> animationBuilder = androidx.animation.PhysicsBuilder(), kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd = null, androidx.animation.DecayAnimation decayAnimation = androidx.animation.ExponentialDecay());
+    method public static androidx.ui.foundation.animation.FlingConfig FlingConfig(kotlin.jvm.functions.Function3<? super androidx.animation.AnimationEndReason,? super java.lang.Float,? super java.lang.Float,kotlin.Unit>? onAnimationEnd = null, kotlin.jvm.functions.Function1<? super java.lang.Float,androidx.animation.TargetAnimation> adjustTarget = { null });
+    method public static void fling(androidx.animation.AnimatedFloat, androidx.ui.foundation.animation.FlingConfig config, float startVelocity);
+  }
+
+}
+
+package androidx.ui.foundation.gestures {
+
+  public abstract sealed class DragDirection {
+  }
+
+  public static final class DragDirection.Horizontal extends androidx.ui.foundation.gestures.DragDirection {
+    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal! INSTANCE;
+  }
+
+  public static final class DragDirection.Vertical extends androidx.ui.foundation.gestures.DragDirection {
+    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical! INSTANCE;
+  }
+
+  public final class DraggableKt {
+    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, androidx.ui.foundation.InteractionState? interactionState = null, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
+  }
+
+  public final class ScrollableKt {
+    method public static androidx.ui.foundation.gestures.ScrollableState ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onScrollDeltaConsumptionRequested);
+    method public static androidx.ui.core.Modifier scrollable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, androidx.ui.foundation.gestures.ScrollableState scrollableState, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onScrollStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onScrollStopped = {}, boolean enabled = true);
+  }
+
+  public final class ScrollableState {
+    ctor public ScrollableState(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onScrollDeltaConsumptionRequested, androidx.ui.foundation.animation.FlingConfig flingConfig, androidx.animation.AnimationClockObservable animationClock);
+    method public androidx.ui.foundation.animation.FlingConfig getFlingConfig();
+    method public kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Float> getOnScrollDeltaConsumptionRequested();
+    method public boolean isAnimating();
+    method public void smoothScrollBy(float value, kotlin.jvm.functions.Function2<? super androidx.animation.AnimationEndReason,? super java.lang.Float,kotlin.Unit> onEnd = { _, _ ->  });
+    method public void stopAnimation();
+    property public final boolean isAnimating;
+  }
+
+}
+
+package androidx.ui.foundation.selection {
+
+  public final class MutuallyExclusiveSetItemKt {
+    method public static void MutuallyExclusiveSetItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class ToggleableKt {
+    method public static void Toggleable(boolean value, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onValueChange, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static androidx.ui.foundation.selection.ToggleableState ToggleableState(boolean value);
+    method public static void TriStateToggleable(androidx.ui.foundation.selection.ToggleableState state = androidx.ui.foundation.selection.ToggleableState.On, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public enum ToggleableState {
+    enum_constant public static final androidx.ui.foundation.selection.ToggleableState Indeterminate;
+    enum_constant public static final androidx.ui.foundation.selection.ToggleableState Off;
+    enum_constant public static final androidx.ui.foundation.selection.ToggleableState On;
+  }
+
+}
+
+package androidx.ui.foundation.semantics {
+
+  public final class FoundationSemanticsProperties {
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getInMutuallyExclusiveGroup();
+    method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSelected();
+    method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> getToggleableState();
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> InMutuallyExclusiveGroup;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
+    property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> ToggleableState;
+    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties! INSTANCE;
+  }
+
+  public final class FoundationSemanticsPropertiesKt {
+    method public static boolean getInMutuallyExclusiveGroup(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getSelected(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.foundation.selection.ToggleableState getToggleableState(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static void setInMutuallyExclusiveGroup(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setSelected(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setToggleableState(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.foundation.selection.ToggleableState p);
+  }
+
+}
+
+package androidx.ui.foundation.shape {
+
+  public final class GenericShape implements androidx.ui.graphics.Shape {
+    ctor public GenericShape(kotlin.jvm.functions.Function2<? super androidx.ui.graphics.Path,? super androidx.ui.unit.PxSize,kotlin.Unit> builder);
+    method public androidx.ui.foundation.shape.GenericShape copy(kotlin.jvm.functions.Function2<? super androidx.ui.graphics.Path,? super androidx.ui.unit.PxSize,kotlin.Unit> builder);
+    method public androidx.ui.graphics.Outline createOutline(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+  }
+
+  public final class RectangleShapeKt {
+    method @Deprecated public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
+}
+
+package androidx.ui.foundation.shape.corner {
+
+  public abstract class CornerBasedShape implements androidx.ui.graphics.Shape {
+    ctor public CornerBasedShape(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public abstract androidx.ui.foundation.shape.corner.CornerBasedShape copy(androidx.ui.foundation.shape.corner.CornerSize topLeft = topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight = topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight = bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft = bottomLeft);
+    method public final androidx.ui.foundation.shape.corner.CornerBasedShape copy(androidx.ui.foundation.shape.corner.CornerSize all);
+    method public final androidx.ui.graphics.Outline createOutline(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+    method public abstract androidx.ui.graphics.Outline createOutline-45bKZN0(androidx.ui.unit.PxSize size, float topLeft, float topRight, float bottomRight, float bottomLeft);
+    method public final androidx.ui.foundation.shape.corner.CornerSize getBottomLeft();
+    method public final androidx.ui.foundation.shape.corner.CornerSize getBottomRight();
+    method public final androidx.ui.foundation.shape.corner.CornerSize getTopLeft();
+    method public final androidx.ui.foundation.shape.corner.CornerSize getTopRight();
+  }
+
+  public interface CornerSize {
+    method public float toPx(androidx.ui.unit.PxSize shapeSize, androidx.ui.unit.Density density);
+  }
+
+  public final class CornerSizeKt {
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize(androidx.ui.unit.Dp size);
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize(@IntRange(from=0, to=50) int percent);
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize(@FloatRange(from=0.0, to=50.0) float percent);
+    method public static androidx.ui.foundation.shape.corner.CornerSize CornerSize-NgWp0Z8(float size);
+    method public static androidx.ui.foundation.shape.corner.CornerSize getZeroCornerSize();
+  }
+
+  public final class CutCornerShape extends androidx.ui.foundation.shape.corner.CornerBasedShape {
+    ctor public CutCornerShape(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.foundation.shape.corner.CutCornerShape copy(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.graphics.Outline createOutline-45bKZN0(androidx.ui.unit.PxSize size, float topLeft, float topRight, float bottomRight, float bottomLeft);
+  }
+
+  public final class CutCornerShapeKt {
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(androidx.ui.foundation.shape.corner.CornerSize corner);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(androidx.ui.unit.Dp size);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(int percent);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(androidx.ui.unit.Dp topLeft = 0.dp, androidx.ui.unit.Dp topRight = 0.dp, androidx.ui.unit.Dp bottomRight = 0.dp, androidx.ui.unit.Dp bottomLeft = 0.dp);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape(@IntRange(from=0, to=50) int topLeftPercent = 0, @IntRange(from=0, to=50) int topRightPercent = 0, @IntRange(from=0, to=50) int bottomRightPercent = 0, @IntRange(from=0, to=50) int bottomLeftPercent = 0);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape-NgWp0Z8(float size);
+    method public static androidx.ui.foundation.shape.corner.CutCornerShape CutCornerShape-wHlpFhg(float topLeft = 0.px, float topRight = 0.px, float bottomRight = 0.px, float bottomLeft = 0.px);
+  }
+
+  public final class RoundedCornerShape extends androidx.ui.foundation.shape.corner.CornerBasedShape {
+    ctor public RoundedCornerShape(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.foundation.shape.corner.RoundedCornerShape copy(androidx.ui.foundation.shape.corner.CornerSize topLeft, androidx.ui.foundation.shape.corner.CornerSize topRight, androidx.ui.foundation.shape.corner.CornerSize bottomRight, androidx.ui.foundation.shape.corner.CornerSize bottomLeft);
+    method public androidx.ui.graphics.Outline createOutline-45bKZN0(androidx.ui.unit.PxSize size, float topLeft, float topRight, float bottomRight, float bottomLeft);
+  }
+
+  public final class RoundedCornerShapeKt {
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(androidx.ui.foundation.shape.corner.CornerSize corner);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(androidx.ui.unit.Dp size);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(int percent);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(androidx.ui.unit.Dp topLeft = 0.dp, androidx.ui.unit.Dp topRight = 0.dp, androidx.ui.unit.Dp bottomRight = 0.dp, androidx.ui.unit.Dp bottomLeft = 0.dp);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape(@IntRange(from=0, to=50) int topLeftPercent = 0, @IntRange(from=0, to=50) int topRightPercent = 0, @IntRange(from=0, to=50) int bottomRightPercent = 0, @IntRange(from=0, to=50) int bottomLeftPercent = 0);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape-NgWp0Z8(float size);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape RoundedCornerShape-wHlpFhg(float topLeft = 0.px, float topRight = 0.px, float bottomRight = 0.px, float bottomLeft = 0.px);
+    method public static androidx.ui.foundation.shape.corner.RoundedCornerShape getCircleShape();
+  }
+
+}
+
diff --git a/ui/ui-foundation/api/restricted_current.txt b/ui/ui-foundation/api/restricted_current.txt
index e829d4d..2d13d9b 100644
--- a/ui/ui-foundation/api/restricted_current.txt
+++ b/ui/ui-foundation/api/restricted_current.txt
@@ -20,8 +20,8 @@
 
   public final class BoxKt {
     method public static void Box-TInkGdk(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long backgroundColor = Color.Transparent, androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp padding = elvis {
-    @null var var41190502: androidx.ui.unit.Dp = border?.size
-    if (var41190502 != null) var41190502 else 0.dp
+    @null var var411903ba: androidx.ui.unit.Dp = border?.size
+    if (var411903ba != null) var411903ba else 0.dp
 }, androidx.ui.unit.Dp paddingStart = Dp.Unspecified, androidx.ui.unit.Dp paddingTop = Dp.Unspecified, androidx.ui.unit.Dp paddingEnd = Dp.Unspecified, androidx.ui.unit.Dp paddingBottom = Dp.Unspecified, androidx.ui.core.Alignment gravity = ContentGravity.TopStart, kotlin.jvm.functions.Function0<kotlin.Unit> children = emptyContent());
   }
 
@@ -30,7 +30,7 @@
   }
 
   public final class ClickableKt {
-    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Clickable(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, String? onClickLabel = null, androidx.ui.foundation.InteractionState? interactionState = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   public final class ClickableTextKt {
@@ -111,6 +111,26 @@
     method @Deprecated public static void SimpleImage--SSR55g(androidx.ui.graphics.ImageAsset image, long tint = Color.Unset);
   }
 
+  public interface Interaction {
+  }
+
+  public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+  }
+
+  public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
+    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+  }
+
+  public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
+    ctor public InteractionState();
+    method public void addInteraction(androidx.ui.foundation.Interaction interaction);
+    method public operator boolean contains(androidx.ui.foundation.Interaction interaction);
+    method public java.util.Set<androidx.ui.foundation.Interaction> getValue();
+    method public void removeInteraction(androidx.ui.foundation.Interaction interaction);
+    property public java.util.Set<androidx.ui.foundation.Interaction> value;
+  }
+
   public final class ScrollerKt {
     method public static void HorizontalScroller(androidx.ui.foundation.ScrollerPosition scrollerPosition = ScrollerPosition(), androidx.ui.core.Modifier modifier = Modifier, boolean isScrollable = true, kotlin.jvm.functions.Function0<kotlin.Unit> child);
     method public static androidx.ui.foundation.ScrollerPosition ScrollerPosition(float initial = 0f);
@@ -150,7 +170,7 @@
   }
 
   public final class TextFieldKt {
-    method public static void TextField-QMJQIkg(androidx.ui.foundation.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+    method public static void TextField-8MLV-t4(androidx.ui.foundation.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
   }
 
   public final class TextFieldValue {
@@ -261,7 +281,7 @@
   }
 
   public final class DraggableKt {
-    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
+    method public static androidx.ui.core.Modifier draggable(androidx.ui.core.Modifier, androidx.ui.foundation.gestures.DragDirection dragDirection, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDragStarted = {}, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onDragStopped = {}, boolean enabled = true, androidx.ui.foundation.InteractionState? interactionState = null, boolean startDragImmediately = false, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> onDragDeltaConsumptionRequested);
   }
 
   public final class ScrollableKt {
@@ -333,7 +353,7 @@
   }
 
   public final class RectangleShapeKt {
-    method public static androidx.ui.graphics.Shape getRectangleShape();
+    method @Deprecated public static androidx.ui.graphics.Shape getRectangleShape();
   }
 
 }
diff --git a/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/FoundationDemos.kt b/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/FoundationDemos.kt
index c579ee1..07791013 100644
--- a/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/FoundationDemos.kt
+++ b/ui/ui-foundation/integration-tests/foundation-demos/src/main/java/androidx/ui/foundation/demos/FoundationDemos.kt
@@ -20,6 +20,7 @@
 import androidx.ui.demos.common.DemoCategory
 import androidx.ui.foundation.samples.ControlledHorizontalScrollerSample
 import androidx.ui.foundation.samples.DialogSample
+import androidx.ui.foundation.samples.InteractionStateSample
 import androidx.ui.foundation.samples.TableWithBorders
 import androidx.ui.foundation.samples.VerticalScrollerSample
 
@@ -31,5 +32,6 @@
     ComposableDemo("Dialog") { DialogSample() },
     ComposableDemo("Draw Modifiers") { DrawModifiersDemo() },
     ComposableDemo("Boxes") { BoxDemo() },
-    DemoCategory("Lists", ListDemos)
+    DemoCategory("Lists", ListDemos),
+    ComposableDemo("InteractionState") { InteractionStateSample() }
 ))
diff --git a/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DrawBackgroundSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DrawBackgroundSamples.kt
index 6a8edb4..d8a4407 100644
--- a/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DrawBackgroundSamples.kt
+++ b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/DrawBackgroundSamples.kt
@@ -21,10 +21,10 @@
 import androidx.ui.core.Modifier
 import androidx.ui.foundation.Text
 import androidx.ui.foundation.drawBackground
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.foundation.shape.corner.CutCornerShape
 import androidx.ui.graphics.Color
 import androidx.ui.graphics.HorizontalGradient
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.layout.padding
 import androidx.ui.unit.dp
 import androidx.ui.unit.px
diff --git a/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/InteractionStateSample.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/InteractionStateSample.kt
new file mode 100644
index 0000000..c5d965f
--- /dev/null
+++ b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/InteractionStateSample.kt
@@ -0,0 +1,79 @@
+/*
+ * 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.ui.foundation.samples
+
+import androidx.annotation.Sampled
+import androidx.compose.Composable
+import androidx.compose.remember
+import androidx.ui.core.Modifier
+import androidx.ui.foundation.Border
+import androidx.ui.foundation.Box
+import androidx.ui.foundation.Clickable
+import androidx.ui.foundation.InteractionState
+import androidx.ui.foundation.Interaction
+import androidx.ui.foundation.Text
+import androidx.ui.foundation.currentTextStyle
+import androidx.ui.foundation.gestures.DragDirection
+import androidx.ui.foundation.gestures.draggable
+import androidx.ui.graphics.Color
+import androidx.ui.layout.fillMaxSize
+import androidx.ui.layout.preferredSize
+import androidx.ui.layout.wrapContentSize
+import androidx.ui.text.style.TextAlign
+import androidx.ui.unit.dp
+
+@Sampled
+@Composable
+fun InteractionStateSample() {
+    val interactionState = remember { InteractionState() }
+
+    val draggable = Modifier.draggable(
+        dragDirection = DragDirection.Horizontal,
+        interactionState = interactionState
+    ) { /* update some business state here */ 0f }
+
+    // Use InteractionState to determine how this component should appear during transient UI states
+    val (text, color) = when {
+        Interaction.Dragged in interactionState -> "Dragged" to Color.Red
+        Interaction.Pressed in interactionState -> "Pressed" to Color.Blue
+        // Default / baseline state
+        else -> "Drag me horizontally, or press me!" to Color.Black
+    }
+
+    Box(Modifier
+        .fillMaxSize()
+        .wrapContentSize()
+        .preferredSize(width = 240.dp, height = 80.dp)
+    ) {
+        Clickable(
+            interactionState = interactionState,
+            onClick = { /* business logic */ }
+        ) {
+            Box(
+                Modifier
+                    .fillMaxSize()
+                    .plus(draggable),
+                border = Border(3.dp, color)
+            ) {
+                Text(
+                    text, style = currentTextStyle().copy(textAlign = TextAlign.Center),
+                    modifier = Modifier.fillMaxSize().wrapContentSize()
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt
index 5e9e52e..6edbb8e 100644
--- a/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt
+++ b/ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/ScrollerSamples.kt
@@ -31,8 +31,8 @@
 import androidx.ui.foundation.Text
 import androidx.ui.foundation.VerticalScroller
 import androidx.ui.foundation.drawBackground
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.layout.Column
 import androidx.ui.layout.Row
 import androidx.ui.layout.Table
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BorderTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BorderTest.kt
index 5e5555f..fc481a4 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BorderTest.kt
+++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BorderTest.kt
@@ -23,10 +23,10 @@
 import androidx.ui.core.DensityAmbient
 import androidx.ui.core.Modifier
 import androidx.ui.core.TestTag
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.foundation.shape.corner.CircleShape
 import androidx.ui.foundation.shape.corner.RoundedCornerShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.Shape
 import androidx.ui.graphics.SolidColor
 import androidx.ui.layout.Stack
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BoxTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BoxTest.kt
index 032bdc3..637ceaf 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BoxTest.kt
+++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/BoxTest.kt
@@ -25,9 +25,9 @@
 import androidx.ui.core.Modifier
 import androidx.ui.core.TestTag
 import androidx.ui.core.onPositioned
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.foundation.shape.corner.CircleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.layout.Stack
 import androidx.ui.layout.fillMaxSize
 import androidx.ui.layout.preferredSize
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/CanvasTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/CanvasTest.kt
index b203bb3..38f9028 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/CanvasTest.kt
+++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/CanvasTest.kt
@@ -24,10 +24,10 @@
 import androidx.ui.core.Modifier
 import androidx.ui.core.TestTag
 import androidx.ui.core.onPositioned
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.foundation.shape.corner.CircleShape
 import androidx.ui.graphics.Color
 import androidx.ui.graphics.Paint
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.layout.Stack
 import androidx.ui.layout.preferredSize
 import androidx.ui.semantics.Semantics
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ClickableTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ClickableTest.kt
index a7044bf..c6ed62e 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ClickableTest.kt
+++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/ClickableTest.kt
@@ -16,6 +16,9 @@
 
 package androidx.ui.foundation
 
+import androidx.compose.getValue
+import androidx.compose.mutableStateOf
+import androidx.compose.setValue
 import androidx.test.filters.MediumTest
 import androidx.ui.core.TestTag
 import androidx.ui.layout.Stack
@@ -111,4 +114,81 @@
             assertThat(counter).isEqualTo(2)
         }
     }
+
+    @Test
+    fun clickableTest_interactionState() {
+        val interactionState = InteractionState()
+
+        composeTestRule.setContent {
+            Stack {
+                TestTag(tag = "myClickable") {
+                    Clickable(onClick = {}, interactionState = interactionState) {
+                        Text("ClickableText")
+                    }
+                }
+            }
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).doesNotContain(Interaction.Pressed)
+        }
+
+        // TODO: b/154498119 simulate press event, replace with gesture injection when supported
+        runOnIdleCompose {
+            interactionState.addInteraction(Interaction.Pressed)
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).contains(Interaction.Pressed)
+        }
+
+        // TODO: b/154498119 simulate press event, replace with gesture injection when supported
+        runOnIdleCompose {
+            interactionState.removeInteraction(Interaction.Pressed)
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).doesNotContain(Interaction.Pressed)
+        }
+    }
+
+    @Test
+    fun clickableTest_interactionState_resetWhenDisposed() {
+        val interactionState = InteractionState()
+        var emitClickableText by mutableStateOf(true)
+
+        composeTestRule.setContent {
+            Stack {
+                TestTag(tag = "myClickable") {
+                    if (emitClickableText) {
+                        Clickable(onClick = {}, interactionState = interactionState) {
+                            Text("ClickableText")
+                        }
+                    }
+                }
+            }
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).doesNotContain(Interaction.Pressed)
+        }
+
+        // TODO: b/154498119 simulate press event, replace with gesture injection when supported
+        runOnIdleCompose {
+            interactionState.addInteraction(Interaction.Pressed)
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).contains(Interaction.Pressed)
+        }
+
+        // Dispose clickable
+        runOnIdleCompose {
+            emitClickableText = false
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).doesNotContain(Interaction.Pressed)
+        }
+    }
 }
\ No newline at end of file
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt
index 8bda42c..db92c21 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt
+++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DraggableTest.kt
@@ -17,7 +17,9 @@
 package androidx.ui.foundation
 
 import androidx.compose.Composable
+import androidx.compose.getValue
 import androidx.compose.mutableStateOf
+import androidx.compose.setValue
 import androidx.test.filters.SmallTest
 import androidx.ui.core.Modifier
 import androidx.ui.core.TestTag
@@ -345,6 +347,82 @@
         }
     }
 
+    @Test
+    fun draggable_interactionState() {
+        val interactionState = InteractionState()
+
+        setDraggableContent {
+            Modifier.draggable(DragDirection.Horizontal, interactionState = interactionState) { 0f }
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).doesNotContain(Interaction.Dragged)
+        }
+
+        // TODO: b/154498119 simulate drag event, replace with gesture injection when supported
+        runOnIdleCompose {
+            interactionState.addInteraction(Interaction.Dragged)
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).contains(Interaction.Dragged)
+        }
+
+        // TODO: b/154498119 simulate drag event, replace with gesture injection when supported
+        runOnIdleCompose {
+            interactionState.removeInteraction(Interaction.Dragged)
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).doesNotContain(Interaction.Dragged)
+        }
+    }
+
+    @Test
+    fun draggable_interactionState_resetWhenDisposed() {
+        val interactionState = InteractionState()
+        var emitDraggableBox by mutableStateOf(true)
+
+        composeTestRule.setContent {
+            Stack {
+                TestTag(draggableBoxTag) {
+                    Semantics(container = true) {
+                        if (emitDraggableBox) {
+                            Box(modifier = Modifier.preferredSize(100.dp)
+                                .draggable(
+                                    DragDirection.Horizontal,
+                                    interactionState = interactionState
+                                ) { 0f }
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).doesNotContain(Interaction.Dragged)
+        }
+
+        // TODO: b/154498119 simulate drag event, replace with gesture injection when supported
+        runOnIdleCompose {
+            interactionState.addInteraction(Interaction.Dragged)
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).contains(Interaction.Dragged)
+        }
+
+        // Dispose draggable
+        runOnIdleCompose {
+            emitDraggableBox = false
+        }
+
+        runOnIdleCompose {
+            assertThat(interactionState.value).doesNotContain(Interaction.Dragged)
+        }
+    }
+
     private fun setDraggableContent(draggableFactory: @Composable() () -> Modifier) {
         composeTestRule.setContent {
             Stack {
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DrawBackgroundTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DrawBackgroundTest.kt
index a1e29eb..8505d8a 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DrawBackgroundTest.kt
+++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/DrawBackgroundTest.kt
@@ -23,9 +23,9 @@
 import androidx.ui.core.DensityAmbient
 import androidx.ui.core.Modifier
 import androidx.ui.core.TestTag
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.foundation.shape.corner.CircleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.SolidColor
 import androidx.ui.layout.Stack
 import androidx.ui.layout.preferredSize
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/TextFieldTest.kt b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/TextFieldTest.kt
index c17e80f..96239b0 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/TextFieldTest.kt
+++ b/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/TextFieldTest.kt
@@ -27,16 +27,22 @@
 import androidx.ui.core.input.FocusManager
 import androidx.ui.core.input.FocusNode
 import androidx.ui.core.input.FocusTransitionObserver
+import androidx.ui.core.onPositioned
 import androidx.ui.input.CommitTextEditOp
 import androidx.ui.input.EditOperation
 import androidx.ui.input.EditorValue
 import androidx.ui.input.TextInputService
+import androidx.ui.layout.Row
 import androidx.ui.layout.fillMaxSize
+import androidx.ui.layout.preferredSize
+import androidx.ui.layout.preferredWidthIn
 import androidx.ui.test.createComposeRule
 import androidx.ui.test.doClick
 import androidx.ui.test.findByTag
 import androidx.ui.test.runOnIdleCompose
 import androidx.ui.text.TextLayoutResult
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.dp
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.argumentCaptor
@@ -122,9 +128,7 @@
             throw RuntimeException("Not implemented")
         }
 
-        override fun blur(client: FocusNode) {
-            throw RuntimeException("Not implemented")
-        }
+        override fun blur(client: FocusNode) {}
     }
 
     @Test
@@ -339,4 +343,76 @@
             assertThat(layoutCaptor.lastValue.layoutInput.text.text).isEqualTo("123")
         }
     }
+
+    @Test
+    fun textField_occupiesAllAvailableSpace() {
+        val parentSize = 300.dp
+        var size: IntPx? = null
+        composeTestRule.setContent {
+            Box(Modifier.preferredSize(parentSize)) {
+                TextField(
+                    value = TextFieldValue(),
+                    onValueChange = {},
+                    modifier = Modifier.onPositioned {
+                        size = it.size.width
+                    }
+                )
+            }
+        }
+
+        with(composeTestRule.density) {
+            assertThat(size).isEqualTo(parentSize.toIntPx())
+        }
+    }
+
+    @Test
+    fun textField_respectsMaxWidthSetByModifier() {
+        val parentSize = 300.dp
+        val textFieldWidth = 100.dp
+        var size: IntPx? = null
+        composeTestRule.setContent {
+            Box(Modifier.preferredSize(parentSize)) {
+                TextField(
+                    value = TextFieldValue(),
+                    onValueChange = {},
+                    modifier = Modifier
+                        .preferredWidthIn(maxWidth = textFieldWidth)
+                        .onPositioned {
+                            size = it.size.width
+                        }
+                )
+            }
+        }
+
+        with(composeTestRule.density) {
+            assertThat(size).isEqualTo(textFieldWidth.toIntPx())
+        }
+    }
+
+    @Test
+    fun textFieldInRow_fixedElementIsVisible() {
+        val parentSize = 300.dp
+        val boxSize = 50.dp
+        var size: IntPx? = null
+        composeTestRule.setContent {
+            Box(Modifier.preferredSize(parentSize)) {
+                Row {
+                    TextField(
+                        value = TextFieldValue(),
+                        onValueChange = {},
+                        modifier = Modifier
+                            .weight(1f)
+                            .onPositioned {
+                                size = it.size.width
+                            }
+                    )
+                    Box(Modifier.preferredSize(boxSize))
+                }
+            }
+        }
+
+        with(composeTestRule.density) {
+            assertThat(size).isEqualTo(parentSize.toIntPx() - boxSize.toIntPx())
+        }
+    }
 }
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/AdapterList.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/AdapterList.kt
index 5ba9119..c12ea31 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/AdapterList.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/AdapterList.kt
@@ -84,6 +84,10 @@
      */
     val measureBlocks = ListMeasureBlocks()
     /**
+     * The layout direction of the [AdapterList]
+     */
+    var layoutDirection: LayoutDirection = LayoutDirection.Ltr
+    /**
      * The index of the first item that is composed into the layout tree
      */
     var firstComposedItem = DataIndex(0)
@@ -224,7 +228,7 @@
         // TODO: axis
         val childConstraints = Constraints(maxWidth = rootNode.width, maxHeight = IntPx.Infinity)
 
-        val childPlaceable = nextItem.measure(childConstraints)
+        val childPlaceable = nextItem.measure(childConstraints, layoutDirection)
         measuredThisPass[nextItemIndex] = true
 
         val childHeight = childPlaceable.height
@@ -282,6 +286,7 @@
 
             val width = constraints.maxWidth.value
             val height = constraints.maxHeight.value
+            this@ListState.layoutDirection = layoutDirection
             // TODO: axis
             val childConstraints = Constraints(maxWidth = width.ipx, maxHeight = IntPx.Infinity)
 
@@ -297,7 +302,7 @@
             while (heightUsed < height && index.value < data.size) {
                 val node = getNodeForDataIndex(index)
                 if (measuredThisPass[index] != true) {
-                    node.measure(childConstraints)
+                    node.measure(childConstraints, layoutDirection)
                     measuredThisPass[index] = true
                 }
                 val childHeight = node.height.value
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Box.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Box.kt
index a83be56..a80e7a9 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Box.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Box.kt
@@ -22,8 +22,8 @@
 import androidx.ui.core.Layout
 import androidx.ui.core.Modifier
 import androidx.ui.core.offset
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.Shape
 import androidx.ui.unit.Dp
 import androidx.ui.unit.IntPxSize
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
index e945f002..7a56c6e 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
@@ -17,12 +17,24 @@
 package androidx.ui.foundation
 
 import androidx.compose.Composable
+import androidx.compose.onDispose
+import androidx.compose.remember
 import androidx.ui.core.Modifier
 import androidx.ui.core.PassThroughLayout
+import androidx.ui.core.PointerEventPass
+import androidx.ui.core.PointerInputChange
+import androidx.ui.core.anyPositionChangeConsumed
+import androidx.ui.core.changedToDown
+import androidx.ui.core.changedToUpIgnoreConsumed
+import androidx.ui.core.gesture.anyPointersInBounds
 import androidx.ui.core.gesture.tapGestureFilter
+import androidx.ui.core.pointerinput.PointerInputFilter
+import androidx.ui.core.pointerinput.PointerInputModifier
 import androidx.ui.semantics.Semantics
 import androidx.ui.semantics.enabled
 import androidx.ui.semantics.onClick
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.PxPosition
 
 /**
  * Combines [tapGestureFilter] and [Semantics] for the clickable
@@ -36,6 +48,9 @@
  * function to a Modifier
  * @param enabled Controls the enabled state. When `false`, this component will not be
  * clickable
+ * @param onClickLabel semantic / accessibility label for the [onClick] action
+ * @param interactionState [InteractionState] that will be updated when this Clickable is
+ * pressed, using [Interaction.Pressed].
  */
 @Composable
 fun Clickable(
@@ -43,6 +58,7 @@
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
     onClickLabel: String? = null,
+    interactionState: InteractionState? = null,
     children: @Composable() () -> Unit
 ) {
     Semantics(
@@ -57,11 +73,98 @@
         // TODO(b/150706555): This layout is temporary and should be removed once Semantics
         //  is implemented with modifiers.
         val tap = if (enabled) {
-            Modifier.tapGestureFilter(onClick)
+            (interactionState?.run {
+                Modifier.noConsumptionIndicatorGestureFilter(
+                    onStart = { addInteraction(Interaction.Pressed) },
+                    onStop = { removeInteraction(Interaction.Pressed) },
+                    onCancel = { removeInteraction(Interaction.Pressed) }
+                )
+            } ?: Modifier).tapGestureFilter(onClick)
         } else {
             Modifier
         }
+        onDispose {
+            interactionState?.removeInteraction(Interaction.Pressed)
+        }
         @Suppress("DEPRECATION")
         PassThroughLayout(modifier + tap, children)
     }
-}
\ No newline at end of file
+}
+
+/**
+ * TODO: b/154589321 remove this
+ * Temporary copy of pressIndicatorGestureFilter that does *not* consume down events.
+ * This is needed so that Ripple can still see the events after clickable does, so that the
+ * Ripple will still show.
+ */
+@Composable
+private fun Modifier.noConsumptionIndicatorGestureFilter(
+    onStart: (PxPosition) -> Unit,
+    onStop: () -> Unit,
+    onCancel: () -> Unit
+): Modifier = this + remember { NoConsumptionIndicatorGestureFilter(onStart, onStop, onCancel) }
+
+/**
+ * Temporary, see [noConsumptionIndicatorGestureFilter]
+ */
+private class NoConsumptionIndicatorGestureFilter(
+    val onStart: (PxPosition) -> Unit,
+    val onStop: () -> Unit,
+    // Rename to avoid clashing with onCancel() function
+    val onCancelCallback: () -> Unit
+) : PointerInputFilter(), PointerInputModifier {
+    override val pointerInputFilter = this
+
+    private var state = State.Idle
+
+    override fun onPointerInput(
+        changes: List<PointerInputChange>,
+        pass: PointerEventPass,
+        bounds: IntPxSize
+    ): List<PointerInputChange> {
+        if (pass == PointerEventPass.PostUp) {
+            if (state == State.Idle && changes.all { it.changedToDown() }) {
+                // If we have not yet started and all of the changes changed to down, we are
+                // starting.
+                state = State.Started
+                onStart(changes.first().current.position!!)
+            } else if (state == State.Started) {
+                if (changes.all { it.changedToUpIgnoreConsumed() }) {
+                    // If we have started and all of the changes changed to up, we are stopping.
+                    state = State.Idle
+                    onStop()
+                } 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
+                    onCancelCallback()
+                }
+            }
+        }
+
+        if (
+            pass == PointerEventPass.PostDown &&
+            state == State.Started &&
+            changes.any { it.anyPositionChangeConsumed() }
+        ) {
+            // On the final pass, if we have started and any of the changes had consumed
+            // position changes, we cancel.
+            state = State.Idle
+            onCancelCallback()
+        }
+
+        return changes
+    }
+
+    override fun onCancel() {
+        if (state == State.Started) {
+            state = State.Idle
+            onCancelCallback()
+        }
+    }
+
+    private enum class State {
+        Idle, Started
+    }
+}
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/DrawBackground.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/DrawBackground.kt
index c474503..75451eb 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/DrawBackground.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/DrawBackground.kt
@@ -21,11 +21,11 @@
 import androidx.ui.core.DrawModifier
 import androidx.ui.core.ContentDrawScope
 import androidx.ui.core.Modifier
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Brush
 import androidx.ui.graphics.Color
 import androidx.ui.graphics.Outline
 import androidx.ui.graphics.Paint
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.Shape
 import androidx.ui.graphics.SolidColor
 import androidx.ui.graphics.drawOutline
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/DrawBorder.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/DrawBorder.kt
index ffcc246..f603cee 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/DrawBorder.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/DrawBorder.kt
@@ -21,7 +21,6 @@
 import androidx.ui.core.DrawModifier
 import androidx.ui.core.ContentDrawScope
 import androidx.ui.core.Modifier
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.geometry.Offset
 import androidx.ui.geometry.Rect
 import androidx.ui.geometry.isSimple
@@ -34,6 +33,7 @@
 import androidx.ui.graphics.PaintingStyle
 import androidx.ui.graphics.Path
 import androidx.ui.graphics.PathOperation
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.Shape
 import androidx.ui.graphics.SolidColor
 import androidx.ui.graphics.addOutline
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/Interaction.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Interaction.kt
new file mode 100644
index 0000000..8941fff
--- /dev/null
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/Interaction.kt
@@ -0,0 +1,50 @@
+/*
+ * 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.ui.foundation
+
+/**
+ * An Interaction represents transient UI state for a component, typically separate from the
+ * actual 'business' state that a component may control. For example, a button typically fires an
+ * `onClick` callback when the button is pressed and released, but it will still want to show
+ * that it is being pressed before this callback is fired. This transient state is represented by
+ * an Interaction, in this case [Pressed]. Using Interactions allows you to build
+ * components that respond to these transient, component-owned state changes.
+ *
+ * The current interactions present on a given component are typically represented with an
+ * [InteractionState]. See [InteractionState] for more information on consuming [Interaction]s,
+ * and associated sample usage.
+ */
+interface Interaction {
+    /**
+     * An interaction corresponding to a dragged state on a component.
+     *
+     * See [androidx.ui.foundation.gestures.draggable]
+     */
+    object Dragged : Interaction
+
+    /**
+     * An interaction corresponding to a pressed state on a component.
+     *
+     * See [Clickable]
+     */
+    object Pressed : Interaction
+
+    /* TODO: b/152525426 add these states
+    object Hovered : Interaction
+    object Focused : Interaction
+     */
+}
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/InteractionState.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/InteractionState.kt
new file mode 100644
index 0000000..28ec892
--- /dev/null
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/InteractionState.kt
@@ -0,0 +1,60 @@
+/*
+ * 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.ui.foundation
+
+import androidx.compose.State
+import androidx.compose.getValue
+import androidx.compose.mutableStateOf
+import androidx.compose.setValue
+
+/**
+ * InteractionState represents a [Set] of [Interaction]s present on a given component. This
+ * allows you to build higher level components comprised of lower level interactions such as
+ * [Clickable] and [androidx.ui.foundation.gestures.draggable], and react to [Interaction]
+ * changes driven by these components in one place.
+ *
+ * Creating an [InteractionState] and passing it to these lower level interactions will cause a
+ * recomposition when there are changes to the state of [Interaction], such as when a [Clickable]
+ * becomes [Interaction.Pressed].
+ *
+ * @sample androidx.ui.foundation.samples.InteractionStateSample
+ */
+class InteractionState : State<Set<Interaction>> {
+    override var value: Set<Interaction> by mutableStateOf(emptySet())
+        private set
+
+    /**
+     * Adds the provided [interaction] to this InteractionState.
+     * Since InteractionState represents a [Set], duplicate [interaction]s will not be added, and
+     * hence will not cause a recomposition.
+     */
+    fun addInteraction(interaction: Interaction) {
+        if (interaction !in this) value = value + interaction
+    }
+
+    /**
+     * Removes the provided [interaction], if it is present, from this InteractionState.
+     */
+    fun removeInteraction(interaction: Interaction) {
+        if (interaction in this) value = value - interaction
+    }
+
+    /**
+     * @return whether the provided [interaction] exists inside this InteractionState.
+     */
+    operator fun contains(interaction: Interaction): Boolean = value.contains(interaction)
+}
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/TextField.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/TextField.kt
index d153ca5..d44b5c5 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/TextField.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/TextField.kt
@@ -27,6 +27,7 @@
 import androidx.ui.input.EditorValue
 import androidx.ui.input.KeyboardType
 import androidx.ui.input.VisualTransformation
+import androidx.ui.layout.fillMaxWidth
 import androidx.ui.text.TextLayoutResult
 import androidx.ui.text.TextRange
 import androidx.ui.text.TextStyle
@@ -69,6 +70,10 @@
  * the input service update the text, selection or cursor, this callback is called with the updated
  * [TextFieldValue]. If you want to observe the composition text, use [TextField] with
  * compositionRange instead.
+ * @param modifier optional [Modifier] for this text field.
+ * By default, text field will occupy all available space granted to it. You can use
+ * [androidx.ui.layout.preferredWidthIn] or [androidx.ui.layout.preferredWidth] modifiers to
+ * constrain the horizontal space occupied by the text field.
  * @param textColor [Color] to apply to the text. If [Color.Unset], and [textStyle] has no color
  * set, this will be [contentColor].
  * @param textStyle Style configuration that applies at character level such as color, font etc.
@@ -98,8 +103,8 @@
 @Composable
 fun TextField(
     value: TextFieldValue,
-    modifier: Modifier = Modifier,
     onValueChange: (TextFieldValue) -> Unit,
+    modifier: Modifier = Modifier,
     textColor: Color = Color.Unset,
     textStyle: TextStyle = currentTextStyle(),
     keyboardType: KeyboardType = KeyboardType.Text,
@@ -127,7 +132,7 @@
 
     CoreTextField(
         value = fullModel.value,
-        modifier = modifier,
+        modifier = modifier.fillMaxWidth(),
         onValueChange = {
             val prevState = fullModel.value
             fullModel.value = it
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/gestures/Draggable.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/gestures/Draggable.kt
index f424c03..237bf35 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/gestures/Draggable.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/gestures/Draggable.kt
@@ -18,10 +18,13 @@
 
 import androidx.animation.AnimatedFloat
 import androidx.compose.Composable
+import androidx.compose.onDispose
 import androidx.compose.remember
 import androidx.ui.core.Modifier
 import androidx.ui.core.gesture.DragObserver
 import androidx.ui.core.gesture.dragGestureFilter
+import androidx.ui.foundation.InteractionState
+import androidx.ui.foundation.Interaction
 import androidx.ui.unit.PxPosition
 import androidx.ui.unit.px
 
@@ -43,16 +46,18 @@
  * @sample androidx.ui.foundation.samples.AnchoredDraggableSample
  *
  * @param dragDirection direction in which drag should be happening
- * @param onDragDeltaConsumptionRequested callback to be invoked when drag occurs. Users must
- * update their state in this lambda and return amount of delta consumed
  * @param onDragStarted callback that will be invoked when drag has been started after touch slop
  * has been passed, with starting position provided
  * @param onDragStopped callback that will be invoked when drag stops, with velocity provided
  * @param enabled whether or not drag is enabled
+ * @param interactionState [InteractionState] that will be updated when this draggable is
+ * being dragged, using [Interaction.Dragged].
  * @param startDragImmediately when set to true, draggable will start dragging immediately and
  * prevent other gesture detectors from reacting to "down" events (in order to block composed
  * press-based gestures).  This is intended to allow end users to "catch" an animating widget by
  * pressing on it. It's useful to set it when value you're dragging is settling / animating.
+ * @param onDragDeltaConsumptionRequested callback to be invoked when drag occurs. Users must
+ * update their state in this lambda and return amount of delta consumed
  */
 @Composable
 fun Modifier.draggable(
@@ -60,17 +65,24 @@
     onDragStarted: (startedPosition: PxPosition) -> Unit = {},
     onDragStopped: (velocity: Float) -> Unit = {},
     enabled: Boolean = true,
+    interactionState: InteractionState? = null,
     startDragImmediately: Boolean = false,
     onDragDeltaConsumptionRequested: (Float) -> Float
 ): Modifier {
     val dragState = remember {
         DraggableState()
     }
+    onDispose {
+        interactionState?.removeInteraction(Interaction.Dragged)
+    }
     return dragGestureFilter(
         dragObserver = object : DragObserver {
 
             override fun onStart(downPosition: PxPosition) {
-                if (enabled) onDragStarted(downPosition)
+                if (enabled) {
+                    interactionState?.addInteraction(Interaction.Dragged)
+                    onDragStarted(downPosition)
+                }
             }
 
             override fun onDrag(dragDistance: PxPosition): PxPosition {
@@ -86,16 +98,21 @@
             }
 
             override fun onCancel() {
-                if (enabled) onDragStopped(0f)
+                if (enabled) {
+                    interactionState?.removeInteraction(Interaction.Dragged)
+                    onDragStopped(0f)
+                }
             }
 
             override fun onStop(velocity: PxPosition) {
-                if (enabled) onDragStopped(dragDirection.project(velocity))
+                if (enabled) {
+                    interactionState?.removeInteraction(Interaction.Dragged)
+                    onDragStopped(dragDirection.project(velocity))
+                }
             }
         },
         canDrag = { direction ->
-            enabled &&
-                    dragDirection.isDraggableInDirection(direction, dragState.value)
+            enabled && dragDirection.isDraggableInDirection(direction, dragState.value)
         },
         startDragImmediately = startDragImmediately
     )
diff --git a/ui/ui-foundation/src/main/java/androidx/ui/foundation/shape/RectangleShape.kt b/ui/ui-foundation/src/main/java/androidx/ui/foundation/shape/RectangleShape.kt
index 64871b0..3804d58 100644
--- a/ui/ui-foundation/src/main/java/androidx/ui/foundation/shape/RectangleShape.kt
+++ b/ui/ui-foundation/src/main/java/androidx/ui/foundation/shape/RectangleShape.kt
@@ -16,16 +16,16 @@
 
 package androidx.ui.foundation.shape
 
-import androidx.ui.graphics.Outline
 import androidx.ui.graphics.Shape
-import androidx.ui.unit.Density
-import androidx.ui.unit.PxSize
-import androidx.ui.unit.toRect
 
 /**
  * A shape describing the rectangle.
  */
-val RectangleShape: Shape = object : Shape {
-    override fun createOutline(size: PxSize, density: Density) =
-        Outline.Rectangle(size.toRect())
-}
+@Deprecated(
+    "Use RectangleShape",
+    replaceWith = ReplaceWith(
+        "RectangleShape",
+        "androidx.ui.graphics.RectangleShape"
+    )
+)
+val RectangleShape: Shape = androidx.ui.graphics.RectangleShape
\ No newline at end of file
diff --git a/ui/ui-foundation/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/ui/ui-foundation/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
deleted file mode 100644
index ca6ee9c..0000000
--- a/ui/ui-foundation/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
+++ /dev/null
@@ -1 +0,0 @@
-mock-maker-inline
\ No newline at end of file
diff --git a/ui/ui-framework/api/0.1.0-dev10.txt b/ui/ui-framework/api/0.1.0-dev10.txt
index 1fef5e9..9686aba 100644
--- a/ui/ui-framework/api/0.1.0-dev10.txt
+++ b/ui/ui-framework/api/0.1.0-dev10.txt
@@ -23,7 +23,7 @@
 
   public final class DrawShadowKt {
     method @Deprecated public static androidx.ui.core.Modifier drawShadow(androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
-    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.unit.Dp elevation, androidx.ui.graphics.Shape shape = RectangleShape, boolean clipToOutline = elevation > 0.dp, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
   }
 
   public enum DropDownAlignment {
@@ -32,7 +32,7 @@
   }
 
   public final class LayoutKt {
-    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static androidx.ui.core.LayoutNode.MeasureBlocks MeasuringIntrinsicsMeasureBlocks(kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method @Deprecated public static void MultiMeasureLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
diff --git a/ui/ui-framework/api/0.1.0-dev11.txt b/ui/ui-framework/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..9686aba
--- /dev/null
+++ b/ui/ui-framework/api/0.1.0-dev11.txt
@@ -0,0 +1,596 @@
+// Signature format: 3.0
+package androidx.compose {
+
+  public final class ComposerCompatKt {
+    method @Deprecated public static androidx.ui.node.UiComposer getComposer();
+  }
+
+}
+
+package androidx.ui.core {
+
+  public final class ClipKt {
+    method public static androidx.ui.core.Modifier clip(androidx.ui.core.Modifier, androidx.ui.graphics.Shape shape);
+    method public static androidx.ui.core.Modifier clipToBounds(androidx.ui.core.Modifier);
+    method @Deprecated public static androidx.ui.core.Modifier drawClip(androidx.ui.graphics.Shape shape);
+    method @Deprecated public static androidx.ui.core.Modifier getDrawClipToBounds();
+  }
+
+  public final class DrawKt {
+    method @Deprecated public static inline void Draw(kotlin.jvm.functions.Function3<? super androidx.ui.unit.Density,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit> onPaint);
+    method @Deprecated public static inline void Draw(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function3<? super androidx.ui.core.ContentDrawScope,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit> onPaint);
+  }
+
+  public final class DrawShadowKt {
+    method @Deprecated public static androidx.ui.core.Modifier drawShadow(androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.unit.Dp elevation, androidx.ui.graphics.Shape shape = RectangleShape, boolean clipToOutline = elevation > 0.dp, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+  }
+
+  public enum DropDownAlignment {
+    enum_constant public static final androidx.ui.core.DropDownAlignment End;
+    enum_constant public static final androidx.ui.core.DropDownAlignment Start;
+  }
+
+  public final class LayoutKt {
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static androidx.ui.core.LayoutNode.MeasureBlocks MeasuringIntrinsicsMeasureBlocks(kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method @Deprecated public static void MultiMeasureLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method @Deprecated public static void PassThroughLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void WithConstraints(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function2<? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,kotlin.Unit> children);
+  }
+
+  public final class LayoutTag implements androidx.ui.core.LayoutTagParentData androidx.ui.core.ParentDataModifier {
+    ctor @Deprecated public LayoutTag(Object tag);
+    method public Object component1();
+    method public androidx.ui.core.LayoutTag copy(Object tag);
+    method public Object getTag();
+    method public Object? modifyParentData(androidx.ui.unit.Density, Object? parentData);
+  }
+
+  public final class LayoutTagKt {
+    method public static Object? getTag(androidx.ui.core.Measurable);
+    method public static androidx.ui.core.Modifier tag(androidx.ui.core.Modifier, Object tag);
+  }
+
+  public interface LayoutTagParentData {
+    method public Object getTag();
+    property public abstract Object tag;
+  }
+
+  public final class OpacityKt {
+    method public static androidx.ui.core.Modifier drawOpacity(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=1.0) float opacity);
+    method @Deprecated public static androidx.ui.core.Modifier drawOpacity(@FloatRange(from=0.0, to=1.0) float opacity);
+  }
+
+  public final class PainterModifierKt {
+    method @Deprecated public static androidx.ui.core.DrawModifier asModifier(androidx.ui.graphics.painter.Painter, boolean sizeToIntrinsics = true, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null, boolean rtl = false);
+    method public static androidx.ui.core.Modifier paint(androidx.ui.core.Modifier, androidx.ui.graphics.painter.Painter painter, boolean sizeToIntrinsics = true, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null, boolean rtl = false);
+  }
+
+  public final class ParentDataKt {
+    method @Deprecated public static inline void ParentData(Object data, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class PointerInputWrapperKt {
+    method public static inline void PointerInput(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler, kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler, kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler = null, kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class PopupKt {
+    method public static void DropdownPopup(androidx.ui.core.DropDownAlignment dropDownAlignment = androidx.ui.core.DropDownAlignment.Start, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Popup(androidx.ui.core.Alignment alignment = Alignment.TopStart, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static boolean isPopupLayout(android.view.View view, String? testTag = null);
+  }
+
+  public final class PopupProperties {
+    ctor public PopupProperties(boolean isFocusable, kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest);
+    ctor public PopupProperties();
+    method public boolean component1();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? component2();
+    method public androidx.ui.core.PopupProperties copy(boolean isFocusable, kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest);
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? getOnDismissRequest();
+    method public boolean isFocusable();
+  }
+
+  public final class TestTagKt {
+    method public static void TestTag(String tag, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class WrapperKt {
+    method public static androidx.compose.ProvidableAmbient<androidx.animation.AnimationClockObservable> getAnimationClockAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.autofill.Autofill> getAutofillAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.autofill.AutofillTree> getAutofillTreeAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
+    method public static androidx.compose.ProvidableAmbient<android.content.res.Configuration> getConfigurationAmbient();
+    method public static androidx.compose.ProvidableAmbient<android.content.Context> getContextAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.input.FocusManager> getFocusManagerAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
+    method @Deprecated public static androidx.compose.ProvidableAmbient<androidx.ui.core.LayoutDirection> getLayoutDirectionAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.lifecycle.LifecycleOwner> getLifecycleOwnerAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
+    method public static androidx.compose.Composition setContent(androidx.activity.ComponentActivity, androidx.compose.Recomposer recomposer = Recomposer.current(), kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @Deprecated public static androidx.compose.Composition setContent(android.app.Activity, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static androidx.compose.Composition setContent(android.view.ViewGroup, androidx.compose.Recomposer recomposer, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @Deprecated public static androidx.compose.Composition setContent(android.view.ViewGroup, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static androidx.compose.Composition setViewContent(android.view.ViewGroup, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public static androidx.compose.Composition setViewContent(android.app.Activity, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method @MainThread public static androidx.compose.Composition subcomposeInto(android.content.Context context, androidx.ui.core.ComponentNode container, androidx.compose.Recomposer recomposer, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method @Deprecated @MainThread public static androidx.compose.Composition subcomposeInto(androidx.ui.core.ComponentNode container, android.content.Context context, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+}
+
+package androidx.ui.core.gesture {
+
+  public final class ConstantsKt {
+    method public static androidx.ui.unit.Duration getDoubleTapMinTime();
+    method public static androidx.ui.unit.Dp getDoubleTapSlop();
+    method public static androidx.ui.unit.Duration getDoubleTapTimeout();
+    method public static androidx.ui.unit.Dp getDoubleTapTouchSlop();
+    method public static androidx.ui.unit.Dp getHoverTapSlop();
+    method public static androidx.ui.unit.Duration getHoverTapTimeout();
+    method public static androidx.ui.unit.Duration getJumpTapTimeout();
+    method public static androidx.ui.unit.Duration getLongPressTimeout();
+    method public static androidx.ui.unit.Dp getMaxFlingVelocity();
+    method public static androidx.ui.unit.Dp getMinFlingVelocity();
+    method public static float getPagingTouchSlop();
+    method public static float getPanSlop();
+    method public static androidx.ui.unit.Duration getPressTimeout();
+    method public static androidx.ui.unit.Dp getScaleSlop();
+    method public static androidx.ui.unit.Dp getTouchSlop();
+    method public static androidx.ui.unit.Dp getWindowTouchSlop();
+    method public static androidx.ui.unit.Duration getZoomControlsTimeout();
+  }
+
+  public final class DoubleTapGestureFilterKt {
+    method public static androidx.ui.core.Modifier doubleTapGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDoubleTap);
+  }
+
+  public final class DragGestureFilterKt {
+    method public static androidx.ui.core.Modifier dragGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.DragObserver dragObserver, kotlin.jvm.functions.Function1<? super androidx.ui.core.Direction,java.lang.Boolean>? canDrag = null, boolean startDragImmediately = false);
+  }
+
+  public interface DragObserver {
+    method public default void onCancel();
+    method public default androidx.ui.unit.PxPosition onDrag(androidx.ui.unit.PxPosition dragDistance);
+    method public default void onStart(androidx.ui.unit.PxPosition downPosition);
+    method public default void onStop(androidx.ui.unit.PxPosition velocity);
+  }
+
+  public final class GestureUtilsKt {
+    method public static boolean anyPointersInBounds(java.util.List<androidx.ui.core.PointerInputChange>, androidx.ui.unit.IntPxSize bounds);
+  }
+
+  public final class LongPressDragGestureFilterKt {
+    method public static androidx.ui.core.Modifier longPressDragGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.LongPressDragObserver longPressDragObserver);
+  }
+
+  public interface LongPressDragObserver {
+    method public default void onCancel();
+    method public default androidx.ui.unit.PxPosition onDrag(androidx.ui.unit.PxPosition dragDistance);
+    method public default void onDragStart();
+    method public default void onLongPress(androidx.ui.unit.PxPosition pxPosition);
+    method public default void onStop(androidx.ui.unit.PxPosition velocity);
+  }
+
+  public final class LongPressFiredEvent implements androidx.ui.core.CustomEvent {
+    field public static final androidx.ui.core.gesture.LongPressFiredEvent! INSTANCE;
+  }
+
+  public final class LongPressGestureFilterKt {
+    method public static androidx.ui.core.Modifier longPressGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onLongPress);
+  }
+
+  public final class PressIndicatorGestureFilterKt {
+    method public static androidx.ui.core.Modifier pressIndicatorGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit>? onStart = null, kotlin.jvm.functions.Function0<kotlin.Unit>? onStop = null, kotlin.jvm.functions.Function0<kotlin.Unit>? onCancel = null, boolean enabled = true);
+  }
+
+  public final class RawDragGestureFilterKt {
+    method public static androidx.ui.core.Modifier rawDragGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.DragObserver dragObserver, kotlin.jvm.functions.Function0<java.lang.Boolean>? canStartDragging = null);
+  }
+
+  public final class RawPressStartGestureFilterKt {
+    method public static androidx.ui.core.Modifier rawPressStartGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onPressStart, boolean enabled = false, androidx.ui.core.PointerEventPass executionPass = PointerEventPass.PostUp);
+  }
+
+  public final class RawScaleGestureFilterKt {
+    method public static androidx.ui.core.Modifier rawScaleGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.RawScaleObserver scaleObserver, kotlin.jvm.functions.Function0<java.lang.Boolean>? canStartScaling = null);
+  }
+
+  public interface RawScaleObserver {
+    method public default void onCancel();
+    method public default float onScale(float scaleFactor);
+    method public default void onStart();
+    method public default void onStop();
+  }
+
+  public final class ScaleGestureFilterKt {
+    method public static androidx.ui.core.Modifier scaleGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.ScaleObserver scaleObserver);
+  }
+
+  public interface ScaleObserver {
+    method public default void onCancel();
+    method public void onScale(float scaleFactor);
+    method public default void onStart();
+    method public default void onStop();
+  }
+
+  public final class ScaleSlopExceededGestureFilterKt {
+    method public static androidx.ui.core.Modifier scaleSlopExceededGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> onScaleSlopExceeded);
+  }
+
+  public final class ScaleUtilKt {
+  }
+
+  public final class TapGestureFilterKt {
+    method public static androidx.ui.core.Modifier tapGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> onTap);
+  }
+
+  public final class TouchSlopExceededGestureFilterKt {
+    method public static androidx.ui.core.Modifier touchSlopExceededGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> onTouchSlopExceeded, kotlin.jvm.functions.Function1<? super androidx.ui.core.Direction,java.lang.Boolean>? canDrag = null);
+  }
+
+}
+
+package androidx.ui.core.gesture.util {
+
+  public final class PolyFitLeastSquaresKt {
+  }
+
+  public final class VelocityTracker {
+    ctor public VelocityTracker();
+    method public void addPosition(androidx.ui.unit.Uptime uptime, androidx.ui.unit.PxPosition position);
+    method public androidx.ui.unit.Velocity calculateVelocity();
+    method public void resetTracking();
+  }
+
+  public final class VelocityTrackerKt {
+  }
+
+}
+
+package androidx.ui.core.input {
+
+  public interface FocusManager {
+    method public void blur(androidx.ui.core.input.FocusNode client);
+    method public void registerFocusNode(String identifier, androidx.ui.core.input.FocusNode node);
+    method public void registerObserver(androidx.ui.core.input.FocusNode node, kotlin.jvm.functions.Function2<? super androidx.ui.core.input.FocusNode,? super androidx.ui.core.input.FocusNode,kotlin.Unit> observer);
+    method public void requestFocus(androidx.ui.core.input.FocusNode client);
+    method public void requestFocusById(String identifier);
+    method public void unregisterFocusNode(String identifier);
+  }
+
+  public final class FocusManagerKt {
+  }
+
+  public final class FocusNode {
+    ctor public FocusNode();
+  }
+
+}
+
+package androidx.ui.core.selection {
+
+  public interface Selectable {
+    method public androidx.ui.unit.PxPosition getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
+    method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
+    method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.unit.PxPosition startPosition, androidx.ui.unit.PxPosition endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
+    method public androidx.ui.text.AnnotatedString getText();
+  }
+
+  public final class Selection {
+    ctor public Selection(androidx.ui.core.selection.Selection.AnchorInfo start, androidx.ui.core.selection.Selection.AnchorInfo end, boolean handlesCrossed);
+    method public androidx.ui.core.selection.Selection.AnchorInfo component1();
+    method public androidx.ui.core.selection.Selection.AnchorInfo component2();
+    method public boolean component3();
+    method public androidx.ui.core.selection.Selection copy(androidx.ui.core.selection.Selection.AnchorInfo start, androidx.ui.core.selection.Selection.AnchorInfo end, boolean handlesCrossed);
+    method public androidx.ui.core.selection.Selection.AnchorInfo getEnd();
+    method public boolean getHandlesCrossed();
+    method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
+    method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
+    method public androidx.ui.text.TextRange toTextRange();
+  }
+
+  public static final class Selection.AnchorInfo {
+    ctor public Selection.AnchorInfo(androidx.ui.text.style.TextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+    method public androidx.ui.text.style.TextDirection component1();
+    method public int component2();
+    method public androidx.ui.core.selection.Selectable component3();
+    method public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.TextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+    method public androidx.ui.text.style.TextDirection getDirection();
+    method public int getOffset();
+    method public androidx.ui.core.selection.Selectable getSelectable();
+  }
+
+  public final class SelectionContainerKt {
+    method public static void SelectionContainer(androidx.ui.core.selection.Selection? selection, kotlin.jvm.functions.Function1<? super androidx.ui.core.selection.Selection,kotlin.Unit> onSelectionChange, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class SelectionHandlesKt {
+  }
+
+  public final class SelectionManagerKt {
+  }
+
+  public interface SelectionRegistrar {
+    method public void onPositionChange();
+    method public androidx.ui.core.selection.Selectable subscribe(androidx.ui.core.selection.Selectable selectable);
+    method public void unsubscribe(androidx.ui.core.selection.Selectable selectable);
+  }
+
+  public final class SelectionRegistrarKt {
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.selection.SelectionRegistrar> getSelectionRegistrarAmbient();
+  }
+
+}
+
+package androidx.ui.focus {
+
+  public final class FocusModifierProviderKt {
+    method public static androidx.ui.focus.FocusModifier FocusModifier();
+    method public static androidx.ui.focus.FocusState getFocusState(androidx.ui.focus.FocusModifier);
+  }
+
+  public final class FocusOperator {
+    ctor public FocusOperator();
+    method public androidx.ui.focus.FocusDetailedState getFocusDetailedState();
+    method public androidx.ui.focus.FocusState getFocusState();
+    method public void requestFocus();
+    property public final androidx.ui.focus.FocusDetailedState focusDetailedState;
+    property public final androidx.ui.focus.FocusState focusState;
+  }
+
+  public final class FocusableKt {
+    method public static void Focusable(androidx.ui.focus.FocusOperator focusOperator = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super androidx.ui.focus.FocusOperator,kotlin.Unit> children);
+  }
+
+}
+
+package androidx.ui.graphics.vector {
+
+  public final class VectorAsset {
+    method public String component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public float component4();
+    method public float component5();
+    method public androidx.ui.graphics.vector.VectorGroup component6();
+    method public androidx.ui.graphics.vector.VectorAsset copy(String name, androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth, float viewportHeight, androidx.ui.graphics.vector.VectorGroup root);
+    method public androidx.ui.unit.Dp getDefaultHeight();
+    method public androidx.ui.unit.Dp getDefaultWidth();
+    method public String getName();
+    method public androidx.ui.graphics.vector.VectorGroup getRoot();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+  }
+
+  public final class VectorAssetBuilder {
+    ctor public VectorAssetBuilder(String name, androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth, float viewportHeight);
+    method public androidx.ui.graphics.vector.VectorAssetBuilder addPath(java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, String name = "", androidx.ui.graphics.Brush? fill = null, float fillAlpha = 1.0f, androidx.ui.graphics.Brush? stroke = null, float strokeAlpha = 1.0f, float strokeLineWidth = 0.0f, androidx.ui.graphics.StrokeCap strokeLineCap = DefaultStrokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin = DefaultStrokeLineJoin, float strokeLineMiter = 4.0f);
+    method public androidx.ui.graphics.vector.VectorAsset build();
+    method public androidx.ui.unit.Dp getDefaultHeight();
+    method public androidx.ui.unit.Dp getDefaultWidth();
+    method public String getName();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+    method public androidx.ui.graphics.vector.VectorAssetBuilder popGroup();
+    method public androidx.ui.graphics.vector.VectorAssetBuilder pushGroup(String name = "", float rotate = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, float scaleX = 1.0f, float scaleY = 1.0f, float translationX = 0.0f, float translationY = 0.0f, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData = EmptyPath);
+  }
+
+  public final class VectorAssetBuilderKt {
+    method public static androidx.ui.graphics.vector.VectorAssetBuilder group(androidx.ui.graphics.vector.VectorAssetBuilder, String name = "", float rotate = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, float scaleX = 1.0f, float scaleY = 1.0f, float translationX = 0.0f, float translationY = 0.0f, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData = EmptyPath, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.VectorAssetBuilder,kotlin.Unit> block);
+    method public static androidx.ui.graphics.vector.VectorAssetBuilder path(androidx.ui.graphics.vector.VectorAssetBuilder, String name = "", androidx.ui.graphics.Brush? fill = null, float fillAlpha = 1.0f, androidx.ui.graphics.Brush? stroke = null, float strokeAlpha = 1.0f, float strokeLineWidth = 0.0f, androidx.ui.graphics.StrokeCap strokeLineCap = DefaultStrokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin = DefaultStrokeLineJoin, float strokeLineMiter = 4.0f, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+  public final class VectorAssetKt {
+    method @Deprecated public static androidx.ui.core.Modifier drawVector-N7QT3do(androidx.ui.graphics.vector.VectorAsset vectorImage, long tintColor = Color.Transparent, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside);
+  }
+
+  public final class VectorComposeKt {
+    method public static void Group(androidx.ui.graphics.vector.VectorScope, String name = "", float rotation = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, float scaleX = 1.0f, float scaleY = 1.0f, float translationX = 0.0f, float translationY = 0.0f, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData = EmptyPath, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.VectorScope,kotlin.Unit> children);
+    method public static void Path(androidx.ui.graphics.vector.VectorScope, java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, String name = "", androidx.ui.graphics.Brush? fill = null, float fillAlpha = 1.0f, androidx.ui.graphics.Brush? stroke = null, float strokeAlpha = 1.0f, float strokeLineWidth = 0.0f, androidx.ui.graphics.StrokeCap strokeLineCap = DefaultStrokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin = DefaultStrokeLineJoin, float strokeLineMiter = 4.0f);
+    method public static androidx.ui.core.Modifier drawVector-DGWccOo(androidx.ui.core.Modifier, float defaultWidth, float defaultHeight, float viewportWidth = defaultWidth.value, float viewportHeight = defaultHeight.value, long tintColor = DefaultTintColor, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = androidx.ui.graphics.vector.VectorComposeKt.DefaultAlignment, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, String name = "", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.Modifier drawVector-coNG3w0(float defaultWidth, float defaultHeight, float viewportWidth = defaultWidth.value, float viewportHeight = defaultHeight.value, long tintColor = DefaultTintColor, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = androidx.ui.graphics.vector.VectorComposeKt.DefaultAlignment, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, String name = "", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.Modifier drawVector-ekZRHcQ(androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth = -1.0f, float viewportHeight = -1.0f, long tintColor = DefaultTintColor, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = androidx.ui.graphics.vector.VectorComposeKt.DefaultAlignment, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, String name = "", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+  }
+
+  public final class VectorGroup extends androidx.ui.graphics.vector.VectorNode implements java.lang.Iterable<androidx.ui.graphics.vector.VectorNode> kotlin.jvm.internal.markers.KMappedMarker {
+    ctor public VectorGroup(String name, float rotation, float pivotX, float pivotY, float scaleX, float scaleY, float translationX, float translationY, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData);
+    ctor public VectorGroup();
+    method public operator androidx.ui.graphics.vector.VectorNode get(int index);
+    method public java.util.List<androidx.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.ui.graphics.vector.VectorNode> iterator();
+    property public final int size;
+  }
+
+  public abstract sealed class VectorNode {
+  }
+
+  public final class VectorPainter extends androidx.ui.graphics.painter.Painter {
+    method public androidx.ui.unit.PxSize getIntrinsicSize();
+    method protected void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+  public final class VectorPainterKt {
+    method public static androidx.ui.graphics.vector.VectorPainter VectorPainter(androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth = Float.NaN, float viewportHeight = Float.NaN, String name = "VectorRootGroup", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+    method public static androidx.ui.graphics.vector.VectorPainter VectorPainter(androidx.ui.graphics.vector.VectorAsset asset);
+    field public static final String RootGroupName = "VectorRootGroup";
+  }
+
+  public final class VectorPath extends androidx.ui.graphics.vector.VectorNode {
+    ctor public VectorPath(String name, java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, androidx.ui.graphics.Brush? fill, float fillAlpha, androidx.ui.graphics.Brush? stroke, float strokeAlpha, float strokeLineWidth, androidx.ui.graphics.StrokeCap strokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin, float strokeLineMiter);
+    method public String component1();
+    method public float component10();
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> component2();
+    method public androidx.ui.graphics.Brush? component3();
+    method public float component4();
+    method public androidx.ui.graphics.Brush? component5();
+    method public float component6();
+    method public float component7();
+    method public androidx.ui.graphics.StrokeCap component8();
+    method public androidx.ui.graphics.StrokeJoin component9();
+    method public androidx.ui.graphics.vector.VectorPath copy(String name, java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, androidx.ui.graphics.Brush? fill, float fillAlpha, androidx.ui.graphics.Brush? stroke, float strokeAlpha, float strokeLineWidth, androidx.ui.graphics.StrokeCap strokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin, float strokeLineMiter);
+    method public androidx.ui.graphics.Brush? getFill();
+    method public float getFillAlpha();
+    method public String getName();
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> getPathData();
+    method public androidx.ui.graphics.Brush? getStroke();
+    method public float getStrokeAlpha();
+    method public androidx.ui.graphics.StrokeCap getStrokeLineCap();
+    method public androidx.ui.graphics.StrokeJoin getStrokeLineJoin();
+    method public float getStrokeLineMiter();
+    method public float getStrokeLineWidth();
+  }
+
+}
+
+package androidx.ui.graphics.vector.compat {
+
+  public final class XmlVectorParserKt {
+  }
+
+}
+
+package androidx.ui.node {
+
+  public final class UiComposer extends androidx.compose.Composer<java.lang.Object> {
+    ctor public UiComposer(android.content.Context context, Object root, androidx.compose.SlotTable slotTable, androidx.compose.Recomposer recomposer);
+    method public inline <T extends android.view.View> void emit(Object key, kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update);
+    method public inline <T extends android.view.ViewGroup> void emit(Object key, kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public inline <T extends androidx.ui.core.ComponentNode> void emit(Object key, kotlin.jvm.functions.Function0<? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update);
+    method public inline <T extends androidx.ui.core.ComponentNode> void emit(Object key, kotlin.jvm.functions.Function0<? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public android.content.Context getContext();
+    method public Object getRoot();
+  }
+
+  public final class UiComposerKt {
+  }
+
+  public final class ViewInteropKt {
+  }
+
+}
+
+package androidx.ui.res {
+
+  public final class ColorResourcesKt {
+    method public static long colorResource(@ColorRes int id);
+  }
+
+  public final class DeferredResource<T> {
+    method public androidx.ui.res.Resource<T> getResource();
+    property public final androidx.ui.res.Resource<T> resource;
+  }
+
+  public final class FailedResource<T> extends androidx.ui.res.Resource<T> {
+    ctor public FailedResource(T? resource, Throwable? throwable);
+    method public Throwable? getThrowable();
+  }
+
+  public final class FontResourcesKt {
+    method public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
+    method public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
+    method public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+  }
+
+  public final class ImageResourcesKt {
+    method public static androidx.ui.graphics.ImageAsset imageResource(@DrawableRes int id);
+    method public static androidx.ui.res.DeferredResource<androidx.ui.graphics.ImageAsset> loadImageResource(int id, androidx.ui.graphics.ImageAsset? pendingImage = null, androidx.ui.graphics.ImageAsset? failedImage = null);
+  }
+
+  public final class LoadedResource<T> extends androidx.ui.res.Resource<T> {
+    ctor public LoadedResource(T! resource);
+  }
+
+  public final class PendingResource<T> extends androidx.ui.res.Resource<T> {
+    ctor public PendingResource(T? resource);
+  }
+
+  public final class PrimitiveResourcesKt {
+    method public static boolean booleanResource(@BoolRes int id);
+    method public static androidx.ui.unit.Dp dimensionResource(@DimenRes int id);
+    method public static int[] integerArrayResource(@ArrayRes int id);
+    method public static int integerResource(@IntegerRes int id);
+  }
+
+  public abstract sealed class Resource<T> {
+    method public final T? getResource();
+  }
+
+  public final class ResourcesKt {
+  }
+
+  public final class StringResourcesKt {
+    method public static String![] stringArrayResource(@ArrayRes int id);
+    method public static String stringResource(@StringRes int id);
+    method public static String stringResource(@StringRes int id, java.lang.Object... formatArgs);
+  }
+
+  public final class VectorResourcesKt {
+    method public static androidx.ui.res.DeferredResource<androidx.ui.graphics.vector.VectorAsset> loadVectorResource(int id, androidx.ui.graphics.vector.VectorAsset? pendingResource = null, androidx.ui.graphics.vector.VectorAsset? failedResource = null);
+    method public static androidx.ui.graphics.vector.VectorAsset vectorResource(@DrawableRes int id);
+  }
+
+}
+
+package androidx.ui.semantics {
+
+  public final class SemanticsKt {
+    method public static void Semantics(boolean container = false, boolean mergeAllDescendants = false, kotlin.jvm.functions.Function1<? super androidx.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit>? properties = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class SemanticsPropertiesKt {
+    method public static void ScrollTo(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function2<? super androidx.ui.unit.Px,? super androidx.ui.unit.Px,kotlin.Unit> action);
+    method public static String getAccessibilityLabel(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getAccessibilityValue(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.semantics.AccessibilityRangeInfo getAccessibilityValueRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getEnabled(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getHidden(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>> getOnClick(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>> getScrollTo(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method public static void setAccessibilityLabel(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setAccessibilityValue(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setAccessibilityValueRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.semantics.AccessibilityRangeInfo p);
+    method public static void setCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver, java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> p);
+    method public static void setEnabled(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setHidden(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setOnClick(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>> p);
+    method public static void setScrollTo(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>> p);
+    method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
+  }
+
+}
+
+package androidx.ui.tooling {
+
+  public final class InspectionModeKt {
+    method public static androidx.compose.ProvidableAmbient<java.lang.Boolean> getInspectionMode();
+  }
+
+}
+
+package androidx.ui.viewinterop {
+
+  public final class ComposedViewKt {
+    method public static void AndroidView(@LayoutRes int resId, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> postInflationCallback = { _ ->  });
+  }
+
+}
+
diff --git a/ui/ui-framework/api/current.txt b/ui/ui-framework/api/current.txt
index 1fef5e9..9686aba 100644
--- a/ui/ui-framework/api/current.txt
+++ b/ui/ui-framework/api/current.txt
@@ -23,7 +23,7 @@
 
   public final class DrawShadowKt {
     method @Deprecated public static androidx.ui.core.Modifier drawShadow(androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
-    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.unit.Dp elevation, androidx.ui.graphics.Shape shape = RectangleShape, boolean clipToOutline = elevation > 0.dp, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
   }
 
   public enum DropDownAlignment {
@@ -32,7 +32,7 @@
   }
 
   public final class LayoutKt {
-    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static androidx.ui.core.LayoutNode.MeasureBlocks MeasuringIntrinsicsMeasureBlocks(kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method @Deprecated public static void MultiMeasureLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
diff --git a/ui/ui-framework/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-framework/api/public_plus_experimental_0.1.0-dev10.txt
index 1fef5e9..9686aba 100644
--- a/ui/ui-framework/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/ui/ui-framework/api/public_plus_experimental_0.1.0-dev10.txt
@@ -23,7 +23,7 @@
 
   public final class DrawShadowKt {
     method @Deprecated public static androidx.ui.core.Modifier drawShadow(androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
-    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.unit.Dp elevation, androidx.ui.graphics.Shape shape = RectangleShape, boolean clipToOutline = elevation > 0.dp, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
   }
 
   public enum DropDownAlignment {
@@ -32,7 +32,7 @@
   }
 
   public final class LayoutKt {
-    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static androidx.ui.core.LayoutNode.MeasureBlocks MeasuringIntrinsicsMeasureBlocks(kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method @Deprecated public static void MultiMeasureLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
diff --git a/ui/ui-framework/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-framework/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..9686aba
--- /dev/null
+++ b/ui/ui-framework/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,596 @@
+// Signature format: 3.0
+package androidx.compose {
+
+  public final class ComposerCompatKt {
+    method @Deprecated public static androidx.ui.node.UiComposer getComposer();
+  }
+
+}
+
+package androidx.ui.core {
+
+  public final class ClipKt {
+    method public static androidx.ui.core.Modifier clip(androidx.ui.core.Modifier, androidx.ui.graphics.Shape shape);
+    method public static androidx.ui.core.Modifier clipToBounds(androidx.ui.core.Modifier);
+    method @Deprecated public static androidx.ui.core.Modifier drawClip(androidx.ui.graphics.Shape shape);
+    method @Deprecated public static androidx.ui.core.Modifier getDrawClipToBounds();
+  }
+
+  public final class DrawKt {
+    method @Deprecated public static inline void Draw(kotlin.jvm.functions.Function3<? super androidx.ui.unit.Density,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit> onPaint);
+    method @Deprecated public static inline void Draw(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function3<? super androidx.ui.core.ContentDrawScope,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit> onPaint);
+  }
+
+  public final class DrawShadowKt {
+    method @Deprecated public static androidx.ui.core.Modifier drawShadow(androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.unit.Dp elevation, androidx.ui.graphics.Shape shape = RectangleShape, boolean clipToOutline = elevation > 0.dp, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+  }
+
+  public enum DropDownAlignment {
+    enum_constant public static final androidx.ui.core.DropDownAlignment End;
+    enum_constant public static final androidx.ui.core.DropDownAlignment Start;
+  }
+
+  public final class LayoutKt {
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static androidx.ui.core.LayoutNode.MeasureBlocks MeasuringIntrinsicsMeasureBlocks(kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method @Deprecated public static void MultiMeasureLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method @Deprecated public static void PassThroughLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void WithConstraints(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function2<? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,kotlin.Unit> children);
+  }
+
+  public final class LayoutTag implements androidx.ui.core.LayoutTagParentData androidx.ui.core.ParentDataModifier {
+    ctor @Deprecated public LayoutTag(Object tag);
+    method public Object component1();
+    method public androidx.ui.core.LayoutTag copy(Object tag);
+    method public Object getTag();
+    method public Object? modifyParentData(androidx.ui.unit.Density, Object? parentData);
+  }
+
+  public final class LayoutTagKt {
+    method public static Object? getTag(androidx.ui.core.Measurable);
+    method public static androidx.ui.core.Modifier tag(androidx.ui.core.Modifier, Object tag);
+  }
+
+  public interface LayoutTagParentData {
+    method public Object getTag();
+    property public abstract Object tag;
+  }
+
+  public final class OpacityKt {
+    method public static androidx.ui.core.Modifier drawOpacity(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=1.0) float opacity);
+    method @Deprecated public static androidx.ui.core.Modifier drawOpacity(@FloatRange(from=0.0, to=1.0) float opacity);
+  }
+
+  public final class PainterModifierKt {
+    method @Deprecated public static androidx.ui.core.DrawModifier asModifier(androidx.ui.graphics.painter.Painter, boolean sizeToIntrinsics = true, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null, boolean rtl = false);
+    method public static androidx.ui.core.Modifier paint(androidx.ui.core.Modifier, androidx.ui.graphics.painter.Painter painter, boolean sizeToIntrinsics = true, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null, boolean rtl = false);
+  }
+
+  public final class ParentDataKt {
+    method @Deprecated public static inline void ParentData(Object data, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class PointerInputWrapperKt {
+    method public static inline void PointerInput(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler, kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler, kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler = null, kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class PopupKt {
+    method public static void DropdownPopup(androidx.ui.core.DropDownAlignment dropDownAlignment = androidx.ui.core.DropDownAlignment.Start, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Popup(androidx.ui.core.Alignment alignment = Alignment.TopStart, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static boolean isPopupLayout(android.view.View view, String? testTag = null);
+  }
+
+  public final class PopupProperties {
+    ctor public PopupProperties(boolean isFocusable, kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest);
+    ctor public PopupProperties();
+    method public boolean component1();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? component2();
+    method public androidx.ui.core.PopupProperties copy(boolean isFocusable, kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest);
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? getOnDismissRequest();
+    method public boolean isFocusable();
+  }
+
+  public final class TestTagKt {
+    method public static void TestTag(String tag, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class WrapperKt {
+    method public static androidx.compose.ProvidableAmbient<androidx.animation.AnimationClockObservable> getAnimationClockAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.autofill.Autofill> getAutofillAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.autofill.AutofillTree> getAutofillTreeAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
+    method public static androidx.compose.ProvidableAmbient<android.content.res.Configuration> getConfigurationAmbient();
+    method public static androidx.compose.ProvidableAmbient<android.content.Context> getContextAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.input.FocusManager> getFocusManagerAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
+    method @Deprecated public static androidx.compose.ProvidableAmbient<androidx.ui.core.LayoutDirection> getLayoutDirectionAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.lifecycle.LifecycleOwner> getLifecycleOwnerAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
+    method public static androidx.compose.Composition setContent(androidx.activity.ComponentActivity, androidx.compose.Recomposer recomposer = Recomposer.current(), kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @Deprecated public static androidx.compose.Composition setContent(android.app.Activity, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static androidx.compose.Composition setContent(android.view.ViewGroup, androidx.compose.Recomposer recomposer, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @Deprecated public static androidx.compose.Composition setContent(android.view.ViewGroup, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static androidx.compose.Composition setViewContent(android.view.ViewGroup, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public static androidx.compose.Composition setViewContent(android.app.Activity, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method @MainThread public static androidx.compose.Composition subcomposeInto(android.content.Context context, androidx.ui.core.ComponentNode container, androidx.compose.Recomposer recomposer, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method @Deprecated @MainThread public static androidx.compose.Composition subcomposeInto(androidx.ui.core.ComponentNode container, android.content.Context context, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+}
+
+package androidx.ui.core.gesture {
+
+  public final class ConstantsKt {
+    method public static androidx.ui.unit.Duration getDoubleTapMinTime();
+    method public static androidx.ui.unit.Dp getDoubleTapSlop();
+    method public static androidx.ui.unit.Duration getDoubleTapTimeout();
+    method public static androidx.ui.unit.Dp getDoubleTapTouchSlop();
+    method public static androidx.ui.unit.Dp getHoverTapSlop();
+    method public static androidx.ui.unit.Duration getHoverTapTimeout();
+    method public static androidx.ui.unit.Duration getJumpTapTimeout();
+    method public static androidx.ui.unit.Duration getLongPressTimeout();
+    method public static androidx.ui.unit.Dp getMaxFlingVelocity();
+    method public static androidx.ui.unit.Dp getMinFlingVelocity();
+    method public static float getPagingTouchSlop();
+    method public static float getPanSlop();
+    method public static androidx.ui.unit.Duration getPressTimeout();
+    method public static androidx.ui.unit.Dp getScaleSlop();
+    method public static androidx.ui.unit.Dp getTouchSlop();
+    method public static androidx.ui.unit.Dp getWindowTouchSlop();
+    method public static androidx.ui.unit.Duration getZoomControlsTimeout();
+  }
+
+  public final class DoubleTapGestureFilterKt {
+    method public static androidx.ui.core.Modifier doubleTapGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDoubleTap);
+  }
+
+  public final class DragGestureFilterKt {
+    method public static androidx.ui.core.Modifier dragGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.DragObserver dragObserver, kotlin.jvm.functions.Function1<? super androidx.ui.core.Direction,java.lang.Boolean>? canDrag = null, boolean startDragImmediately = false);
+  }
+
+  public interface DragObserver {
+    method public default void onCancel();
+    method public default androidx.ui.unit.PxPosition onDrag(androidx.ui.unit.PxPosition dragDistance);
+    method public default void onStart(androidx.ui.unit.PxPosition downPosition);
+    method public default void onStop(androidx.ui.unit.PxPosition velocity);
+  }
+
+  public final class GestureUtilsKt {
+    method public static boolean anyPointersInBounds(java.util.List<androidx.ui.core.PointerInputChange>, androidx.ui.unit.IntPxSize bounds);
+  }
+
+  public final class LongPressDragGestureFilterKt {
+    method public static androidx.ui.core.Modifier longPressDragGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.LongPressDragObserver longPressDragObserver);
+  }
+
+  public interface LongPressDragObserver {
+    method public default void onCancel();
+    method public default androidx.ui.unit.PxPosition onDrag(androidx.ui.unit.PxPosition dragDistance);
+    method public default void onDragStart();
+    method public default void onLongPress(androidx.ui.unit.PxPosition pxPosition);
+    method public default void onStop(androidx.ui.unit.PxPosition velocity);
+  }
+
+  public final class LongPressFiredEvent implements androidx.ui.core.CustomEvent {
+    field public static final androidx.ui.core.gesture.LongPressFiredEvent! INSTANCE;
+  }
+
+  public final class LongPressGestureFilterKt {
+    method public static androidx.ui.core.Modifier longPressGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onLongPress);
+  }
+
+  public final class PressIndicatorGestureFilterKt {
+    method public static androidx.ui.core.Modifier pressIndicatorGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit>? onStart = null, kotlin.jvm.functions.Function0<kotlin.Unit>? onStop = null, kotlin.jvm.functions.Function0<kotlin.Unit>? onCancel = null, boolean enabled = true);
+  }
+
+  public final class RawDragGestureFilterKt {
+    method public static androidx.ui.core.Modifier rawDragGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.DragObserver dragObserver, kotlin.jvm.functions.Function0<java.lang.Boolean>? canStartDragging = null);
+  }
+
+  public final class RawPressStartGestureFilterKt {
+    method public static androidx.ui.core.Modifier rawPressStartGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onPressStart, boolean enabled = false, androidx.ui.core.PointerEventPass executionPass = PointerEventPass.PostUp);
+  }
+
+  public final class RawScaleGestureFilterKt {
+    method public static androidx.ui.core.Modifier rawScaleGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.RawScaleObserver scaleObserver, kotlin.jvm.functions.Function0<java.lang.Boolean>? canStartScaling = null);
+  }
+
+  public interface RawScaleObserver {
+    method public default void onCancel();
+    method public default float onScale(float scaleFactor);
+    method public default void onStart();
+    method public default void onStop();
+  }
+
+  public final class ScaleGestureFilterKt {
+    method public static androidx.ui.core.Modifier scaleGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.ScaleObserver scaleObserver);
+  }
+
+  public interface ScaleObserver {
+    method public default void onCancel();
+    method public void onScale(float scaleFactor);
+    method public default void onStart();
+    method public default void onStop();
+  }
+
+  public final class ScaleSlopExceededGestureFilterKt {
+    method public static androidx.ui.core.Modifier scaleSlopExceededGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> onScaleSlopExceeded);
+  }
+
+  public final class ScaleUtilKt {
+  }
+
+  public final class TapGestureFilterKt {
+    method public static androidx.ui.core.Modifier tapGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> onTap);
+  }
+
+  public final class TouchSlopExceededGestureFilterKt {
+    method public static androidx.ui.core.Modifier touchSlopExceededGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> onTouchSlopExceeded, kotlin.jvm.functions.Function1<? super androidx.ui.core.Direction,java.lang.Boolean>? canDrag = null);
+  }
+
+}
+
+package androidx.ui.core.gesture.util {
+
+  public final class PolyFitLeastSquaresKt {
+  }
+
+  public final class VelocityTracker {
+    ctor public VelocityTracker();
+    method public void addPosition(androidx.ui.unit.Uptime uptime, androidx.ui.unit.PxPosition position);
+    method public androidx.ui.unit.Velocity calculateVelocity();
+    method public void resetTracking();
+  }
+
+  public final class VelocityTrackerKt {
+  }
+
+}
+
+package androidx.ui.core.input {
+
+  public interface FocusManager {
+    method public void blur(androidx.ui.core.input.FocusNode client);
+    method public void registerFocusNode(String identifier, androidx.ui.core.input.FocusNode node);
+    method public void registerObserver(androidx.ui.core.input.FocusNode node, kotlin.jvm.functions.Function2<? super androidx.ui.core.input.FocusNode,? super androidx.ui.core.input.FocusNode,kotlin.Unit> observer);
+    method public void requestFocus(androidx.ui.core.input.FocusNode client);
+    method public void requestFocusById(String identifier);
+    method public void unregisterFocusNode(String identifier);
+  }
+
+  public final class FocusManagerKt {
+  }
+
+  public final class FocusNode {
+    ctor public FocusNode();
+  }
+
+}
+
+package androidx.ui.core.selection {
+
+  public interface Selectable {
+    method public androidx.ui.unit.PxPosition getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
+    method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
+    method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.unit.PxPosition startPosition, androidx.ui.unit.PxPosition endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
+    method public androidx.ui.text.AnnotatedString getText();
+  }
+
+  public final class Selection {
+    ctor public Selection(androidx.ui.core.selection.Selection.AnchorInfo start, androidx.ui.core.selection.Selection.AnchorInfo end, boolean handlesCrossed);
+    method public androidx.ui.core.selection.Selection.AnchorInfo component1();
+    method public androidx.ui.core.selection.Selection.AnchorInfo component2();
+    method public boolean component3();
+    method public androidx.ui.core.selection.Selection copy(androidx.ui.core.selection.Selection.AnchorInfo start, androidx.ui.core.selection.Selection.AnchorInfo end, boolean handlesCrossed);
+    method public androidx.ui.core.selection.Selection.AnchorInfo getEnd();
+    method public boolean getHandlesCrossed();
+    method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
+    method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
+    method public androidx.ui.text.TextRange toTextRange();
+  }
+
+  public static final class Selection.AnchorInfo {
+    ctor public Selection.AnchorInfo(androidx.ui.text.style.TextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+    method public androidx.ui.text.style.TextDirection component1();
+    method public int component2();
+    method public androidx.ui.core.selection.Selectable component3();
+    method public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.TextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+    method public androidx.ui.text.style.TextDirection getDirection();
+    method public int getOffset();
+    method public androidx.ui.core.selection.Selectable getSelectable();
+  }
+
+  public final class SelectionContainerKt {
+    method public static void SelectionContainer(androidx.ui.core.selection.Selection? selection, kotlin.jvm.functions.Function1<? super androidx.ui.core.selection.Selection,kotlin.Unit> onSelectionChange, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class SelectionHandlesKt {
+  }
+
+  public final class SelectionManagerKt {
+  }
+
+  public interface SelectionRegistrar {
+    method public void onPositionChange();
+    method public androidx.ui.core.selection.Selectable subscribe(androidx.ui.core.selection.Selectable selectable);
+    method public void unsubscribe(androidx.ui.core.selection.Selectable selectable);
+  }
+
+  public final class SelectionRegistrarKt {
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.selection.SelectionRegistrar> getSelectionRegistrarAmbient();
+  }
+
+}
+
+package androidx.ui.focus {
+
+  public final class FocusModifierProviderKt {
+    method public static androidx.ui.focus.FocusModifier FocusModifier();
+    method public static androidx.ui.focus.FocusState getFocusState(androidx.ui.focus.FocusModifier);
+  }
+
+  public final class FocusOperator {
+    ctor public FocusOperator();
+    method public androidx.ui.focus.FocusDetailedState getFocusDetailedState();
+    method public androidx.ui.focus.FocusState getFocusState();
+    method public void requestFocus();
+    property public final androidx.ui.focus.FocusDetailedState focusDetailedState;
+    property public final androidx.ui.focus.FocusState focusState;
+  }
+
+  public final class FocusableKt {
+    method public static void Focusable(androidx.ui.focus.FocusOperator focusOperator = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super androidx.ui.focus.FocusOperator,kotlin.Unit> children);
+  }
+
+}
+
+package androidx.ui.graphics.vector {
+
+  public final class VectorAsset {
+    method public String component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public float component4();
+    method public float component5();
+    method public androidx.ui.graphics.vector.VectorGroup component6();
+    method public androidx.ui.graphics.vector.VectorAsset copy(String name, androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth, float viewportHeight, androidx.ui.graphics.vector.VectorGroup root);
+    method public androidx.ui.unit.Dp getDefaultHeight();
+    method public androidx.ui.unit.Dp getDefaultWidth();
+    method public String getName();
+    method public androidx.ui.graphics.vector.VectorGroup getRoot();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+  }
+
+  public final class VectorAssetBuilder {
+    ctor public VectorAssetBuilder(String name, androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth, float viewportHeight);
+    method public androidx.ui.graphics.vector.VectorAssetBuilder addPath(java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, String name = "", androidx.ui.graphics.Brush? fill = null, float fillAlpha = 1.0f, androidx.ui.graphics.Brush? stroke = null, float strokeAlpha = 1.0f, float strokeLineWidth = 0.0f, androidx.ui.graphics.StrokeCap strokeLineCap = DefaultStrokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin = DefaultStrokeLineJoin, float strokeLineMiter = 4.0f);
+    method public androidx.ui.graphics.vector.VectorAsset build();
+    method public androidx.ui.unit.Dp getDefaultHeight();
+    method public androidx.ui.unit.Dp getDefaultWidth();
+    method public String getName();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+    method public androidx.ui.graphics.vector.VectorAssetBuilder popGroup();
+    method public androidx.ui.graphics.vector.VectorAssetBuilder pushGroup(String name = "", float rotate = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, float scaleX = 1.0f, float scaleY = 1.0f, float translationX = 0.0f, float translationY = 0.0f, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData = EmptyPath);
+  }
+
+  public final class VectorAssetBuilderKt {
+    method public static androidx.ui.graphics.vector.VectorAssetBuilder group(androidx.ui.graphics.vector.VectorAssetBuilder, String name = "", float rotate = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, float scaleX = 1.0f, float scaleY = 1.0f, float translationX = 0.0f, float translationY = 0.0f, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData = EmptyPath, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.VectorAssetBuilder,kotlin.Unit> block);
+    method public static androidx.ui.graphics.vector.VectorAssetBuilder path(androidx.ui.graphics.vector.VectorAssetBuilder, String name = "", androidx.ui.graphics.Brush? fill = null, float fillAlpha = 1.0f, androidx.ui.graphics.Brush? stroke = null, float strokeAlpha = 1.0f, float strokeLineWidth = 0.0f, androidx.ui.graphics.StrokeCap strokeLineCap = DefaultStrokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin = DefaultStrokeLineJoin, float strokeLineMiter = 4.0f, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+  public final class VectorAssetKt {
+    method @Deprecated public static androidx.ui.core.Modifier drawVector-N7QT3do(androidx.ui.graphics.vector.VectorAsset vectorImage, long tintColor = Color.Transparent, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside);
+  }
+
+  public final class VectorComposeKt {
+    method public static void Group(androidx.ui.graphics.vector.VectorScope, String name = "", float rotation = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, float scaleX = 1.0f, float scaleY = 1.0f, float translationX = 0.0f, float translationY = 0.0f, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData = EmptyPath, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.VectorScope,kotlin.Unit> children);
+    method public static void Path(androidx.ui.graphics.vector.VectorScope, java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, String name = "", androidx.ui.graphics.Brush? fill = null, float fillAlpha = 1.0f, androidx.ui.graphics.Brush? stroke = null, float strokeAlpha = 1.0f, float strokeLineWidth = 0.0f, androidx.ui.graphics.StrokeCap strokeLineCap = DefaultStrokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin = DefaultStrokeLineJoin, float strokeLineMiter = 4.0f);
+    method public static androidx.ui.core.Modifier drawVector-DGWccOo(androidx.ui.core.Modifier, float defaultWidth, float defaultHeight, float viewportWidth = defaultWidth.value, float viewportHeight = defaultHeight.value, long tintColor = DefaultTintColor, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = androidx.ui.graphics.vector.VectorComposeKt.DefaultAlignment, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, String name = "", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.Modifier drawVector-coNG3w0(float defaultWidth, float defaultHeight, float viewportWidth = defaultWidth.value, float viewportHeight = defaultHeight.value, long tintColor = DefaultTintColor, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = androidx.ui.graphics.vector.VectorComposeKt.DefaultAlignment, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, String name = "", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.Modifier drawVector-ekZRHcQ(androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth = -1.0f, float viewportHeight = -1.0f, long tintColor = DefaultTintColor, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = androidx.ui.graphics.vector.VectorComposeKt.DefaultAlignment, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, String name = "", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+  }
+
+  public final class VectorGroup extends androidx.ui.graphics.vector.VectorNode implements java.lang.Iterable<androidx.ui.graphics.vector.VectorNode> kotlin.jvm.internal.markers.KMappedMarker {
+    ctor public VectorGroup(String name, float rotation, float pivotX, float pivotY, float scaleX, float scaleY, float translationX, float translationY, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData);
+    ctor public VectorGroup();
+    method public operator androidx.ui.graphics.vector.VectorNode get(int index);
+    method public java.util.List<androidx.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.ui.graphics.vector.VectorNode> iterator();
+    property public final int size;
+  }
+
+  public abstract sealed class VectorNode {
+  }
+
+  public final class VectorPainter extends androidx.ui.graphics.painter.Painter {
+    method public androidx.ui.unit.PxSize getIntrinsicSize();
+    method protected void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+  public final class VectorPainterKt {
+    method public static androidx.ui.graphics.vector.VectorPainter VectorPainter(androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth = Float.NaN, float viewportHeight = Float.NaN, String name = "VectorRootGroup", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+    method public static androidx.ui.graphics.vector.VectorPainter VectorPainter(androidx.ui.graphics.vector.VectorAsset asset);
+    field public static final String RootGroupName = "VectorRootGroup";
+  }
+
+  public final class VectorPath extends androidx.ui.graphics.vector.VectorNode {
+    ctor public VectorPath(String name, java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, androidx.ui.graphics.Brush? fill, float fillAlpha, androidx.ui.graphics.Brush? stroke, float strokeAlpha, float strokeLineWidth, androidx.ui.graphics.StrokeCap strokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin, float strokeLineMiter);
+    method public String component1();
+    method public float component10();
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> component2();
+    method public androidx.ui.graphics.Brush? component3();
+    method public float component4();
+    method public androidx.ui.graphics.Brush? component5();
+    method public float component6();
+    method public float component7();
+    method public androidx.ui.graphics.StrokeCap component8();
+    method public androidx.ui.graphics.StrokeJoin component9();
+    method public androidx.ui.graphics.vector.VectorPath copy(String name, java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, androidx.ui.graphics.Brush? fill, float fillAlpha, androidx.ui.graphics.Brush? stroke, float strokeAlpha, float strokeLineWidth, androidx.ui.graphics.StrokeCap strokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin, float strokeLineMiter);
+    method public androidx.ui.graphics.Brush? getFill();
+    method public float getFillAlpha();
+    method public String getName();
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> getPathData();
+    method public androidx.ui.graphics.Brush? getStroke();
+    method public float getStrokeAlpha();
+    method public androidx.ui.graphics.StrokeCap getStrokeLineCap();
+    method public androidx.ui.graphics.StrokeJoin getStrokeLineJoin();
+    method public float getStrokeLineMiter();
+    method public float getStrokeLineWidth();
+  }
+
+}
+
+package androidx.ui.graphics.vector.compat {
+
+  public final class XmlVectorParserKt {
+  }
+
+}
+
+package androidx.ui.node {
+
+  public final class UiComposer extends androidx.compose.Composer<java.lang.Object> {
+    ctor public UiComposer(android.content.Context context, Object root, androidx.compose.SlotTable slotTable, androidx.compose.Recomposer recomposer);
+    method public inline <T extends android.view.View> void emit(Object key, kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update);
+    method public inline <T extends android.view.ViewGroup> void emit(Object key, kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public inline <T extends androidx.ui.core.ComponentNode> void emit(Object key, kotlin.jvm.functions.Function0<? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update);
+    method public inline <T extends androidx.ui.core.ComponentNode> void emit(Object key, kotlin.jvm.functions.Function0<? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public android.content.Context getContext();
+    method public Object getRoot();
+  }
+
+  public final class UiComposerKt {
+  }
+
+  public final class ViewInteropKt {
+  }
+
+}
+
+package androidx.ui.res {
+
+  public final class ColorResourcesKt {
+    method public static long colorResource(@ColorRes int id);
+  }
+
+  public final class DeferredResource<T> {
+    method public androidx.ui.res.Resource<T> getResource();
+    property public final androidx.ui.res.Resource<T> resource;
+  }
+
+  public final class FailedResource<T> extends androidx.ui.res.Resource<T> {
+    ctor public FailedResource(T? resource, Throwable? throwable);
+    method public Throwable? getThrowable();
+  }
+
+  public final class FontResourcesKt {
+    method public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
+    method public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
+    method public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+  }
+
+  public final class ImageResourcesKt {
+    method public static androidx.ui.graphics.ImageAsset imageResource(@DrawableRes int id);
+    method public static androidx.ui.res.DeferredResource<androidx.ui.graphics.ImageAsset> loadImageResource(int id, androidx.ui.graphics.ImageAsset? pendingImage = null, androidx.ui.graphics.ImageAsset? failedImage = null);
+  }
+
+  public final class LoadedResource<T> extends androidx.ui.res.Resource<T> {
+    ctor public LoadedResource(T! resource);
+  }
+
+  public final class PendingResource<T> extends androidx.ui.res.Resource<T> {
+    ctor public PendingResource(T? resource);
+  }
+
+  public final class PrimitiveResourcesKt {
+    method public static boolean booleanResource(@BoolRes int id);
+    method public static androidx.ui.unit.Dp dimensionResource(@DimenRes int id);
+    method public static int[] integerArrayResource(@ArrayRes int id);
+    method public static int integerResource(@IntegerRes int id);
+  }
+
+  public abstract sealed class Resource<T> {
+    method public final T? getResource();
+  }
+
+  public final class ResourcesKt {
+  }
+
+  public final class StringResourcesKt {
+    method public static String![] stringArrayResource(@ArrayRes int id);
+    method public static String stringResource(@StringRes int id);
+    method public static String stringResource(@StringRes int id, java.lang.Object... formatArgs);
+  }
+
+  public final class VectorResourcesKt {
+    method public static androidx.ui.res.DeferredResource<androidx.ui.graphics.vector.VectorAsset> loadVectorResource(int id, androidx.ui.graphics.vector.VectorAsset? pendingResource = null, androidx.ui.graphics.vector.VectorAsset? failedResource = null);
+    method public static androidx.ui.graphics.vector.VectorAsset vectorResource(@DrawableRes int id);
+  }
+
+}
+
+package androidx.ui.semantics {
+
+  public final class SemanticsKt {
+    method public static void Semantics(boolean container = false, boolean mergeAllDescendants = false, kotlin.jvm.functions.Function1<? super androidx.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit>? properties = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class SemanticsPropertiesKt {
+    method public static void ScrollTo(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function2<? super androidx.ui.unit.Px,? super androidx.ui.unit.Px,kotlin.Unit> action);
+    method public static String getAccessibilityLabel(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getAccessibilityValue(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.semantics.AccessibilityRangeInfo getAccessibilityValueRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getEnabled(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getHidden(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>> getOnClick(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>> getScrollTo(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method public static void setAccessibilityLabel(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setAccessibilityValue(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setAccessibilityValueRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.semantics.AccessibilityRangeInfo p);
+    method public static void setCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver, java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> p);
+    method public static void setEnabled(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setHidden(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setOnClick(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>> p);
+    method public static void setScrollTo(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>> p);
+    method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
+  }
+
+}
+
+package androidx.ui.tooling {
+
+  public final class InspectionModeKt {
+    method public static androidx.compose.ProvidableAmbient<java.lang.Boolean> getInspectionMode();
+  }
+
+}
+
+package androidx.ui.viewinterop {
+
+  public final class ComposedViewKt {
+    method public static void AndroidView(@LayoutRes int resId, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> postInflationCallback = { _ ->  });
+  }
+
+}
+
diff --git a/ui/ui-framework/api/public_plus_experimental_current.txt b/ui/ui-framework/api/public_plus_experimental_current.txt
index 1fef5e9..9686aba 100644
--- a/ui/ui-framework/api/public_plus_experimental_current.txt
+++ b/ui/ui-framework/api/public_plus_experimental_current.txt
@@ -23,7 +23,7 @@
 
   public final class DrawShadowKt {
     method @Deprecated public static androidx.ui.core.Modifier drawShadow(androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
-    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.unit.Dp elevation, androidx.ui.graphics.Shape shape = RectangleShape, boolean clipToOutline = elevation > 0.dp, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
   }
 
   public enum DropDownAlignment {
@@ -32,7 +32,7 @@
   }
 
   public final class LayoutKt {
-    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static androidx.ui.core.LayoutNode.MeasureBlocks MeasuringIntrinsicsMeasureBlocks(kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method @Deprecated public static void MultiMeasureLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
diff --git a/ui/ui-framework/api/res-0.1.0-dev11.txt b/ui/ui-framework/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-framework/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-framework/api/restricted_0.1.0-dev10.txt b/ui/ui-framework/api/restricted_0.1.0-dev10.txt
index 6d1af67..4d10038 100644
--- a/ui/ui-framework/api/restricted_0.1.0-dev10.txt
+++ b/ui/ui-framework/api/restricted_0.1.0-dev10.txt
@@ -23,7 +23,7 @@
 
   public final class DrawShadowKt {
     method @Deprecated public static androidx.ui.core.Modifier drawShadow(androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
-    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.unit.Dp elevation, androidx.ui.graphics.Shape shape = RectangleShape, boolean clipToOutline = elevation > 0.dp, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
   }
 
   public enum DropDownAlignment {
@@ -32,7 +32,7 @@
   }
 
   public final class LayoutKt {
-    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static androidx.ui.core.LayoutNode.MeasureBlocks MeasuringIntrinsicsMeasureBlocks(kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method @Deprecated public static void MultiMeasureLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
diff --git a/ui/ui-framework/api/restricted_0.1.0-dev11.txt b/ui/ui-framework/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..4d10038
--- /dev/null
+++ b/ui/ui-framework/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,605 @@
+// Signature format: 3.0
+package androidx.compose {
+
+  public final class ComposerCompatKt {
+    method @Deprecated public static androidx.ui.node.UiComposer getComposer();
+  }
+
+}
+
+package androidx.ui.core {
+
+  public final class ClipKt {
+    method public static androidx.ui.core.Modifier clip(androidx.ui.core.Modifier, androidx.ui.graphics.Shape shape);
+    method public static androidx.ui.core.Modifier clipToBounds(androidx.ui.core.Modifier);
+    method @Deprecated public static androidx.ui.core.Modifier drawClip(androidx.ui.graphics.Shape shape);
+    method @Deprecated public static androidx.ui.core.Modifier getDrawClipToBounds();
+  }
+
+  public final class DrawKt {
+    method @Deprecated public static inline void Draw(kotlin.jvm.functions.Function3<? super androidx.ui.unit.Density,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit> onPaint);
+    method @Deprecated public static inline void Draw(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function3<? super androidx.ui.core.ContentDrawScope,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit> onPaint);
+  }
+
+  public final class DrawShadowKt {
+    method @Deprecated public static androidx.ui.core.Modifier drawShadow(androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.unit.Dp elevation, androidx.ui.graphics.Shape shape = RectangleShape, boolean clipToOutline = elevation > 0.dp, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+  }
+
+  public enum DropDownAlignment {
+    enum_constant public static final androidx.ui.core.DropDownAlignment End;
+    enum_constant public static final androidx.ui.core.DropDownAlignment Start;
+  }
+
+  public final class LayoutKt {
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static androidx.ui.core.LayoutNode.MeasureBlocks MeasuringIntrinsicsMeasureBlocks(kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method @Deprecated public static void MultiMeasureLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method @Deprecated public static void PassThroughLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void WithConstraints(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function2<? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,kotlin.Unit> children);
+  }
+
+  public final class LayoutTag implements androidx.ui.core.LayoutTagParentData androidx.ui.core.ParentDataModifier {
+    ctor @Deprecated public LayoutTag(Object tag);
+    method public Object component1();
+    method public androidx.ui.core.LayoutTag copy(Object tag);
+    method public Object getTag();
+    method public Object? modifyParentData(androidx.ui.unit.Density, Object? parentData);
+  }
+
+  public final class LayoutTagKt {
+    method public static Object? getTag(androidx.ui.core.Measurable);
+    method public static androidx.ui.core.Modifier tag(androidx.ui.core.Modifier, Object tag);
+  }
+
+  public interface LayoutTagParentData {
+    method public Object getTag();
+    property public abstract Object tag;
+  }
+
+  public final class OpacityKt {
+    method public static androidx.ui.core.Modifier drawOpacity(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=1.0) float opacity);
+    method @Deprecated public static androidx.ui.core.Modifier drawOpacity(@FloatRange(from=0.0, to=1.0) float opacity);
+  }
+
+  public final class PainterModifierKt {
+    method @Deprecated public static androidx.ui.core.DrawModifier asModifier(androidx.ui.graphics.painter.Painter, boolean sizeToIntrinsics = true, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null, boolean rtl = false);
+    method public static androidx.ui.core.Modifier paint(androidx.ui.core.Modifier, androidx.ui.graphics.painter.Painter painter, boolean sizeToIntrinsics = true, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null, boolean rtl = false);
+  }
+
+  public final class ParentDataKt {
+    method @Deprecated public static inline void ParentData(Object data, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class PointerInputWrapperKt {
+    method public static inline void PointerInput(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler, kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler, kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler = null, kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class PopupKt {
+    method public static void DropdownPopup(androidx.ui.core.DropDownAlignment dropDownAlignment = androidx.ui.core.DropDownAlignment.Start, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Popup(androidx.ui.core.Alignment alignment = Alignment.TopStart, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static boolean isPopupLayout(android.view.View view, String? testTag = null);
+  }
+
+  public final class PopupProperties {
+    ctor public PopupProperties(boolean isFocusable, kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest);
+    ctor public PopupProperties();
+    method public boolean component1();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? component2();
+    method public androidx.ui.core.PopupProperties copy(boolean isFocusable, kotlin.jvm.functions.Function0<kotlin.Unit>? onDismissRequest);
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? getOnDismissRequest();
+    method public boolean isFocusable();
+  }
+
+  public final class TestTagKt {
+    method public static void TestTag(String tag, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class WrapperKt {
+    method public static androidx.compose.ProvidableAmbient<androidx.animation.AnimationClockObservable> getAnimationClockAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.autofill.Autofill> getAutofillAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.autofill.AutofillTree> getAutofillTreeAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
+    method public static androidx.compose.ProvidableAmbient<android.content.res.Configuration> getConfigurationAmbient();
+    method public static androidx.compose.ProvidableAmbient<android.content.Context> getContextAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.input.FocusManager> getFocusManagerAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
+    method @Deprecated public static androidx.compose.ProvidableAmbient<androidx.ui.core.LayoutDirection> getLayoutDirectionAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.lifecycle.LifecycleOwner> getLifecycleOwnerAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
+    method public static androidx.compose.Composition setContent(androidx.activity.ComponentActivity, androidx.compose.Recomposer recomposer = Recomposer.current(), kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @Deprecated public static androidx.compose.Composition setContent(android.app.Activity, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static androidx.compose.Composition setContent(android.view.ViewGroup, androidx.compose.Recomposer recomposer, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @Deprecated public static androidx.compose.Composition setContent(android.view.ViewGroup, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static androidx.compose.Composition setViewContent(android.view.ViewGroup, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public static androidx.compose.Composition setViewContent(android.app.Activity, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method @MainThread public static androidx.compose.Composition subcomposeInto(android.content.Context context, androidx.ui.core.ComponentNode container, androidx.compose.Recomposer recomposer, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method @Deprecated @MainThread public static androidx.compose.Composition subcomposeInto(androidx.ui.core.ComponentNode container, android.content.Context context, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+}
+
+package androidx.ui.core.gesture {
+
+  public final class ConstantsKt {
+    method public static androidx.ui.unit.Duration getDoubleTapMinTime();
+    method public static androidx.ui.unit.Dp getDoubleTapSlop();
+    method public static androidx.ui.unit.Duration getDoubleTapTimeout();
+    method public static androidx.ui.unit.Dp getDoubleTapTouchSlop();
+    method public static androidx.ui.unit.Dp getHoverTapSlop();
+    method public static androidx.ui.unit.Duration getHoverTapTimeout();
+    method public static androidx.ui.unit.Duration getJumpTapTimeout();
+    method public static androidx.ui.unit.Duration getLongPressTimeout();
+    method public static androidx.ui.unit.Dp getMaxFlingVelocity();
+    method public static androidx.ui.unit.Dp getMinFlingVelocity();
+    method public static float getPagingTouchSlop();
+    method public static float getPanSlop();
+    method public static androidx.ui.unit.Duration getPressTimeout();
+    method public static androidx.ui.unit.Dp getScaleSlop();
+    method public static androidx.ui.unit.Dp getTouchSlop();
+    method public static androidx.ui.unit.Dp getWindowTouchSlop();
+    method public static androidx.ui.unit.Duration getZoomControlsTimeout();
+  }
+
+  public final class DoubleTapGestureFilterKt {
+    method public static androidx.ui.core.Modifier doubleTapGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onDoubleTap);
+  }
+
+  public final class DragGestureFilterKt {
+    method public static androidx.ui.core.Modifier dragGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.DragObserver dragObserver, kotlin.jvm.functions.Function1<? super androidx.ui.core.Direction,java.lang.Boolean>? canDrag = null, boolean startDragImmediately = false);
+  }
+
+  public interface DragObserver {
+    method public default void onCancel();
+    method public default androidx.ui.unit.PxPosition onDrag(androidx.ui.unit.PxPosition dragDistance);
+    method public default void onStart(androidx.ui.unit.PxPosition downPosition);
+    method public default void onStop(androidx.ui.unit.PxPosition velocity);
+  }
+
+  public final class GestureUtilsKt {
+    method public static boolean anyPointersInBounds(java.util.List<androidx.ui.core.PointerInputChange>, androidx.ui.unit.IntPxSize bounds);
+  }
+
+  public final class LongPressDragGestureFilterKt {
+    method public static androidx.ui.core.Modifier longPressDragGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.LongPressDragObserver longPressDragObserver);
+  }
+
+  public interface LongPressDragObserver {
+    method public default void onCancel();
+    method public default androidx.ui.unit.PxPosition onDrag(androidx.ui.unit.PxPosition dragDistance);
+    method public default void onDragStart();
+    method public default void onLongPress(androidx.ui.unit.PxPosition pxPosition);
+    method public default void onStop(androidx.ui.unit.PxPosition velocity);
+  }
+
+  public final class LongPressFiredEvent implements androidx.ui.core.CustomEvent {
+    field public static final androidx.ui.core.gesture.LongPressFiredEvent! INSTANCE;
+  }
+
+  public final class LongPressGestureFilterKt {
+    method public static androidx.ui.core.Modifier longPressGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onLongPress);
+  }
+
+  public final class PressIndicatorGestureFilterKt {
+    method public static androidx.ui.core.Modifier pressIndicatorGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit>? onStart = null, kotlin.jvm.functions.Function0<kotlin.Unit>? onStop = null, kotlin.jvm.functions.Function0<kotlin.Unit>? onCancel = null, boolean enabled = true);
+  }
+
+  public final class RawDragGestureFilterKt {
+    method public static androidx.ui.core.Modifier rawDragGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.DragObserver dragObserver, kotlin.jvm.functions.Function0<java.lang.Boolean>? canStartDragging = null);
+  }
+
+  public final class RawPressStartGestureFilterKt {
+    method public static androidx.ui.core.Modifier rawPressStartGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.unit.PxPosition,kotlin.Unit> onPressStart, boolean enabled = false, androidx.ui.core.PointerEventPass executionPass = PointerEventPass.PostUp);
+  }
+
+  public final class RawScaleGestureFilterKt {
+    method public static androidx.ui.core.Modifier rawScaleGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.RawScaleObserver scaleObserver, kotlin.jvm.functions.Function0<java.lang.Boolean>? canStartScaling = null);
+  }
+
+  public interface RawScaleObserver {
+    method public default void onCancel();
+    method public default float onScale(float scaleFactor);
+    method public default void onStart();
+    method public default void onStop();
+  }
+
+  public final class ScaleGestureFilterKt {
+    method public static androidx.ui.core.Modifier scaleGestureFilter(androidx.ui.core.Modifier, androidx.ui.core.gesture.ScaleObserver scaleObserver);
+  }
+
+  public interface ScaleObserver {
+    method public default void onCancel();
+    method public void onScale(float scaleFactor);
+    method public default void onStart();
+    method public default void onStop();
+  }
+
+  public final class ScaleSlopExceededGestureFilterKt {
+    method public static androidx.ui.core.Modifier scaleSlopExceededGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> onScaleSlopExceeded);
+  }
+
+  public final class ScaleUtilKt {
+  }
+
+  public final class TapGestureFilterKt {
+    method public static androidx.ui.core.Modifier tapGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> onTap);
+  }
+
+  public final class TouchSlopExceededGestureFilterKt {
+    method public static androidx.ui.core.Modifier touchSlopExceededGestureFilter(androidx.ui.core.Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> onTouchSlopExceeded, kotlin.jvm.functions.Function1<? super androidx.ui.core.Direction,java.lang.Boolean>? canDrag = null);
+  }
+
+}
+
+package androidx.ui.core.gesture.util {
+
+  public final class PolyFitLeastSquaresKt {
+  }
+
+  public final class VelocityTracker {
+    ctor public VelocityTracker();
+    method public void addPosition(androidx.ui.unit.Uptime uptime, androidx.ui.unit.PxPosition position);
+    method public androidx.ui.unit.Velocity calculateVelocity();
+    method public void resetTracking();
+  }
+
+  public final class VelocityTrackerKt {
+  }
+
+}
+
+package androidx.ui.core.input {
+
+  public interface FocusManager {
+    method public void blur(androidx.ui.core.input.FocusNode client);
+    method public void registerFocusNode(String identifier, androidx.ui.core.input.FocusNode node);
+    method public void registerObserver(androidx.ui.core.input.FocusNode node, kotlin.jvm.functions.Function2<? super androidx.ui.core.input.FocusNode,? super androidx.ui.core.input.FocusNode,kotlin.Unit> observer);
+    method public void requestFocus(androidx.ui.core.input.FocusNode client);
+    method public void requestFocusById(String identifier);
+    method public void unregisterFocusNode(String identifier);
+  }
+
+  public final class FocusManagerKt {
+  }
+
+  public final class FocusNode {
+    ctor public FocusNode();
+  }
+
+}
+
+package androidx.ui.core.selection {
+
+  public interface Selectable {
+    method public androidx.ui.unit.PxPosition getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
+    method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
+    method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.unit.PxPosition startPosition, androidx.ui.unit.PxPosition endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
+    method public androidx.ui.text.AnnotatedString getText();
+  }
+
+  public final class Selection {
+    ctor public Selection(androidx.ui.core.selection.Selection.AnchorInfo start, androidx.ui.core.selection.Selection.AnchorInfo end, boolean handlesCrossed);
+    method public androidx.ui.core.selection.Selection.AnchorInfo component1();
+    method public androidx.ui.core.selection.Selection.AnchorInfo component2();
+    method public boolean component3();
+    method public androidx.ui.core.selection.Selection copy(androidx.ui.core.selection.Selection.AnchorInfo start, androidx.ui.core.selection.Selection.AnchorInfo end, boolean handlesCrossed);
+    method public androidx.ui.core.selection.Selection.AnchorInfo getEnd();
+    method public boolean getHandlesCrossed();
+    method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
+    method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
+    method public androidx.ui.text.TextRange toTextRange();
+  }
+
+  public static final class Selection.AnchorInfo {
+    ctor public Selection.AnchorInfo(androidx.ui.text.style.TextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+    method public androidx.ui.text.style.TextDirection component1();
+    method public int component2();
+    method public androidx.ui.core.selection.Selectable component3();
+    method public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.TextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+    method public androidx.ui.text.style.TextDirection getDirection();
+    method public int getOffset();
+    method public androidx.ui.core.selection.Selectable getSelectable();
+  }
+
+  public final class SelectionContainerKt {
+    method public static void SelectionContainer(androidx.ui.core.selection.Selection? selection, kotlin.jvm.functions.Function1<? super androidx.ui.core.selection.Selection,kotlin.Unit> onSelectionChange, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class SelectionHandlesKt {
+  }
+
+  public final class SelectionManagerKt {
+  }
+
+  public interface SelectionRegistrar {
+    method public void onPositionChange();
+    method public androidx.ui.core.selection.Selectable subscribe(androidx.ui.core.selection.Selectable selectable);
+    method public void unsubscribe(androidx.ui.core.selection.Selectable selectable);
+  }
+
+  public final class SelectionRegistrarKt {
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.core.selection.SelectionRegistrar> getSelectionRegistrarAmbient();
+  }
+
+}
+
+package androidx.ui.focus {
+
+  public final class FocusModifierProviderKt {
+    method public static androidx.ui.focus.FocusModifier FocusModifier();
+    method public static androidx.ui.focus.FocusState getFocusState(androidx.ui.focus.FocusModifier);
+  }
+
+  public final class FocusOperator {
+    ctor public FocusOperator();
+    method public androidx.ui.focus.FocusDetailedState getFocusDetailedState();
+    method public androidx.ui.focus.FocusState getFocusState();
+    method public void requestFocus();
+    property public final androidx.ui.focus.FocusDetailedState focusDetailedState;
+    property public final androidx.ui.focus.FocusState focusState;
+  }
+
+  public final class FocusableKt {
+    method public static void Focusable(androidx.ui.focus.FocusOperator focusOperator = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function1<? super androidx.ui.focus.FocusOperator,kotlin.Unit> children);
+  }
+
+}
+
+package androidx.ui.graphics.vector {
+
+  public final class VectorAsset {
+    method public String component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public float component4();
+    method public float component5();
+    method public androidx.ui.graphics.vector.VectorGroup component6();
+    method public androidx.ui.graphics.vector.VectorAsset copy(String name, androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth, float viewportHeight, androidx.ui.graphics.vector.VectorGroup root);
+    method public androidx.ui.unit.Dp getDefaultHeight();
+    method public androidx.ui.unit.Dp getDefaultWidth();
+    method public String getName();
+    method public androidx.ui.graphics.vector.VectorGroup getRoot();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+  }
+
+  public final class VectorAssetBuilder {
+    ctor public VectorAssetBuilder(String name, androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth, float viewportHeight);
+    method public androidx.ui.graphics.vector.VectorAssetBuilder addPath(java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, String name = "", androidx.ui.graphics.Brush? fill = null, float fillAlpha = 1.0f, androidx.ui.graphics.Brush? stroke = null, float strokeAlpha = 1.0f, float strokeLineWidth = 0.0f, androidx.ui.graphics.StrokeCap strokeLineCap = DefaultStrokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin = DefaultStrokeLineJoin, float strokeLineMiter = 4.0f);
+    method public androidx.ui.graphics.vector.VectorAsset build();
+    method public androidx.ui.unit.Dp getDefaultHeight();
+    method public androidx.ui.unit.Dp getDefaultWidth();
+    method public String getName();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+    method public androidx.ui.graphics.vector.VectorAssetBuilder popGroup();
+    method public androidx.ui.graphics.vector.VectorAssetBuilder pushGroup(String name = "", float rotate = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, float scaleX = 1.0f, float scaleY = 1.0f, float translationX = 0.0f, float translationY = 0.0f, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData = EmptyPath);
+  }
+
+  public final class VectorAssetBuilderKt {
+    method public static androidx.ui.graphics.vector.VectorAssetBuilder group(androidx.ui.graphics.vector.VectorAssetBuilder, String name = "", float rotate = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, float scaleX = 1.0f, float scaleY = 1.0f, float translationX = 0.0f, float translationY = 0.0f, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData = EmptyPath, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.VectorAssetBuilder,kotlin.Unit> block);
+    method public static androidx.ui.graphics.vector.VectorAssetBuilder path(androidx.ui.graphics.vector.VectorAssetBuilder, String name = "", androidx.ui.graphics.Brush? fill = null, float fillAlpha = 1.0f, androidx.ui.graphics.Brush? stroke = null, float strokeAlpha = 1.0f, float strokeLineWidth = 0.0f, androidx.ui.graphics.StrokeCap strokeLineCap = DefaultStrokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin = DefaultStrokeLineJoin, float strokeLineMiter = 4.0f, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+  public final class VectorAssetKt {
+    method @Deprecated public static androidx.ui.core.Modifier drawVector-N7QT3do(androidx.ui.graphics.vector.VectorAsset vectorImage, long tintColor = Color.Transparent, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = Alignment.Center, androidx.ui.core.ContentScale contentScale = ContentScale.Inside);
+  }
+
+  public final class VectorComposeKt {
+    method public static void Group(androidx.ui.graphics.vector.VectorScope, String name = "", float rotation = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, float scaleX = 1.0f, float scaleY = 1.0f, float translationX = 0.0f, float translationY = 0.0f, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData = EmptyPath, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.VectorScope,kotlin.Unit> children);
+    method public static void Path(androidx.ui.graphics.vector.VectorScope, java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, String name = "", androidx.ui.graphics.Brush? fill = null, float fillAlpha = 1.0f, androidx.ui.graphics.Brush? stroke = null, float strokeAlpha = 1.0f, float strokeLineWidth = 0.0f, androidx.ui.graphics.StrokeCap strokeLineCap = DefaultStrokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin = DefaultStrokeLineJoin, float strokeLineMiter = 4.0f);
+    method public static androidx.ui.core.Modifier drawVector-DGWccOo(androidx.ui.core.Modifier, float defaultWidth, float defaultHeight, float viewportWidth = defaultWidth.value, float viewportHeight = defaultHeight.value, long tintColor = DefaultTintColor, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = androidx.ui.graphics.vector.VectorComposeKt.DefaultAlignment, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, String name = "", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.Modifier drawVector-coNG3w0(float defaultWidth, float defaultHeight, float viewportWidth = defaultWidth.value, float viewportHeight = defaultHeight.value, long tintColor = DefaultTintColor, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = androidx.ui.graphics.vector.VectorComposeKt.DefaultAlignment, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, String name = "", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+    method @Deprecated public static androidx.ui.core.Modifier drawVector-ekZRHcQ(androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth = -1.0f, float viewportHeight = -1.0f, long tintColor = DefaultTintColor, androidx.ui.graphics.BlendMode tintBlendMode = DefaultTintBlendMode, androidx.ui.core.Alignment alignment = androidx.ui.graphics.vector.VectorComposeKt.DefaultAlignment, androidx.ui.core.ContentScale contentScale = ContentScale.Inside, String name = "", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+  }
+
+  public final class VectorGroup extends androidx.ui.graphics.vector.VectorNode implements java.lang.Iterable<androidx.ui.graphics.vector.VectorNode> kotlin.jvm.internal.markers.KMappedMarker {
+    ctor public VectorGroup(String name, float rotation, float pivotX, float pivotY, float scaleX, float scaleY, float translationX, float translationY, java.util.List<? extends androidx.ui.graphics.vector.PathNode> clipPathData);
+    ctor public VectorGroup();
+    method public operator androidx.ui.graphics.vector.VectorNode get(int index);
+    method public java.util.List<androidx.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.ui.graphics.vector.VectorNode> iterator();
+    property public final int size;
+  }
+
+  public abstract sealed class VectorNode {
+  }
+
+  public final class VectorPainter extends androidx.ui.graphics.painter.Painter {
+    method public androidx.ui.unit.PxSize getIntrinsicSize();
+    method protected void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+  public final class VectorPainterKt {
+    method public static androidx.ui.graphics.vector.VectorPainter VectorPainter(androidx.ui.unit.Dp defaultWidth, androidx.ui.unit.Dp defaultHeight, float viewportWidth = Float.NaN, float viewportHeight = Float.NaN, String name = "VectorRootGroup", kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> children);
+    method public static androidx.ui.graphics.vector.VectorPainter VectorPainter(androidx.ui.graphics.vector.VectorAsset asset);
+    field public static final String RootGroupName = "VectorRootGroup";
+  }
+
+  public final class VectorPath extends androidx.ui.graphics.vector.VectorNode {
+    ctor public VectorPath(String name, java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, androidx.ui.graphics.Brush? fill, float fillAlpha, androidx.ui.graphics.Brush? stroke, float strokeAlpha, float strokeLineWidth, androidx.ui.graphics.StrokeCap strokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin, float strokeLineMiter);
+    method public String component1();
+    method public float component10();
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> component2();
+    method public androidx.ui.graphics.Brush? component3();
+    method public float component4();
+    method public androidx.ui.graphics.Brush? component5();
+    method public float component6();
+    method public float component7();
+    method public androidx.ui.graphics.StrokeCap component8();
+    method public androidx.ui.graphics.StrokeJoin component9();
+    method public androidx.ui.graphics.vector.VectorPath copy(String name, java.util.List<? extends androidx.ui.graphics.vector.PathNode> pathData, androidx.ui.graphics.Brush? fill, float fillAlpha, androidx.ui.graphics.Brush? stroke, float strokeAlpha, float strokeLineWidth, androidx.ui.graphics.StrokeCap strokeLineCap, androidx.ui.graphics.StrokeJoin strokeLineJoin, float strokeLineMiter);
+    method public androidx.ui.graphics.Brush? getFill();
+    method public float getFillAlpha();
+    method public String getName();
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> getPathData();
+    method public androidx.ui.graphics.Brush? getStroke();
+    method public float getStrokeAlpha();
+    method public androidx.ui.graphics.StrokeCap getStrokeLineCap();
+    method public androidx.ui.graphics.StrokeJoin getStrokeLineJoin();
+    method public float getStrokeLineMiter();
+    method public float getStrokeLineWidth();
+  }
+
+}
+
+package androidx.ui.graphics.vector.compat {
+
+  public final class XmlVectorParserKt {
+  }
+
+}
+
+package androidx.ui.node {
+
+  public final class UiComposer extends androidx.compose.Composer<java.lang.Object> {
+    ctor public UiComposer(android.content.Context context, Object root, androidx.compose.SlotTable slotTable, androidx.compose.Recomposer recomposer);
+    method public inline <T extends android.view.View> void emit(Object key, kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update);
+    method public inline <T extends android.view.ViewGroup> void emit(Object key, kotlin.jvm.functions.Function1<? super android.content.Context,? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public inline <T extends androidx.ui.core.ComponentNode> void emit(Object key, kotlin.jvm.functions.Function0<? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update);
+    method public inline <T extends androidx.ui.core.ComponentNode> void emit(Object key, kotlin.jvm.functions.Function0<? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<java.lang.Object,T>,kotlin.Unit> update, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public android.content.Context getContext();
+    method public Object getRoot();
+  }
+
+  public final class UiComposerKt {
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ViewAdapter {
+    method public void didInsert(android.view.View view, android.view.ViewGroup parent);
+    method public void didUpdate(android.view.View view, android.view.ViewGroup parent);
+    method public int getId();
+    method public void willInsert(android.view.View view, android.view.ViewGroup parent);
+    property public abstract int id;
+  }
+
+  public final class ViewInteropKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T extends androidx.ui.node.ViewAdapter> T getOrAddAdapter(android.view.View, int id, kotlin.jvm.functions.Function0<? extends T> factory);
+  }
+
+}
+
+package androidx.ui.res {
+
+  public final class ColorResourcesKt {
+    method public static long colorResource(@ColorRes int id);
+  }
+
+  public final class DeferredResource<T> {
+    method public androidx.ui.res.Resource<T> getResource();
+    property public final androidx.ui.res.Resource<T> resource;
+  }
+
+  public final class FailedResource<T> extends androidx.ui.res.Resource<T> {
+    ctor public FailedResource(T? resource, Throwable? throwable);
+    method public Throwable? getThrowable();
+  }
+
+  public final class FontResourcesKt {
+    method public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
+    method public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
+    method public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+  }
+
+  public final class ImageResourcesKt {
+    method public static androidx.ui.graphics.ImageAsset imageResource(@DrawableRes int id);
+    method public static androidx.ui.res.DeferredResource<androidx.ui.graphics.ImageAsset> loadImageResource(int id, androidx.ui.graphics.ImageAsset? pendingImage = null, androidx.ui.graphics.ImageAsset? failedImage = null);
+  }
+
+  public final class LoadedResource<T> extends androidx.ui.res.Resource<T> {
+    ctor public LoadedResource(T! resource);
+  }
+
+  public final class PendingResource<T> extends androidx.ui.res.Resource<T> {
+    ctor public PendingResource(T? resource);
+  }
+
+  public final class PrimitiveResourcesKt {
+    method public static boolean booleanResource(@BoolRes int id);
+    method public static androidx.ui.unit.Dp dimensionResource(@DimenRes int id);
+    method public static int[] integerArrayResource(@ArrayRes int id);
+    method public static int integerResource(@IntegerRes int id);
+  }
+
+  public abstract sealed class Resource<T> {
+    method public final T? getResource();
+  }
+
+  public final class ResourcesKt {
+  }
+
+  public final class StringResourcesKt {
+    method public static String![] stringArrayResource(@ArrayRes int id);
+    method public static String stringResource(@StringRes int id);
+    method public static String stringResource(@StringRes int id, java.lang.Object... formatArgs);
+  }
+
+  public final class VectorResourcesKt {
+    method public static androidx.ui.res.DeferredResource<androidx.ui.graphics.vector.VectorAsset> loadVectorResource(int id, androidx.ui.graphics.vector.VectorAsset? pendingResource = null, androidx.ui.graphics.vector.VectorAsset? failedResource = null);
+    method public static androidx.ui.graphics.vector.VectorAsset vectorResource(@DrawableRes int id);
+  }
+
+}
+
+package androidx.ui.semantics {
+
+  public final class SemanticsKt {
+    method public static void Semantics(boolean container = false, boolean mergeAllDescendants = false, kotlin.jvm.functions.Function1<? super androidx.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit>? properties = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class SemanticsPropertiesKt {
+    method public static void ScrollTo(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function2<? super androidx.ui.unit.Px,? super androidx.ui.unit.Px,kotlin.Unit> action);
+    method public static String getAccessibilityLabel(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getAccessibilityValue(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.semantics.AccessibilityRangeInfo getAccessibilityValueRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getEnabled(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static boolean getHidden(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>> getOnClick(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>> getScrollTo(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
+    method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method public static void setAccessibilityLabel(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setAccessibilityValue(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
+    method public static void setAccessibilityValueRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.semantics.AccessibilityRangeInfo p);
+    method public static void setCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver, java.util.List<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> p);
+    method public static void setEnabled(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setHidden(androidx.ui.semantics.SemanticsPropertyReceiver, boolean p);
+    method public static void setOnClick(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>> p);
+    method public static void setScrollTo(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<androidx.ui.unit.Px,androidx.ui.unit.Px,kotlin.Unit>> p);
+    method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
+  }
+
+}
+
+package androidx.ui.tooling {
+
+  public final class InspectionModeKt {
+    method public static androidx.compose.ProvidableAmbient<java.lang.Boolean> getInspectionMode();
+  }
+
+}
+
+package androidx.ui.viewinterop {
+
+  public final class ComposedViewKt {
+    method public static void AndroidView(@LayoutRes int resId, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> postInflationCallback = { _ ->  });
+  }
+
+}
+
diff --git a/ui/ui-framework/api/restricted_current.txt b/ui/ui-framework/api/restricted_current.txt
index 6d1af67..4d10038 100644
--- a/ui/ui-framework/api/restricted_current.txt
+++ b/ui/ui-framework/api/restricted_current.txt
@@ -23,7 +23,7 @@
 
   public final class DrawShadowKt {
     method @Deprecated public static androidx.ui.core.Modifier drawShadow(androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
-    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.graphics.Shape shape, androidx.ui.unit.Dp elevation, boolean clipToOutline = true, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
+    method public static androidx.ui.core.Modifier drawShadow(androidx.ui.core.Modifier, androidx.ui.unit.Dp elevation, androidx.ui.graphics.Shape shape = RectangleShape, boolean clipToOutline = elevation > 0.dp, @FloatRange(from=0.0, to=1.0) float opacity = 1f);
   }
 
   public enum DropDownAlignment {
@@ -32,7 +32,7 @@
   }
 
   public final class LayoutKt {
-    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.unit.Density,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
+    method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> minIntrinsicHeightMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicWidthMeasureBlock, kotlin.jvm.functions.Function4<? super androidx.ui.core.IntrinsicMeasureScope,? super java.util.List<? extends androidx.ui.core.IntrinsicMeasurable>,? super androidx.ui.unit.IntPx,? super androidx.ui.core.LayoutDirection,androidx.ui.unit.IntPx> maxIntrinsicHeightMeasureBlock, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static void Layout(kotlin.jvm.functions.Function0<kotlin.Unit> children, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method public static androidx.ui.core.LayoutNode.MeasureBlocks MeasuringIntrinsicsMeasureBlocks(kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
     method @Deprecated public static void MultiMeasureLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children, kotlin.jvm.functions.Function4<? super androidx.ui.core.MeasureScope,? super java.util.List<? extends androidx.ui.core.Measurable>,? super androidx.ui.core.Constraints,? super androidx.ui.core.LayoutDirection,? extends androidx.ui.core.MeasureScope.MeasureResult> measureBlock);
diff --git a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/AnimationGestureSemanticsDemo.kt b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/AnimationGestureSemanticsDemo.kt
deleted file mode 100644
index 3262ff1..0000000
--- a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/AnimationGestureSemanticsDemo.kt
+++ /dev/null
@@ -1,207 +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.ui.framework.demos
-
-import androidx.animation.FloatPropKey
-import androidx.animation.transitionDefinition
-import androidx.compose.Composable
-import androidx.compose.state
-import androidx.ui.animation.ColorPropKey
-import androidx.ui.animation.Transition
-import androidx.ui.core.Modifier
-import androidx.ui.core.gesture.pressIndicatorGestureFilter
-import androidx.ui.foundation.Canvas
-import androidx.ui.geometry.Offset
-import androidx.ui.graphics.Color
-import androidx.ui.graphics.Paint
-import androidx.ui.layout.fillMaxSize
-import androidx.ui.unit.PxPosition
-import androidx.ui.unit.min
-
-/* Demos created to study the interaction of animations, gestures and semantics. */
-@Composable
-fun AnimationGestureSemanticsDemo() {
-    // This component does not use Semantics.
-    // WithoutSemanticActions()
-
-    // This component is a sample using the Level 1 API.
-    // Level1Api()
-
-    // This component is a sample using the Level 2 API.
-    Level2Api()
-
-    // This component is a sample using the Level 3 API, with the built-in defaults.
-    // Level3Api()
-
-    // This component is a sample using the Level 3 API, along with extra parameters.
-    // Level3ApiExtras()
-}
-
-private enum class ComponentState { Pressed, Released }
-
-private val colorKey = ColorPropKey()
-private val sizeKey = FloatPropKey()
-private val transitionDefinition = transitionDefinition {
-    state(ComponentState.Pressed) {
-        this[colorKey] = Color(red = 200, green = 0, blue = 0, alpha = 255)
-        this[sizeKey] = 0.2f
-    }
-    state(ComponentState.Released) {
-        this[colorKey] = Color(red = 0, green = 200, blue = 0, alpha = 255)
-        this[sizeKey] = 1.0f
-    }
-}
-
-/**
- * This component does not use Semantics. The gesture detector triggers the animation.
- */
-@Suppress("Unused")
-@Composable
-private fun WithoutSemanticActions() {
-    val animationEndState = state { ComponentState.Released }
-    val pressIndicator =
-        Modifier.pressIndicatorGestureFilter(
-            onStart = { animationEndState.value = ComponentState.Pressed },
-            onStop = { animationEndState.value = ComponentState.Released })
-    Animation(pressIndicator, animationEndState = animationEndState.value)
-}
-
-/**
- * This component uses the level 1 Semantics API.
- */
-@Suppress("Unused")
-@Composable
-private fun Level1Api() {
-    val animationEndState = state { ComponentState.Released }
-
-    val pressedAction = SemanticAction<PxPosition>(
-        phrase = "Pressed",
-        defaultParam = PxPosition.Origin,
-        types = setOf(AccessibilityAction.Primary, PolarityAction.Negative)
-    ) {
-        animationEndState.value = ComponentState.Pressed
-    }
-
-    val releasedAction = SemanticAction<Unit>(
-        phrase = "Released",
-        defaultParam = Unit,
-        types = setOf(AccessibilityAction.Secondary, PolarityAction.Positive)
-    ) { animationEndState.value = ComponentState.Released }
-
-    Semantics(
-        properties = setOf(Label("Animating Circle"), Visibility.Visible),
-        actions = setOf(pressedAction, releasedAction)
-    ) {
-        val pressIndication =
-            PressGestureDetectorWithActions(
-                onPress = pressedAction,
-                onRelease = releasedAction
-            )
-        Animation(pressIndication, animationEndState = animationEndState.value)
-    }
-}
-
-/**
- * This component uses the level 2 Semantics API.
- */
-@Suppress("Unused")
-@Composable
-private fun Level2Api() {
-    val animationEndState = state { ComponentState.Released }
-
-    SemanticAction(
-        phrase = "Shrink",
-        defaultParam = PxPosition.Origin,
-        types = setOf<ActionType>(AccessibilityAction.Primary, PolarityAction.Negative),
-        action = { animationEndState.value = ComponentState.Pressed }) { shrinkAction ->
-        SemanticAction(
-            phrase = "Enlarge",
-            defaultParam = Unit,
-            types = setOf<ActionType>(AccessibilityAction.Secondary, PolarityAction.Positive),
-            action = { animationEndState.value = ComponentState.Released }) { enlargeAction ->
-            SemanticProperties(
-                label = "Animating Circle",
-                visibility = Visibility.Visible,
-                // After implementing node merging, we can remove this line.
-                actions = setOf(shrinkAction, enlargeAction)
-            ) {
-                val pressIndication =
-                    PressGestureDetectorWithActions(
-                        onPress = shrinkAction,
-                        onRelease = enlargeAction
-                    )
-                Animation(pressIndication, animationEndState = animationEndState.value)
-            }
-        }
-    }
-}
-
-/**
- * This component uses the level 3 Semantics API. The [ClickInteraction] provides default
- * parameters for the [SemanticAction]s. The developer has to provide the callback lambda.
- */
-@Suppress("Unused")
-@Composable
-private fun Level3Api() {
-    val animationEndState = state { ComponentState.Released }
-    ClickInteraction(
-        click = {
-            action = {
-                animationEndState.value = when (animationEndState.value) {
-                    ComponentState.Released -> ComponentState.Pressed
-                    ComponentState.Pressed -> ComponentState.Released
-                }
-            }
-        }
-    ) { Animation(animationEndState = animationEndState.value) }
-}
-
-/**
- * This component uses the level 3 Semantics API. Instead of using the default parameter that
- * [ClickInteraction] provides, we provide a custom action phrase and a set of types.
- */
-@Suppress("Unused")
-@Composable
-private fun Level3ApiExtras() {
-    val animationEndState = state { ComponentState.Released }
-    ClickInteraction(
-        click = {
-            phrase = "Toggle"
-            types = setOf(AccessibilityAction.Primary, PolarityAction.Positive)
-            action = {
-                animationEndState.value = when (animationEndState.value) {
-                    ComponentState.Released -> ComponentState.Pressed
-                    ComponentState.Pressed -> ComponentState.Released
-                }
-            }
-        }
-    ) { Animation(animationEndState = animationEndState.value) }
-}
-
-@Composable
-private fun Animation(modifier: Modifier = Modifier, animationEndState: ComponentState) {
-    Transition(definition = transitionDefinition, toState = animationEndState) { state ->
-        val color = state[colorKey]
-        val sizeRatio = state[sizeKey]
-        Canvas(modifier = modifier.fillMaxSize()) {
-            drawCircle(
-                center = Offset(size.width.value / 2, size.height.value / 2),
-                radius = min(size.height, size.width).value * sizeRatio / 2,
-                paint = Paint().apply { this.color = color })
-        }
-    }
-}
diff --git a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/FrameworkDemos.kt b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/FrameworkDemos.kt
index eaf7e54..6f11234 100644
--- a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/FrameworkDemos.kt
+++ b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/FrameworkDemos.kt
@@ -63,7 +63,6 @@
 ))
 
 val FrameworkDemos = DemoCategory("Framework", listOf(
-    ComposableDemo("Animations, gestures, and semantics") { AnimationGestureSemanticsDemo() },
     ComposableDemo("Explicit autofill types") { ExplicitAutofillTypesDemo() },
     ComposableDemo("Focus") { FocusableDemo() },
     ComposableDemo("Multiple collects measure") { MultipleCollectTest() },
diff --git a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL1.kt b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL1.kt
deleted file mode 100644
index 57d553c..0000000
--- a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL1.kt
+++ /dev/null
@@ -1,293 +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.ui.framework.demos
-
-import androidx.compose.Composable
-import androidx.compose.state
-import androidx.ui.core.Alignment
-import androidx.ui.core.Modifier
-import androidx.ui.core.gesture.pressIndicatorGestureFilter
-import androidx.ui.foundation.Box
-import androidx.ui.foundation.ContentGravity
-import androidx.ui.foundation.Text
-import androidx.ui.layout.Arrangement
-import androidx.ui.layout.Column
-import androidx.ui.layout.Row
-import androidx.ui.layout.fillMaxHeight
-import androidx.ui.layout.fillMaxWidth
-import androidx.ui.layout.preferredSize
-import androidx.ui.material.Button
-import androidx.ui.material.MaterialTheme
-import androidx.ui.unit.PxPosition
-import androidx.ui.unit.dp
-import androidx.ui.unit.px
-
-/** A [SemanticProperty] is used to store semantic information about a component.
- *
- * Note: We use an interface instead of a sealed class here to allow SemanticProperty to be
- * implemented as an Enum (Enums cannot inherit from classes, but they can implement interfaces). */
-interface SemanticProperty<T> {
-    val value: T
-
-    // Returning null signifies that this property cannot be merged.
-    fun merge(other: SemanticProperty<T>): SemanticProperty<T>? = null
-}
-
-// These are some example SemanticProperties provided by the framework.
-
-/** [Label] stores a string that describes the component. */
-class Label(override var value: String) : SemanticProperty<String> {
-    // Labels are concatenated.
-    override fun merge(other: SemanticProperty<String>) = Label("$this $other")
-}
-
-/** [Visibility] stores an enum that represents the visibility of the component. */
-enum class Visibility : SemanticProperty<Visibility> {
-    @Suppress("Unused")
-    Undefined,
-    Visible,
-    @Suppress("Unused")
-    Invisible;
-
-    override val value: Visibility get() = this
-
-    // The visibility of the parent takes precedence.
-    override fun merge(other: SemanticProperty<Visibility>) = this
-}
-
-/**
- * This class provides a way to store a function that is run when the [SemanticAction] is invoked.
- */
-class SemanticAction<T>(
-    val phrase: String = "",
-    val defaultParam: T,
-    val types: Set<ActionType> = setOf(),
-    val action: (ActionParam<T>) -> Unit
-)
-
-/**
- * An extension function to invoke the action.
- */
-fun <T> SemanticAction<T>.invoke(
-    caller: ActionCaller = ActionCaller.Unknown,
-    param: T = defaultParam
-) = action(ActionParam(caller, param))
-
-/**
- * The parameter sent to every callback. In addition to the parameter value, it also provides
- * information about the framework that raised the action.
- */
-class ActionParam<T>(
-    @Suppress("Unused") val caller: ActionCaller = ActionCaller.Unknown,
-    val value: T
-)
-
-/**
- * Frameworks that invoke the action. The developer might be interested in knowing which framework
- * invoked the action.
- */
-enum class ActionCaller {
-    Unknown,
-    Accessibility,
-    @Suppress("Unused")
-    AutoFill,
-    Assistant,
-    PointerInput,
-    @Suppress("Unused")
-    KeyInput
-}
-
-/**
- * The [ActionType] is a way to provide more information about a [SemanticAction]. It can be used by
- * other frameworks to identify an action that is to be run.
- *
- * Right now we are just using this interface as a common base class.
- * */
-interface ActionType
-
-// These are some example action types provided by the framework:
-@Suppress("Unused")
-class Autofill : ActionType
-
-enum class PolarityAction : ActionType { Positive, Negative }
-
-enum class AccessibilityAction : ActionType { Primary, Secondary }
-
-@Suppress("Unused")
-enum class EditAction : ActionType { Cut, Copy, Paste, Select, SelectAll, Clear, Undo }
-
-@Suppress("Unused")
-enum class NavigationAction : ActionType { Back, Forward, Up, Down, Left, Right }
-
-/**
- * A PressGestureDetector that uses actions instead of lambda callbacks.
- *
- * This component just wraps the GestureDetetor and allows us to use it with actions, instead of
- * lambda functions. A [SemanticAction] allows us to specify more information in addition to the
- * lambda to be executed.*/
-@Suppress("Unused")
-@Composable
-fun PressGestureDetectorWithActions(
-    onPress: SemanticAction<PxPosition> = SemanticAction(defaultParam = PxPosition.Origin) { },
-    onRelease: SemanticAction<Unit> = SemanticAction(defaultParam = Unit) { },
-    onCancel: SemanticAction<Unit> = SemanticAction(defaultParam = Unit) { }
-) = Modifier.pressIndicatorGestureFilter(
-        onStart = { onPress.action(ActionParam(ActionCaller.PointerInput, it)) },
-        onStop = { onRelease.action(ActionParam(ActionCaller.PointerInput, Unit)) },
-        onCancel = { onCancel.action(ActionParam(ActionCaller.PointerInput, Unit)) }
-    )
-
-/**
- * This is our lowest level API for Semantics.
- *
- * This implementation is a component just wraps its child components in a frame that has buttons
- * which represent some frameworks that will trigger the semantic actions.
- */
-@Suppress("Unused")
-@Composable
-fun Semantics(
-    @Suppress("UNUSED_PARAMETER") properties: Set<SemanticProperty<out Any>> = setOf(),
-    actions: Set<SemanticAction<out Any?>> = setOf(),
-    children: @Composable() () -> Unit
-) {
-    Column(Modifier.fillMaxHeight()) {
-        MaterialTheme {
-            Collapsable {
-                InvokeActionsByType(actions)
-                InvokeActionsByPhrase(actions)
-                InvokeActionsByAssistantAction(actions)
-                InvokeActionsByParameters(actions)
-            }
-        }
-        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
-            Box(
-                Modifier.gravity(Alignment.CenterVertically).preferredSize(500.dp, 300.dp),
-                gravity = ContentGravity.Center,
-                children = children
-            )
-        }
-    }
-}
-
-/**
- * This component adds buttons to invoke actions based on the accessibility action type.
- */
-@Composable
-private fun InvokeActionsByType(actions: Set<SemanticAction<out Any?>> = setOf()) {
-    val primary = actions.firstOrNull { it.types.contains(AccessibilityAction.Primary) }
-    val secondary =
-        actions.firstOrNull { it.types.contains(AccessibilityAction.Secondary) }
-    Text(text = "Accessibility Actions By Type", style = MaterialTheme.typography.h6)
-    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) {
-        Button(onClick = { primary?.invoke(ActionCaller.Accessibility) }) {
-            Text("Primary")
-        }
-        Button(onClick = { secondary?.invoke(ActionCaller.Accessibility) }) {
-            Text("Secondary")
-        }
-    }
-}
-
-/**
- * This component adds buttons to invoke actions based on the accessibility action phrase.
- */
-@Composable
-private fun InvokeActionsByPhrase(actions: Set<SemanticAction<out Any?>> = setOf()) {
-    Text(
-        text = "Accessibility Actions By Phrase",
-        style = MaterialTheme.typography.h6
-    )
-    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) {
-        actions.forEach {
-            Button(onClick = { it.invoke(ActionCaller.Accessibility) }) {
-                Text(it.phrase)
-            }
-        }
-    }
-}
-
-/**
- * This component adds buttons to invoke actions using the assistant.
- */
-@Composable
-private fun InvokeActionsByAssistantAction(actions: Set<SemanticAction<out Any?>> = setOf()) {
-    val positive = actions.firstOrNull { it.types.contains(PolarityAction.Positive) }
-    val negative = actions.firstOrNull { it.types.contains(PolarityAction.Negative) }
-    Text(text = "Assistant Actions", style = MaterialTheme.typography.h6)
-    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) {
-        Button(onClick = { negative?.invoke(ActionCaller.Assistant) }) {
-            Text("Negative")
-        }
-        Button(onClick = { positive?.invoke(ActionCaller.Assistant) }) {
-            Text("Positive")
-        }
-    }
-}
-
-/**
- * This component adds buttons to invoke actions based on the parameter type.
- * It is a more realistic example where the framework using the action will first find out the type
- * of action before invoking it.
- */
-@Composable
-private fun InvokeActionsByParameters(actions: Set<SemanticAction<out Any?>> = setOf()) {
-    @Suppress("UNCHECKED_CAST")
-    val pxPositionAction =
-        actions.firstOrNull { it.defaultParam is PxPosition } as SemanticAction<PxPosition>?
-    @Suppress("UNCHECKED_CAST")
-    val unitAction =
-        actions.firstOrNull { it.defaultParam is Unit } as SemanticAction<Unit>?
-    Text(text = "Actions using Parameters", style = MaterialTheme.typography.h6)
-    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) {
-        Button(onClick = { pxPositionAction?.invoke(param = PxPosition(1.px, 1.px)) }) {
-            Text("IntAction")
-        }
-        Button(onClick = { unitAction?.invoke(param = Unit) }) {
-            Text("VoidAction")
-        }
-    }
-}
-
-/**
- * Enum class used by the [Collapsable] component.
- */
-private enum class CollapseMode { Visible, Collapsed }
-
-/**
- * This composable wraps its children with a container and adds a show/hide button, to hide the
- * children or make them visible.
- */
-@Composable
-private fun Collapsable(children: @Composable() () -> Unit) {
-
-    val collapsedState = state { CollapseMode.Collapsed }
-
-    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) {
-        Button(onClick = {
-            collapsedState.value = when (collapsedState.value) {
-                CollapseMode.Collapsed -> CollapseMode.Visible
-                CollapseMode.Visible -> CollapseMode.Collapsed
-            }
-        }) {
-            Text("Show/Hide Actions")
-        }
-    }
-
-    if (collapsedState.value == CollapseMode.Visible) {
-        children()
-    }
-}
diff --git a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL2.kt b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL2.kt
deleted file mode 100644
index 0e56ffb..0000000
--- a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL2.kt
+++ /dev/null
@@ -1,67 +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.ui.framework.demos
-
-import androidx.compose.Composable
-
-/**
- * This is a level 2 API. This component makes it easier to find/discover available properties.
- */
-@Composable
-fun SemanticProperties(
-    label: String = "",
-    visibility: Visibility = Visibility.Undefined,
-    actions: Set<SemanticAction<out Any?>> = setOf(),
-    children: @Composable() () -> Unit
-) {
-    val propertySet = mutableSetOf<SemanticProperty<out Any>>()
-
-    if (!label.isEmpty()) {
-        propertySet.add(Label(label))
-    }
-
-    if (visibility != Visibility.Undefined) {
-        propertySet.add(visibility)
-    }
-
-    Semantics(properties = propertySet, actions = actions, children = children)
-}
-
-/**
- * This is a component that emits a semantic node with a single action.
- *
- * Since this example does not have node merging implemented, we just creates an semantic action
- * using the supplied parameters and then invokes the supplied lambda.
- *
- * SemanticAction(params) { semanticAction->
- * ...
- * }
- *
- * For now the [Properties] component accepts a set of actions, but once this is finally
- * implemented, we will merge the nodes automatically.
- */
-@Composable
-fun <T> SemanticAction(
-    phrase: String = "",
-    defaultParam: T,
-    types: Set<ActionType> = setOf(),
-    action: (ActionParam<T>) -> Unit,
-    block: @Composable() (SemanticAction<T>) -> Unit
-) {
-    val semanticAction = SemanticAction<T>(phrase, defaultParam, types, action)
-    block.invoke(semanticAction)
-}
diff --git a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL3.kt b/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL3.kt
deleted file mode 100644
index 2f218f7..0000000
--- a/ui/ui-framework/integration-tests/framework-demos/src/main/java/androidx/ui/framework/demos/SemanticsL3.kt
+++ /dev/null
@@ -1,67 +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.ui.framework.demos
-
-import androidx.compose.Composable
-import androidx.ui.core.Layout
-import androidx.ui.unit.ipx
-
-/**
- * This is a level 3 API, where the user uses the [SemanticActionBuilder] to build the action.
- * This component provides default values for all the parameters to the builder, the developer has
- * to just supply the callback lambda.
- */
-@Suppress("Unused")
-@Composable
-fun ClickInteraction(
-    click: SemanticActionBuilder<Unit>.() -> Unit,
-    children: @Composable() () -> Unit
-) {
-    val clickAction = SemanticActionBuilder(phrase = "Click", defaultParam = Unit)
-        .apply(click)
-        .also {
-            if (it.types.none { type -> type is AccessibilityAction }) {
-                it.types += AccessibilityAction.Primary
-            }
-        }.build()
-
-    val press = PressGestureDetectorWithActions(onRelease = clickAction)
-
-    Semantics(actions = setOf(clickAction)) {
-        // TODO(b/150706555): This layout is temporary and should be removed once Semantics
-        //  is implemented with modifiers.
-        Layout(children, press) { measurables, constraints, _ ->
-            check(measurables.size == 1) {
-                "Draggable temporarily assumes that it has exactly 1 child."
-            }
-            measurables.first().measure(constraints)
-                .let { layout(it.width, it.height) { it.place(0.ipx, 0.ipx) } }
-        }
-    }
-}
-
-/**
- * Builder to create a semantic action.
- */
-class SemanticActionBuilder<T>(
-    var phrase: String,
-    var defaultParam: T,
-    var types: Set<ActionType> = setOf(),
-    var action: (ActionParam<T>) -> Unit = {}
-) {
-    fun build() = SemanticAction(phrase, defaultParam, types, action)
-}
diff --git a/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/DrawShadowSample.kt b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/DrawShadowSample.kt
index 2bbb644..f1522de 100644
--- a/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/DrawShadowSample.kt
+++ b/ui/ui-framework/samples/src/main/java/androidx/ui/framework/samples/DrawShadowSample.kt
@@ -21,7 +21,7 @@
 import androidx.ui.core.Modifier
 import androidx.ui.core.drawShadow
 import androidx.ui.foundation.Box
-import androidx.ui.foundation.shape.RectangleShape
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.layout.preferredSize
 import androidx.ui.unit.dp
 
@@ -29,7 +29,7 @@
 @Composable
 fun DrawShadowSample() {
     Box(
-        Modifier.drawShadow(RectangleShape, 12.dp, true, 1f)
+        Modifier.drawShadow(12.dp, RectangleShape)
             .preferredSize(100.dp, 100.dp)
     )
 }
diff --git a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
index c9215b3..7c6ec18 100644
--- a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
+++ b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
@@ -38,10 +38,9 @@
 import androidx.test.filters.SmallTest
 import androidx.test.rule.ActivityTestRule
 import androidx.ui.core.Constraints
+import androidx.ui.core.ContentDrawScope
 import androidx.ui.core.DrawLayerModifier
 import androidx.ui.core.DrawModifier
-import androidx.ui.core.ContentDrawScope
-import androidx.ui.core.DensityAmbient
 import androidx.ui.core.HorizontalAlignmentLine
 import androidx.ui.core.Layout
 import androidx.ui.core.LayoutDirection
@@ -70,12 +69,8 @@
 import androidx.ui.graphics.PaintingStyle
 import androidx.ui.graphics.Path
 import androidx.ui.graphics.Shape
-import androidx.ui.layout.Column
-import androidx.ui.layout.Stack
-import androidx.ui.layout.height
 import androidx.ui.layout.ltr
-import androidx.ui.layout.preferredSize
-import androidx.ui.layout.preferredWidth
+import androidx.ui.layout.padding
 import androidx.ui.layout.rtl
 import androidx.ui.unit.Density
 import androidx.ui.unit.IntPx
@@ -1748,10 +1743,10 @@
             activity.setContent {
                 FixedSize(
                     50.ipx,
-                    Modifier.rtl.drawBehind {
+                    Modifier.rtl.ltr.drawBehind {
                         layoutDirection.value = this.layoutDirection
                         drawLatch.countDown()
-                    }.ltr
+                    }.padding(15.dp).rtl
                 )
             }
         }
@@ -2254,78 +2249,6 @@
         }
     }
 
-    @Test
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
-    fun testInvalidateIntroducedLayer() {
-        val color = mutableStateOf(Color.Red)
-        activityTestRule.runOnUiThread {
-            activity.setContent {
-                FixedSize(size = 30.ipx) {
-                    FixedSize(
-                        10.ipx,
-                        PaddingModifier(10.ipx).drawLayer(elevation = 1f).background(Color.White)
-                    )
-                    FixedSize(30.ipx, Modifier.background(color.value).drawLatchModifier())
-                }
-            }
-        }
-        validateSquareColors(outerColor = Color.Red, innerColor = Color.White, size = 10)
-        drawLatch = CountDownLatch(1)
-        activityTestRule.runOnUiThread {
-            color.value = Color.Blue
-        }
-        validateSquareColors(outerColor = Color.Blue, innerColor = Color.White, size = 10)
-    }
-
-    @Test
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
-    fun testInvalidateLayer_whenOnlyModifierPositionChanges() {
-        val size1 = mutableStateOf(20.dp)
-        val size2 = 20.dp
-        lateinit var density: Density
-
-        activityTestRule.runOnUiThread {
-            activity.setContent {
-                Stack(Modifier.drawLayer()) {
-                    Column(Modifier.height(200.dp)) {
-                        Stack(Modifier.preferredWidth(100.dp).drawLayer()) {
-                            Padding(
-                                0.ipx,
-                                Modifier.background(Color.Gray)
-                                    .preferredSize(100.dp, size1.value)
-                            ) {}
-                        }
-                        Stack(
-                            Modifier.preferredSize(size2)
-                                .background(Color.Blue)
-                                .drawLatchModifier()
-                        ) {}
-                    }
-                }
-                density = DensityAmbient.current
-            }
-        }
-        assertTrue(drawLatch.await(1, TimeUnit.SECONDS))
-
-        var size1Px = with(density) { 20.dp.toIntPx().value }
-        val size2Px = with(density) { size2.toIntPx().value }
-        activityTestRule.waitAndScreenShot().apply {
-            assertRect(Color.Gray, 0, size1Px, size1Px / 2, size1Px / 2)
-            assertRect(Color.Blue, 0, size2Px, size2Px / 2, size1Px + size2Px / 2)
-        }
-
-        drawLatch = CountDownLatch(1)
-        activityTestRule.runOnUiThread {
-            size1.value = 40.dp
-        }
-
-        size1Px = with(density) { 40.dp.toIntPx().value }
-        activityTestRule.waitAndScreenShot().apply {
-            assertRect(Color.Gray, 0, size1Px, size1Px / 2, size1Px / 2)
-            assertRect(Color.Blue, 0, size2Px, size2Px / 2, size1Px + size2Px / 2)
-        }
-    }
-
     private fun composeSquares(model: SquareModel) {
         activityTestRule.runOnUiThreadIR {
             activity.setContent {
@@ -2826,33 +2749,37 @@
         measurable: Measurable,
         height: IntPx,
         layoutDirection: LayoutDirection
-    ): IntPx =
-        measurable.minIntrinsicWidth((height - (top + bottom)).coerceAtLeast(0.ipx)) +
-                (left + right)
+    ): IntPx = measurable.minIntrinsicWidth(
+        (height - (top + bottom)).coerceAtLeast(0.ipx),
+        layoutDirection
+    ) + (left + right)
 
     override fun Density.maxIntrinsicWidthOf(
         measurable: Measurable,
         height: IntPx,
         layoutDirection: LayoutDirection
-    ): IntPx =
-        measurable.maxIntrinsicWidth((height - (top + bottom)).coerceAtLeast(0.ipx)) +
-                (left + right)
+    ): IntPx = measurable.maxIntrinsicWidth(
+        (height - (top + bottom)).coerceAtLeast(0.ipx),
+        layoutDirection
+    ) + (left + right)
 
     override fun Density.minIntrinsicHeightOf(
         measurable: Measurable,
         width: IntPx,
         layoutDirection: LayoutDirection
-    ): IntPx =
-        measurable.minIntrinsicHeight((width - (left + right)).coerceAtLeast(0.ipx)) +
-                (top + bottom)
+    ): IntPx = measurable.minIntrinsicHeight(
+        (width - (left + right)).coerceAtLeast(0.ipx),
+        layoutDirection
+    ) + (top + bottom)
 
     override fun Density.maxIntrinsicHeightOf(
         measurable: Measurable,
         width: IntPx,
         layoutDirection: LayoutDirection
-    ): IntPx =
-        measurable.maxIntrinsicHeight((width - (left + right)).coerceAtLeast(0.ipx)) +
-                (top + bottom)
+    ): IntPx = measurable.maxIntrinsicHeight(
+        (width - (left + right)).coerceAtLeast(0.ipx),
+        layoutDirection
+    ) + (top + bottom)
 
     override fun Density.modifyConstraints(
         constraints: Constraints,
diff --git a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt
index 60a770b..f3d64fb 100644
--- a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt
+++ b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt
@@ -31,9 +31,11 @@
 import androidx.ui.core.DrawLayerModifier
 import androidx.ui.core.Layout
 import androidx.ui.core.Modifier
+import androidx.ui.core.ZIndexModifier
 import androidx.ui.core.drawBehind
 import androidx.ui.core.drawLayer
 import androidx.ui.core.setContent
+import androidx.ui.core.zIndex
 import androidx.ui.framework.test.TestActivity
 import androidx.ui.graphics.Color
 import androidx.ui.graphics.Paint
@@ -80,7 +82,7 @@
                 ) {
                     FixedSize(
                         10.ipx, PaddingModifier(10.ipx)
-                            .drawLayer(elevation = 1f)
+                            .zIndex(1f)
                             .background(Color.White)
                     )
                     FixedSize(
@@ -109,7 +111,7 @@
                 ) {
                     FixedSize(
                         10.ipx, PaddingModifier(10.ipx)
-                            .drawLayer(elevation = 1f)
+                            .zIndex(1f)
                             .background(Color.White)
                     )
                     FixedSize(
@@ -138,7 +140,7 @@
                     FixedSize(10.ipx, PaddingModifier(10.ipx)) {
                         FixedSize(
                             10.ipx,
-                            Modifier.drawLayer(elevation = 1f)
+                            Modifier.zIndex(1f)
                                 .background(Color.Green)
                         )
                     }
@@ -172,7 +174,7 @@
                     FixedSize(10.ipx, PaddingModifier(10.ipx)) {
                         FixedSize(
                             10.ipx,
-                            Modifier.drawLayer(elevation = 1f)
+                            Modifier.zIndex(1f)
                                 .background(Color.Green)
                         )
                     }
@@ -204,7 +206,7 @@
                 ) {
                     FixedSize(
                         10.ipx, PaddingModifier(10.ipx)
-                            .drawLayer(elevation = state.value)
+                            .zIndex(state.value)
                             .background(Color.Black)
                     )
                     FixedSize(
@@ -263,12 +265,12 @@
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
     fun testChangingZOrderReusingModifiers() {
         val state = mutableStateOf(0f)
-        val elevation = object : DrawLayerModifier {
-            override val elevation: Float
+        val zIndex = object : ZIndexModifier {
+            override val zIndex: Float
                 get() = state.value
         }
         val modifier1 = PaddingModifier(10.ipx)
-            .plus(elevation)
+            .plus(zIndex)
             .background(Color.White)
         val modifier2 = Modifier.background(Color.Red)
             .drawLatchModifier()
@@ -327,7 +329,7 @@
     fun testChangingZOrderUncle() {
         val state = mutableStateOf(0f)
         val elevation = object : DrawLayerModifier {
-            override val elevation: Float
+            override val shadowElevation: Float
                 get() = state.value
         }
         val view = View(activity)
@@ -396,7 +398,7 @@
                     FixedSize(
                         size,
                         PaddingModifier(10.ipx)
-                            .drawLayer(elevation = 1f)
+                            .zIndex(1f)
                             .background(Color.White)
                     )
                     FixedSize(
@@ -444,7 +446,9 @@
                 FixedSize(size = 30.ipx) {
                     FixedSize(
                         10.ipx,
-                        PaddingModifier(10.ipx).drawLayer(elevation = 1f).background(Color.White)
+                        PaddingModifier(10.ipx)
+                            .zIndex(1f)
+                            .background(Color.White)
                     )
                     FixedSize(
                         30.ipx,
@@ -482,12 +486,12 @@
                 ) {
                     FixedSize(
                         10.ipx, PaddingModifier(10.ipx)
-                            .drawLayer(elevation = 3f)
-                            .drawLayer(elevation = 1f)
+                            .zIndex(3f)
+                            .zIndex(1f)
                             .background(Color.White)
                     )
                     FixedSize(
-                        30.ipx, Modifier.drawLayer(elevation = 2f)
+                        30.ipx, Modifier.zIndex(2f)
                             .background(Color.Red)
                             .drawLatchModifier()
                     )
@@ -511,7 +515,7 @@
             .background(underColor)
             .drawLatchModifier()
             .plus(object : DrawLayerModifier {
-                override val elevation: Float
+                override val shadowElevation: Float
                     get() {
                         return elevation.value
                     }
@@ -573,6 +577,70 @@
         assertTrue(drawLatch.await(1, TimeUnit.SECONDS))
     }
 
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    fun testInvalidateParentOfReorderedChild() {
+        val color = mutableStateOf(Color.Red)
+        rule.runOnUiThread {
+            activity.setContent {
+                FixedSize(size = 30.ipx) {
+                    FixedSize(
+                        10.ipx,
+                        PaddingModifier(10.ipx)
+                            .zIndex(1f)
+                            .background(Color.White)
+                    )
+                    FixedSize(30.ipx, Modifier.background(color.value).drawLatchModifier())
+                }
+            }
+        }
+        rule.validateSquareColors(
+            outerColor = Color.Red,
+            innerColor = Color.White,
+            size = 10,
+            drawLatch = drawLatch
+        )
+        drawLatch = CountDownLatch(1)
+        rule.runOnUiThread {
+            color.value = Color.Blue
+        }
+        rule.validateSquareColors(
+            outerColor = Color.Blue,
+            innerColor = Color.White,
+            size = 10,
+            drawLatch = drawLatch
+        )
+    }
+
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    fun testShadowSizeIsNotCausingReorder() {
+        rule.runOnUiThread {
+            activity.setContent {
+                FixedSize(
+                    size = 30.ipx
+                ) {
+                    FixedSize(
+                        10.ipx, PaddingModifier(10.ipx)
+                            .drawLayer(shadowElevation = 1f)
+                            .background(Color.White)
+                    )
+                    FixedSize(
+                        30.ipx, Modifier.drawLayer()
+                            .background(Color.Red)
+                            .drawLatchModifier()
+                    )
+                }
+            }
+        }
+        rule.validateSquareColors(
+            outerColor = Color.Red,
+            innerColor = Color.Red,
+            size = 10,
+            drawLatch = drawLatch
+        )
+    }
+
     fun Modifier.drawLatchModifier() = drawBehind { drawLatch.countDown() }
 }
 
diff --git a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/DrawShadowTest.kt b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/DrawShadowTest.kt
index 1954660..6e67052 100644
--- a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/DrawShadowTest.kt
+++ b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/DrawShadowTest.kt
@@ -154,7 +154,7 @@
                 AtLeastSize(size = 12.ipx, modifier = background(Color.White)) {
                     AtLeastSize(
                         size = 10.ipx,
-                        modifier = Modifier.drawShadow(rectShape, 4.dp, opacity = 0.5f)
+                        modifier = Modifier.drawShadow(4.dp, rectShape, opacity = 0.5f)
                     ) {
                     }
                 }
@@ -181,7 +181,7 @@
             activity.setContent {
                 AtLeastSize(size = 12.ipx, modifier = background(Color.White)) {
                     val shadow = if (model.value) {
-                        Modifier.drawShadow(rectShape, 8.dp)
+                        Modifier.drawShadow(8.dp, rectShape)
                     } else {
                         Modifier
                     }
@@ -210,7 +210,7 @@
         AtLeastSize(size = 12.ipx, modifier = modifier + background(Color.White)) {
             AtLeastSize(
                 size = 10.ipx,
-                modifier = Modifier.drawShadow(shape = rectShape, elevation = elevation.value)
+                modifier = Modifier.drawShadow(elevation = elevation.value, shape = rectShape)
             ) {
             }
         }
diff --git a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
index ff0156e..f2716cef 100644
--- a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
+++ b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
@@ -21,17 +21,34 @@
 import androidx.compose.Composable
 import androidx.test.filters.SmallTest
 import androidx.test.rule.ActivityTestRule
+import androidx.ui.core.Constraints
+import androidx.ui.core.IntrinsicMeasurable
+import androidx.ui.core.IntrinsicMeasureScope
 import androidx.ui.core.Layout
 import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier
+import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.Measurable
+import androidx.ui.core.MeasureScope
 import androidx.ui.core.Modifier
 import androidx.ui.core.Ref
+import androidx.ui.core.offset
 import androidx.ui.core.onPositioned
 import androidx.ui.core.setContent
+import androidx.ui.graphics.Color
+import androidx.ui.layout.Stack
+import androidx.ui.layout.ltr
+import androidx.ui.layout.padding
+import androidx.ui.layout.rtl
+import androidx.ui.layout.size
 import androidx.ui.unit.Density
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPx
 import androidx.ui.unit.PxPosition
+import androidx.ui.unit.dp
 import androidx.ui.unit.ipx
 import org.junit.Assert
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -129,14 +146,141 @@
         Assert.assertEquals(PxPosition(0.ipx, size * 2), position[2].value)
     }
 
+    @Test
+    fun measurement_subsequentChanges() = with(density) {
+        // The layout is a 100.dp white square, wrapped by 10.dp blue padding, wrapped by
+        // 10.dp green padding, wrapped by 10.dp gray padding, wrapped by 10.dp magenta padding.
+        // The test is asserting layout direction changes using modifiers and Layouts, and also
+        // the propagation of layout direction across modifiers and layouts that are not changing
+        // it. Padding is also added to the start, but the obtained padding is visually symmetrical
+        // due to the layout direction changes.
+        activityTestRule.runOnUiThreadIR {
+            activity.setContent {
+                Stack(
+                    Modifier
+                        // White space padding.
+                        .padding(10.dp)
+                        // Magenta 10.dp padding.
+                        .rtl
+                        .background(Color.Magenta)
+                        .padding(top = 10.dp, bottom = 10.dp)
+                        .padding(start = 10.dp)
+                        .ltr
+                        .padding(start = 10.dp)
+                ) {
+                    Stack(Modifier.rtl) {
+                        Stack(
+                            Modifier
+                                // Gray 10.dp padding.
+                                .background(Color.Gray)
+                                .padding(top = 10.dp, bottom = 10.dp)
+                                .padding(start = 10.dp)
+                                .ltr
+                                .padding(start = 10.dp)
+                        ) {
+                            UpdateLayoutDirection(LayoutDirection.Rtl) {
+                                // Green 10.dp padding.
+                                Stack(
+                                    Modifier
+                                        .background(Color.Green)
+                                        .padding(top = 10.dp, bottom = 10.dp)
+                                        .padding(start = 10.dp)
+                                        .ltr
+                                        .padding(start = 10.dp)
+                                        .rtl
+                                ) {
+                                    // Blue 10.dp padding.
+                                    Stack(Modifier.background(Color.Blue)) {
+                                        Padding(
+                                            start = 10.dp,
+                                            top = 10.dp,
+                                            end = 0.dp,
+                                            bottom = 10.dp
+                                        ) {
+                                            UpdateLayoutDirection(LayoutDirection.Ltr) {
+                                                Padding(
+                                                    start = 10.dp,
+                                                    top = 0.dp,
+                                                    end = 0.dp,
+                                                    bottom = 0.dp
+                                                ) {
+                                                    Stack(Modifier
+                                                        .background(Color.White)
+                                                        .size(100.dp)) {}
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        activityTestRule.waitAndScreenShot().apply {
+            val center = 200.dp.toIntPx().value / 2
+            assertRect(
+                Color.Magenta, 161.dp.toIntPx().value, 179.dp.toIntPx().value, center, center
+            )
+            assertRect(Color.Gray, 141.dp.toIntPx().value, 159.dp.toIntPx().value, center, center)
+            assertRect(Color.Green, 121.dp.toIntPx().value, 139.dp.toIntPx().value, center, center)
+            assertRect(Color.Blue, 101.dp.toIntPx().value, 119.dp.toIntPx().value, center, center)
+        }
+        Unit
+    }
+
+    @Test
+    fun intrinsics_subsequentChanges() {
+        val latch = CountDownLatch(1)
+        activityTestRule.runOnUiThreadIR {
+            activity.setContent {
+                Stack(Modifier
+                    .queryIntrinsics()
+                    .rtl
+                    .assertLayoutDirection(LayoutDirection.Rtl)
+                    .ltr
+                    .assertLayoutDirection(LayoutDirection.Ltr)
+                    .rtl
+                ) {
+                    Layout(
+                        children = {},
+                        minIntrinsicWidthMeasureBlock = { _, _, layoutDirection ->
+                            assertEquals(LayoutDirection.Rtl, layoutDirection)
+                            0.ipx
+                        },
+                        minIntrinsicHeightMeasureBlock = { _, _, layoutDirection ->
+                            assertEquals(LayoutDirection.Rtl, layoutDirection)
+                            0.ipx
+                        },
+                        maxIntrinsicWidthMeasureBlock = { _, _, layoutDirection ->
+                            assertEquals(LayoutDirection.Rtl, layoutDirection)
+                            0.ipx
+                        },
+                        maxIntrinsicHeightMeasureBlock = { _, _, layoutDirection ->
+                            assertEquals(LayoutDirection.Rtl, layoutDirection)
+                            0.ipx
+                        }
+                    ) { _, _, layoutDirection ->
+                        assertEquals(LayoutDirection.Rtl, layoutDirection)
+                        latch.countDown()
+                        layout(0.ipx, 0.ipx) {}
+                    }
+                }
+            }
+        }
+        assertTrue(latch.await(1, TimeUnit.SECONDS))
+    }
+
     @Composable
     private fun CustomLayout(
         absolutePositioning: Boolean,
         testLayoutDirection: LayoutDirection
     ) {
-        val modifier = object : LayoutModifier {
-            override fun Density.modifyLayoutDirection(layoutDirection: LayoutDirection) =
-                testLayoutDirection
+        val modifier = when (testLayoutDirection) {
+            LayoutDirection.Ltr -> Modifier.ltr
+            LayoutDirection.Rtl -> Modifier.rtl
         }
         Layout(
             children = @Composable {
@@ -169,6 +313,60 @@
     }
 
     @Composable
+    private fun UpdateLayoutDirection(ld: LayoutDirection, children: @Composable() () -> Unit) {
+        Layout(children) { measurables, constraints, _ ->
+            val placeable = measurables[0].measure(constraints, ld)
+            layout(placeable.width, placeable.height) {
+                placeable.place(0.ipx, 0.ipx)
+            }
+        }
+    }
+
+    @Composable
+    private fun Padding(
+        start: Dp,
+        top: Dp,
+        end: Dp,
+        bottom: Dp,
+        children: @Composable() () -> Unit
+    ) {
+        Layout(children) { measurables, constraints, _ ->
+            val childConstraints = constraints.offset(
+                -start.toIntPx() - end.toIntPx(),
+                -top.toIntPx() - bottom.toIntPx()
+            )
+            val placeable = measurables[0].measure(childConstraints)
+            layout(
+                placeable.width + start.toIntPx() + end.toIntPx(),
+                placeable.height + top.toIntPx() + bottom.toIntPx()
+            ) {
+                placeable.place(start.toIntPx(), top.toIntPx())
+            }
+        }
+    }
+
+    private fun Modifier.queryIntrinsics() = this + object : LayoutModifier2 {
+        override fun MeasureScope.measure(
+            measurable: Measurable,
+            constraints: Constraints,
+            layoutDirection: LayoutDirection
+        ): MeasureScope.MeasureResult {
+            measurable.minIntrinsicWidth(0.ipx, layoutDirection)
+            measurable.minIntrinsicHeight(0.ipx, layoutDirection)
+            measurable.maxIntrinsicWidth(0.ipx, layoutDirection)
+            measurable.maxIntrinsicHeight(0.ipx, layoutDirection)
+            measurable.minIntrinsicWidth(0.ipx)
+            measurable.minIntrinsicHeight(0.ipx)
+            measurable.maxIntrinsicWidth(0.ipx)
+            measurable.maxIntrinsicHeight(0.ipx)
+            val placeable = measurable.measure(constraints)
+            return layout(placeable.width, placeable.height) {
+                placeable.place(0.ipx, 0.ipx)
+            }
+        }
+    }
+
+    @Composable
     private fun saveLayoutInfo(
         position: Ref<PxPosition>,
         countDownLatch: CountDownLatch
@@ -176,4 +374,59 @@
         position.value = it.localToGlobal(PxPosition(0.ipx, 0.ipx))
         countDownLatch.countDown()
     }
-}
\ No newline at end of file
+}
+
+private fun Modifier.assertLayoutDirection(expectedLayoutDirection: LayoutDirection): Modifier =
+    this + object : LayoutModifier2 {
+        override fun MeasureScope.measure(
+            measurable: Measurable,
+            constraints: Constraints,
+            layoutDirection: LayoutDirection
+        ): MeasureScope.MeasureResult {
+            assertEquals(expectedLayoutDirection, layoutDirection)
+            val placeable = measurable.measure(constraints)
+            return layout(placeable.width, placeable.height) {
+                placeable.place(0.ipx, 0.ipx)
+            }
+        }
+
+        override fun IntrinsicMeasureScope.minIntrinsicWidth(
+            measurable: IntrinsicMeasurable,
+            height: IntPx,
+            layoutDirection: LayoutDirection
+        ): IntPx {
+            assertEquals(expectedLayoutDirection, layoutDirection)
+            measurable.minIntrinsicWidth(height)
+            return measurable.minIntrinsicWidth(height, layoutDirection)
+        }
+
+        override fun IntrinsicMeasureScope.minIntrinsicHeight(
+            measurable: IntrinsicMeasurable,
+            width: IntPx,
+            layoutDirection: LayoutDirection
+        ): IntPx {
+            assertEquals(expectedLayoutDirection, layoutDirection)
+            measurable.minIntrinsicHeight(width)
+            return measurable.minIntrinsicHeight(width, layoutDirection)
+        }
+
+        override fun IntrinsicMeasureScope.maxIntrinsicWidth(
+            measurable: IntrinsicMeasurable,
+            height: IntPx,
+            layoutDirection: LayoutDirection
+        ): IntPx {
+            assertEquals(expectedLayoutDirection, layoutDirection)
+            measurable.maxIntrinsicWidth(height)
+            return measurable.maxIntrinsicWidth(height, layoutDirection)
+        }
+
+        override fun IntrinsicMeasureScope.maxIntrinsicHeight(
+            measurable: IntrinsicMeasurable,
+            width: IntPx,
+            layoutDirection: LayoutDirection
+        ): IntPx {
+            assertEquals(expectedLayoutDirection, layoutDirection)
+            measurable.maxIntrinsicHeight(width)
+            return measurable.maxIntrinsicHeight(width, layoutDirection)
+        }
+    }
diff --git a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
index dd25b6f..f0cef1a 100644
--- a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
+++ b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
@@ -48,6 +48,8 @@
 import androidx.ui.graphics.Color
 import androidx.ui.graphics.Paint
 import androidx.ui.graphics.vector.VectorPainter
+import androidx.ui.layout.ltr
+import androidx.ui.layout.rtl
 import androidx.ui.unit.Density
 import androidx.ui.unit.IntPx
 import androidx.ui.unit.IntPxSize
@@ -704,8 +706,9 @@
             drawLatch.countDown()
         }
 
-    private fun layoutDirectionModifier(ld: LayoutDirection) = object : LayoutModifier {
-        override fun Density.modifyLayoutDirection(layoutDirection: LayoutDirection) = ld
+    private fun layoutDirectionModifier(ld: LayoutDirection) = when (ld) {
+        LayoutDirection.Ltr -> Modifier.ltr
+        LayoutDirection.Rtl -> Modifier.rtl
     }
 }
 
diff --git a/ui/ui-framework/src/main/java/androidx/ui/core/DrawShadow.kt b/ui/ui-framework/src/main/java/androidx/ui/core/DrawShadow.kt
index 518f1d0..f1ade00 100644
--- a/ui/ui-framework/src/main/java/androidx/ui/core/DrawShadow.kt
+++ b/ui/ui-framework/src/main/java/androidx/ui/core/DrawShadow.kt
@@ -18,8 +18,10 @@
 
 import androidx.annotation.FloatRange
 import androidx.compose.Composable
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.Shape
 import androidx.ui.unit.Dp
+import androidx.ui.unit.dp
 
 /**
  * Creates a [DrawLayerModifier] that draws the shadow. The [elevation] defines the visual depth of
@@ -48,33 +50,39 @@
     elevation: Dp,
     clipToOutline: Boolean = true,
     @FloatRange(from = 0.0, to = 1.0) opacity: Float = 1f
-) = Modifier.drawShadow(shape, elevation, clipToOutline, opacity)
+) = Modifier.drawShadow(elevation, shape, clipToOutline, opacity)
 
 /**
- * Creates a [DrawLayerModifier] that draws the shadow. The [elevation] defines the visual depth of
- * the physical object. The physical object has a shape specified by [shape].
+ * Creates a [DrawLayerModifier] that draws the shadow. The [elevation] defines the visual
+ * depth of the physical object. The physical object has a shape specified by [shape].
+ *
+ * Note that [elevation] is only affecting the shadow size and doesn't change the drawing order.
+ * Use [zIndex] modifier if you want to draw the elements with larger [elevation] after all the
+ * elements with a smaller one.
  *
  * Example usage:
  *
  * @sample androidx.ui.framework.samples.DrawShadowSample
  *
- * @param elevation The z-coordinate at which to place this physical object.
+ * @param elevation The elevation for the shadow in pixels
  * @param shape Defines a shape of the physical object
  * @param clipToOutline When active, the content drawing clips to the outline.
  * @param opacity The opacity of the layer, including the shadow.
  */
 @Composable
 fun Modifier.drawShadow(
-    shape: Shape,
     elevation: Dp,
-    clipToOutline: Boolean = true,
+    shape: Shape = RectangleShape,
+    clipToOutline: Boolean = elevation > 0.dp,
     @FloatRange(from = 0.0, to = 1.0) opacity: Float = 1f
-) = this + with(DensityAmbient.current) {
-    Modifier.drawLayer(
+) = if (elevation > 0.dp || clipToOutline || opacity != 1f) {
+    this + Modifier.drawLayer(
         alpha = opacity,
-        elevation = elevation.toPx().value,
+        shadowElevation = with(DensityAmbient.current) { elevation.toPx().value },
         outlineShape = shape,
         clipToBounds = false,
         clipToOutline = clipToOutline
     )
-}
\ No newline at end of file
+} else {
+    this
+}
diff --git a/ui/ui-framework/src/main/java/androidx/ui/core/Layout.kt b/ui/ui-framework/src/main/java/androidx/ui/core/Layout.kt
index 32afa7a..63b5913 100644
--- a/ui/ui-framework/src/main/java/androidx/ui/core/Layout.kt
+++ b/ui/ui-framework/src/main/java/androidx/ui/core/Layout.kt
@@ -89,29 +89,29 @@
             layoutDirection: LayoutDirection
         ) = measureScope.measureBlock(measurables, constraints, layoutDirection)
         override fun minIntrinsicWidth(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             h: IntPx,
             layoutDirection: LayoutDirection
-        ) = density.minIntrinsicWidthMeasureBlock(measurables, h, layoutDirection)
+        ) = intrinsicMeasureScope.minIntrinsicWidthMeasureBlock(measurables, h, layoutDirection)
         override fun minIntrinsicHeight(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             w: IntPx,
             layoutDirection: LayoutDirection
-        ) = density.minIntrinsicHeightMeasureBlock(measurables, w, layoutDirection)
+        ) = intrinsicMeasureScope.minIntrinsicHeightMeasureBlock(measurables, w, layoutDirection)
         override fun maxIntrinsicWidth(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             h: IntPx,
             layoutDirection: LayoutDirection
-        ) = density.maxIntrinsicWidthMeasureBlock(measurables, h, layoutDirection)
+        ) = intrinsicMeasureScope.maxIntrinsicWidthMeasureBlock(measurables, h, layoutDirection)
         override fun maxIntrinsicHeight(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             w: IntPx,
             layoutDirection: LayoutDirection
-        ) = density.maxIntrinsicHeightMeasureBlock(measurables, w, layoutDirection)
+        ) = intrinsicMeasureScope.maxIntrinsicHeightMeasureBlock(measurables, w, layoutDirection)
     }
     Layout(children, measureBlocks, modifier)
 }
@@ -240,37 +240,37 @@
     override val parentData: Any?
         get() = measurable.parentData
 
-    override fun measure(constraints: Constraints): Placeable {
+    override fun measure(constraints: Constraints, layoutDirection: LayoutDirection): Placeable {
         if (widthHeight == IntrinsicWidthHeight.Width) {
             val width = if (minMax == IntrinsicMinMax.Max) {
-                measurable.maxIntrinsicWidth(constraints.maxHeight)
+                measurable.maxIntrinsicWidth(constraints.maxHeight, layoutDirection)
             } else {
-                measurable.minIntrinsicWidth(constraints.maxHeight)
+                measurable.minIntrinsicWidth(constraints.maxHeight, layoutDirection)
             }
             return DummyPlaceable(width, constraints.maxHeight)
         }
         val height = if (minMax == IntrinsicMinMax.Max) {
-            measurable.maxIntrinsicHeight(constraints.maxWidth)
+            measurable.maxIntrinsicHeight(constraints.maxWidth, layoutDirection)
         } else {
-            measurable.minIntrinsicHeight(constraints.maxWidth)
+            measurable.minIntrinsicHeight(constraints.maxWidth, layoutDirection)
         }
         return DummyPlaceable(constraints.maxWidth, height)
     }
 
-    override fun minIntrinsicWidth(height: IntPx): IntPx {
-        return measurable.minIntrinsicWidth(height)
+    override fun minIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx {
+        return measurable.minIntrinsicWidth(height, layoutDirection)
     }
 
-    override fun maxIntrinsicWidth(height: IntPx): IntPx {
-        return measurable.maxIntrinsicWidth(height)
+    override fun maxIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx {
+        return measurable.maxIntrinsicWidth(height, layoutDirection)
     }
 
-    override fun minIntrinsicHeight(width: IntPx): IntPx {
-        return measurable.minIntrinsicHeight(width)
+    override fun minIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx {
+        return measurable.minIntrinsicHeight(width, layoutDirection)
     }
 
-    override fun maxIntrinsicHeight(width: IntPx): IntPx {
-        return measurable.maxIntrinsicHeight(width)
+    override fun maxIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx {
+        return measurable.maxIntrinsicHeight(width, layoutDirection)
     }
 }
 
@@ -279,9 +279,9 @@
  */
 @PublishedApi
 internal class IntrinsicsMeasureScope(
-    density: Density
+    density: Density,
+    override val layoutDirection: LayoutDirection
 ) : MeasureScope(), Density by density
-
 /**
  * Default [LayoutNode.MeasureBlocks] object implementation, providing intrinsic measurements
  * that use the measure block replacing the measure calls with intrinsic measurement calls.
@@ -295,29 +295,49 @@
             layoutDirection: LayoutDirection
         ) = measureScope.measureBlock(measurables, constraints, layoutDirection)
         override fun minIntrinsicWidth(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             h: IntPx,
             layoutDirection: LayoutDirection
-        ) = density.MeasuringMinIntrinsicWidth(measureBlock, measurables, h, layoutDirection)
+        ) = intrinsicMeasureScope.MeasuringMinIntrinsicWidth(
+            measureBlock,
+            measurables,
+            h,
+            layoutDirection
+        )
         override fun minIntrinsicHeight(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             w: IntPx,
             layoutDirection: LayoutDirection
-        ) = density.MeasuringMinIntrinsicHeight(measureBlock, measurables, w, layoutDirection)
+        ) = intrinsicMeasureScope.MeasuringMinIntrinsicHeight(
+            measureBlock,
+            measurables,
+            w,
+            layoutDirection
+        )
         override fun maxIntrinsicWidth(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             h: IntPx,
             layoutDirection: LayoutDirection
-        ) = density.MeasuringMaxIntrinsicWidth(measureBlock, measurables, h, layoutDirection)
+        ) = intrinsicMeasureScope.MeasuringMaxIntrinsicWidth(
+            measureBlock,
+            measurables,
+            h,
+            layoutDirection
+        )
         override fun maxIntrinsicHeight(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             w: IntPx,
             layoutDirection: LayoutDirection
-        ) = density.MeasuringMaxIntrinsicHeight(measureBlock, measurables, w, layoutDirection)
+        ) = intrinsicMeasureScope.MeasuringMaxIntrinsicHeight(
+            measureBlock,
+            measurables,
+            w,
+            layoutDirection
+        )
 
         override fun toString(): String {
             // this calls simpleIdentityToString on measureBlock because it is typically a lambda,
@@ -343,7 +363,7 @@
         DefaultIntrinsicMeasurable(it, IntrinsicMinMax.Min, IntrinsicWidthHeight.Width)
     }
     val constraints = Constraints(maxHeight = h)
-    val layoutReceiver = IntrinsicsMeasureScope(this)
+    val layoutReceiver = IntrinsicsMeasureScope(this, layoutDirection)
     val layoutResult = layoutReceiver.measureBlock(mapped, constraints, layoutDirection)
     return layoutResult.width
 }
@@ -362,7 +382,7 @@
         DefaultIntrinsicMeasurable(it, IntrinsicMinMax.Min, IntrinsicWidthHeight.Height)
     }
     val constraints = Constraints(maxWidth = w)
-    val layoutReceiver = IntrinsicsMeasureScope(this)
+    val layoutReceiver = IntrinsicsMeasureScope(this, layoutDirection)
     val layoutResult = layoutReceiver.measureBlock(mapped, constraints, layoutDirection)
     return layoutResult.height
 }
@@ -381,7 +401,7 @@
         DefaultIntrinsicMeasurable(it, IntrinsicMinMax.Max, IntrinsicWidthHeight.Width)
     }
     val constraints = Constraints(maxHeight = h)
-    val layoutReceiver = IntrinsicsMeasureScope(this)
+    val layoutReceiver = IntrinsicsMeasureScope(this, layoutDirection)
     val layoutResult = layoutReceiver.measureBlock(mapped, constraints, layoutDirection)
     return layoutResult.width
 }
@@ -400,7 +420,7 @@
         DefaultIntrinsicMeasurable(it, IntrinsicMinMax.Max, IntrinsicWidthHeight.Height)
     }
     val constraints = Constraints(maxWidth = w)
-    val layoutReceiver = IntrinsicsMeasureScope(this)
+    val layoutReceiver = IntrinsicsMeasureScope(this, layoutDirection)
     val layoutResult = layoutReceiver.measureBlock(mapped, constraints, layoutDirection)
     return layoutResult.height
 }
@@ -478,7 +498,7 @@
             var maxWidth: IntPx = constraints.minWidth
             var maxHeight: IntPx = constraints.minHeight
             layoutChildren.forEach {
-                it.measure(constraints)
+                it.measure(constraints, layoutDirection)
                 maxWidth = max(maxWidth, it.width)
                 maxHeight = max(maxHeight, it.height)
             }
@@ -496,7 +516,7 @@
         val constraints = lastConstraints!!
         // TODO(b/150390669): Review use of @Untracked
         subcomposeInto(context, node, recomposer, compositionRef) @Untracked {
-            children(constraints, node.layoutDirection!!)
+            children(constraints, node.measureScope.layoutDirection)
         }
         forceRecompose = false
     }
diff --git a/ui/ui-framework/src/main/java/androidx/ui/core/PainterModifier.kt b/ui/ui-framework/src/main/java/androidx/ui/core/PainterModifier.kt
index e330b46..251de24 100644
--- a/ui/ui-framework/src/main/java/androidx/ui/core/PainterModifier.kt
+++ b/ui/ui-framework/src/main/java/androidx/ui/core/PainterModifier.kt
@@ -155,8 +155,10 @@
         layoutDirection: LayoutDirection
     ): IntPx {
         val constraints = Constraints(maxHeight = height)
-        val layoutWidth =
-            measurable.minIntrinsicWidth(modifyConstraints(constraints, layoutDirection).maxHeight)
+        val layoutWidth = measurable.minIntrinsicWidth(
+            modifyConstraints(constraints, layoutDirection).maxHeight,
+            layoutDirection
+        )
         val painterIntrinsicWidth =
             painter.intrinsicSize.width.takeUnless {
                 !sizeToIntrinsics || it == Px.Infinity
@@ -170,8 +172,10 @@
         layoutDirection: LayoutDirection
     ): IntPx {
         val constraints = Constraints(maxHeight = height)
-        val layoutWidth =
-            measurable.maxIntrinsicWidth(modifyConstraints(constraints, layoutDirection).maxHeight)
+        val layoutWidth = measurable.maxIntrinsicWidth(
+            modifyConstraints(constraints, layoutDirection).maxHeight,
+            layoutDirection
+        )
         val painterIntrinsicWidth =
             painter.intrinsicSize.width.takeUnless {
                 !sizeToIntrinsics || it == Px.Infinity
@@ -185,8 +189,10 @@
         layoutDirection: LayoutDirection
     ): IntPx {
         val constraints = Constraints(maxWidth = width)
-        val layoutHeight =
-            measurable.minIntrinsicHeight(modifyConstraints(constraints, layoutDirection).maxWidth)
+        val layoutHeight = measurable.minIntrinsicHeight(
+            modifyConstraints(constraints, layoutDirection).maxWidth,
+            layoutDirection
+        )
         val painterIntrinsicHeight =
             painter.intrinsicSize.height.takeUnless {
                 !sizeToIntrinsics || it == Px.Infinity
@@ -200,8 +206,10 @@
         layoutDirection: LayoutDirection
     ): IntPx {
         val constraints = Constraints(maxWidth = width)
-        val layoutHeight =
-            measurable.maxIntrinsicHeight(modifyConstraints(constraints, layoutDirection).maxWidth)
+        val layoutHeight = measurable.maxIntrinsicHeight(
+            modifyConstraints(constraints, layoutDirection).maxWidth,
+            layoutDirection
+        )
         val painterIntrinsicHeight =
             painter.intrinsicSize.height.takeUnless {
                 !sizeToIntrinsics || it == Px.Infinity
diff --git a/ui/ui-geometry/api/0.1.0-dev11.txt b/ui/ui-geometry/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..4ad12c3
--- /dev/null
+++ b/ui/ui-geometry/api/0.1.0-dev11.txt
@@ -0,0 +1,258 @@
+// Signature format: 3.0
+package androidx.ui.geometry {
+
+  public final class Offset implements androidx.ui.geometry.OffsetBase {
+    ctor public Offset(float dx, float dy);
+    method public infix androidx.ui.geometry.Rect and(androidx.ui.geometry.Size other);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.geometry.Offset copy(float dx, float dy);
+    method public operator androidx.ui.geometry.Offset div(float operand);
+    method public float getDirection();
+    method public float getDistance();
+    method public float getDistanceSquared();
+    method public float getDx();
+    method public float getDy();
+    method public operator androidx.ui.geometry.Offset minus(androidx.ui.geometry.Offset other);
+    method public operator androidx.ui.geometry.Offset plus(androidx.ui.geometry.Offset other);
+    method public operator androidx.ui.geometry.Offset rem(float operand);
+    method public androidx.ui.geometry.Offset scale(float scaleX, float scaleY);
+    method public operator androidx.ui.geometry.Offset times(float operand);
+    method public androidx.ui.geometry.Offset translate(float translateX, float translateY);
+    method public androidx.ui.geometry.Offset truncDiv(float operand);
+    method public operator androidx.ui.geometry.Offset unaryMinus();
+    field public static final androidx.ui.geometry.Offset.Companion! Companion;
+  }
+
+  public static final class Offset.Companion {
+    method public androidx.ui.geometry.Offset getInfinite();
+    method public androidx.ui.geometry.Offset getZero();
+    method public boolean isValid(androidx.ui.geometry.Offset offset);
+    method public androidx.ui.geometry.Offset lerp(androidx.ui.geometry.Offset start, androidx.ui.geometry.Offset stop, float fraction);
+    property public final androidx.ui.geometry.Offset infinite;
+    property public final androidx.ui.geometry.Offset zero;
+  }
+
+  public interface OffsetBase {
+    method public float getDx();
+    method public float getDy();
+    method public default boolean isFinite();
+    method public default boolean isGreaterOrEqThan(androidx.ui.geometry.OffsetBase other);
+    method public default boolean isGreaterThan(androidx.ui.geometry.OffsetBase other);
+    method public default boolean isInfinite();
+    method public default boolean isLessOrEqThan(androidx.ui.geometry.OffsetBase other);
+    method public default boolean isLessThan(androidx.ui.geometry.OffsetBase other);
+    property public abstract float dx;
+    property public abstract float dy;
+  }
+
+  public final class RRect {
+    ctor public RRect(float left, float top, float right, float bottom, float topLeftRadiusX, float topLeftRadiusY, float topRightRadiusX, float topRightRadiusY, float bottomRightRadiusX, float bottomRightRadiusY, float bottomLeftRadiusX, float bottomLeftRadiusY);
+    method public float component1();
+    method public float component10();
+    method public float component11();
+    method public float component12();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public float component5();
+    method public float component6();
+    method public float component7();
+    method public float component8();
+    method public float component9();
+    method public boolean contains(androidx.ui.geometry.Offset point);
+    method public androidx.ui.geometry.RRect copy(float left, float top, float right, float bottom, float topLeftRadiusX, float topLeftRadiusY, float topRightRadiusX, float topRightRadiusY, float bottomRightRadiusX, float bottomRightRadiusY, float bottomLeftRadiusX, float bottomLeftRadiusY);
+    method @Deprecated public androidx.ui.geometry.RRect deflate(float delta);
+    method public float getBottom();
+    method public float getBottomLeftRadiusX();
+    method public float getBottomLeftRadiusY();
+    method public float getBottomRightRadiusX();
+    method public float getBottomRightRadiusY();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getRight();
+    method public float getTop();
+    method public float getTopLeftRadiusX();
+    method public float getTopLeftRadiusY();
+    method public float getTopRightRadiusX();
+    method public float getTopRightRadiusY();
+    method public float getWidth();
+    method public static androidx.ui.geometry.RRect getZero();
+    method @Deprecated public androidx.ui.geometry.RRect inflate(float delta);
+    property public final float height;
+    property public final float width;
+    field public static final androidx.ui.geometry.RRect.Companion! Companion;
+  }
+
+  public static final class RRect.Companion {
+    method public androidx.ui.geometry.RRect getZero();
+    property public final androidx.ui.geometry.RRect Zero;
+  }
+
+  public final class RRectKt {
+    method public static androidx.ui.geometry.RRect RRect(float left, float top, float right, float bottom, float radiusX, float radiusY);
+    method public static androidx.ui.geometry.RRect RRect(float left, float top, float right, float bottom, androidx.ui.geometry.Radius radius);
+    method public static androidx.ui.geometry.RRect RRect(androidx.ui.geometry.Rect rect, float radiusX, float radiusY);
+    method public static androidx.ui.geometry.RRect RRect(androidx.ui.geometry.Rect rect, androidx.ui.geometry.Radius radius);
+    method public static androidx.ui.geometry.RRect RRect(float left, float top, float right, float bottom, androidx.ui.geometry.Radius topLeft = Radius.zero, androidx.ui.geometry.Radius topRight = Radius.zero, androidx.ui.geometry.Radius bottomRight = Radius.zero, androidx.ui.geometry.Radius bottomLeft = Radius.zero);
+    method public static androidx.ui.geometry.RRect RRect(androidx.ui.geometry.Rect rect, androidx.ui.geometry.Radius topLeft = Radius.zero, androidx.ui.geometry.Radius topRight = Radius.zero, androidx.ui.geometry.Radius bottomRight = Radius.zero, androidx.ui.geometry.Radius bottomLeft = Radius.zero);
+    method public static androidx.ui.geometry.Radius bottomLeftRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Radius bottomRightRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Offset center(androidx.ui.geometry.RRect);
+    method public static float getLongestSide(androidx.ui.geometry.RRect);
+    method public static float getShortestSide(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect grow(androidx.ui.geometry.RRect, float delta);
+    method public static boolean isCircle(androidx.ui.geometry.RRect);
+    method public static boolean isEllipse(androidx.ui.geometry.RRect);
+    method public static boolean isEmpty(androidx.ui.geometry.RRect);
+    method public static boolean isFinite(androidx.ui.geometry.RRect);
+    method public static boolean isRect(androidx.ui.geometry.RRect);
+    method public static boolean isSimple(androidx.ui.geometry.RRect);
+    method public static boolean isStadium(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect lerp(androidx.ui.geometry.RRect start, androidx.ui.geometry.RRect stop, float fraction);
+    method public static androidx.ui.geometry.Rect middleRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Rect outerRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Rect safeInnerRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect shift(androidx.ui.geometry.RRect, androidx.ui.geometry.Offset offset);
+    method public static androidx.ui.geometry.RRect shrink(androidx.ui.geometry.RRect, float delta);
+    method public static androidx.ui.geometry.Rect tallMiddleRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Radius topLeftRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Radius topRightRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Rect wideMiddleRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect withRadius(androidx.ui.geometry.RRect, androidx.ui.geometry.Radius radius);
+  }
+
+  public final class Radius {
+    ctor public Radius(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.geometry.Radius copy(float x, float y);
+    method public operator androidx.ui.geometry.Radius div(float operand);
+    method public float getX();
+    method public float getY();
+    method public operator androidx.ui.geometry.Radius minus(androidx.ui.geometry.Radius other);
+    method public operator androidx.ui.geometry.Radius plus(androidx.ui.geometry.Radius other);
+    method public operator androidx.ui.geometry.Radius rem(float operand);
+    method public operator androidx.ui.geometry.Radius times(float operand);
+    method public androidx.ui.geometry.Radius truncDiv(float operand);
+    method public operator androidx.ui.geometry.Radius unaryMinus();
+    field public static final androidx.ui.geometry.Radius.Companion! Companion;
+  }
+
+  public static final class Radius.Companion {
+    method public androidx.ui.geometry.Radius circular(float radius);
+    method public androidx.ui.geometry.Radius elliptical(float x, float y);
+    method public androidx.ui.geometry.Radius getZero();
+    property public final androidx.ui.geometry.Radius zero;
+  }
+
+  public final class RadiusKt {
+    method public static androidx.ui.geometry.Radius lerp(androidx.ui.geometry.Radius start, androidx.ui.geometry.Radius stop, float fraction);
+  }
+
+  public final class Rect {
+    ctor public Rect(float left, float top, float right, float bottom);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public boolean contains(androidx.ui.geometry.Offset offset);
+    method public androidx.ui.geometry.Rect copy(float left, float top, float right, float bottom);
+    method public androidx.ui.geometry.Rect deflate(float delta);
+    method public androidx.ui.geometry.Rect expandToInclude(androidx.ui.geometry.Rect other);
+    method public float getBottom();
+    method public androidx.ui.geometry.Offset getBottomCenter();
+    method public androidx.ui.geometry.Offset getBottomLeft();
+    method public androidx.ui.geometry.Offset getBottomRight();
+    method public androidx.ui.geometry.Offset getCenter();
+    method public androidx.ui.geometry.Offset getCenterLeft();
+    method public androidx.ui.geometry.Offset getCenterRight();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getLongestSide();
+    method public float getRight();
+    method public float getShortestSide();
+    method public androidx.ui.geometry.Size getSize();
+    method public float getTop();
+    method public androidx.ui.geometry.Offset getTopCenter();
+    method public androidx.ui.geometry.Offset getTopLeft();
+    method public androidx.ui.geometry.Offset getTopRight();
+    method public float getWidth();
+    method public androidx.ui.geometry.Rect inflate(float delta);
+    method public androidx.ui.geometry.Rect intersect(androidx.ui.geometry.Rect other);
+    method public boolean isEmpty();
+    method public boolean isFinite();
+    method public boolean isInfinite();
+    method public androidx.ui.geometry.Rect join(androidx.ui.geometry.Rect other);
+    method public boolean overlaps(androidx.ui.geometry.Rect other);
+    method public androidx.ui.geometry.Rect shift(androidx.ui.geometry.Offset offset);
+    method public androidx.ui.geometry.Rect translate(float translateX, float translateY);
+    property public final float height;
+    property public final float width;
+    field public static final androidx.ui.geometry.Rect.Companion! Companion;
+  }
+
+  public static final class Rect.Companion {
+    method public androidx.ui.geometry.Rect fromCircle(androidx.ui.geometry.Offset center, float radius);
+    method public androidx.ui.geometry.Rect fromLTRB(float left, float top, float right, float bottom);
+    method public androidx.ui.geometry.Rect fromLTWH(float left, float top, float width, float height);
+    method public androidx.ui.geometry.Rect fromPoints(androidx.ui.geometry.Offset a, androidx.ui.geometry.Offset b);
+    method public androidx.ui.geometry.Rect getLargest();
+    method public androidx.ui.geometry.Rect getZero();
+    method public float get_giantScalar();
+    property public final float _giantScalar;
+    property public final androidx.ui.geometry.Rect largest;
+    property public final androidx.ui.geometry.Rect zero;
+  }
+
+  public final class RectKt {
+    method public static androidx.ui.geometry.Rect lerp(androidx.ui.geometry.Rect start, androidx.ui.geometry.Rect stop, float fraction);
+  }
+
+  public class Size implements androidx.ui.geometry.OffsetBase {
+    ctor public Size(float width, float height);
+    method public final androidx.ui.geometry.Offset bottomCenter(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset bottomLeft(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset bottomRight(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset center(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset centerLeft(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset centerRight(androidx.ui.geometry.Offset origin);
+    method public final boolean contains(androidx.ui.geometry.Offset offset);
+    method public final operator androidx.ui.geometry.Size div(float operand);
+    method public float getDx();
+    method public float getDy();
+    method public final androidx.ui.geometry.Size getFlipped();
+    method public final float getHeight();
+    method public final float getLongestSide();
+    method public final float getShortestSide();
+    method public final float getWidth();
+    method public final boolean isEmpty();
+    method public final operator androidx.ui.geometry.Size minus(androidx.ui.geometry.Offset other);
+    method public final operator androidx.ui.geometry.Offset minus(androidx.ui.geometry.Size other);
+    method public final operator androidx.ui.geometry.Size plus(androidx.ui.geometry.Offset other);
+    method public final operator androidx.ui.geometry.Size rem(float operand);
+    method public final operator androidx.ui.geometry.Size times(float operand);
+    method public final androidx.ui.geometry.Offset topCenter(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset topLeft(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset topRight(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Size truncDiv(float operand);
+    property public float dx;
+    property public float dy;
+    field public static final androidx.ui.geometry.Size.Companion! Companion;
+  }
+
+  public static final class Size.Companion {
+    method public androidx.ui.geometry.Size copy(androidx.ui.geometry.Size source);
+    method public androidx.ui.geometry.Size fromHeight(float height);
+    method public androidx.ui.geometry.Size fromRadius(float radius);
+    method public androidx.ui.geometry.Size fromWidth(float width);
+    method public androidx.ui.geometry.Size getInfinite();
+    method public androidx.ui.geometry.Size getZero();
+    method public androidx.ui.geometry.Size? lerp(androidx.ui.geometry.Size start, androidx.ui.geometry.Size stop, float fraction);
+    method public androidx.ui.geometry.Size square(float dimension);
+    property public final androidx.ui.geometry.Size infinite;
+    property public final androidx.ui.geometry.Size zero;
+  }
+
+}
+
diff --git a/ui/ui-geometry/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-geometry/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..4ad12c3
--- /dev/null
+++ b/ui/ui-geometry/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,258 @@
+// Signature format: 3.0
+package androidx.ui.geometry {
+
+  public final class Offset implements androidx.ui.geometry.OffsetBase {
+    ctor public Offset(float dx, float dy);
+    method public infix androidx.ui.geometry.Rect and(androidx.ui.geometry.Size other);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.geometry.Offset copy(float dx, float dy);
+    method public operator androidx.ui.geometry.Offset div(float operand);
+    method public float getDirection();
+    method public float getDistance();
+    method public float getDistanceSquared();
+    method public float getDx();
+    method public float getDy();
+    method public operator androidx.ui.geometry.Offset minus(androidx.ui.geometry.Offset other);
+    method public operator androidx.ui.geometry.Offset plus(androidx.ui.geometry.Offset other);
+    method public operator androidx.ui.geometry.Offset rem(float operand);
+    method public androidx.ui.geometry.Offset scale(float scaleX, float scaleY);
+    method public operator androidx.ui.geometry.Offset times(float operand);
+    method public androidx.ui.geometry.Offset translate(float translateX, float translateY);
+    method public androidx.ui.geometry.Offset truncDiv(float operand);
+    method public operator androidx.ui.geometry.Offset unaryMinus();
+    field public static final androidx.ui.geometry.Offset.Companion! Companion;
+  }
+
+  public static final class Offset.Companion {
+    method public androidx.ui.geometry.Offset getInfinite();
+    method public androidx.ui.geometry.Offset getZero();
+    method public boolean isValid(androidx.ui.geometry.Offset offset);
+    method public androidx.ui.geometry.Offset lerp(androidx.ui.geometry.Offset start, androidx.ui.geometry.Offset stop, float fraction);
+    property public final androidx.ui.geometry.Offset infinite;
+    property public final androidx.ui.geometry.Offset zero;
+  }
+
+  public interface OffsetBase {
+    method public float getDx();
+    method public float getDy();
+    method public default boolean isFinite();
+    method public default boolean isGreaterOrEqThan(androidx.ui.geometry.OffsetBase other);
+    method public default boolean isGreaterThan(androidx.ui.geometry.OffsetBase other);
+    method public default boolean isInfinite();
+    method public default boolean isLessOrEqThan(androidx.ui.geometry.OffsetBase other);
+    method public default boolean isLessThan(androidx.ui.geometry.OffsetBase other);
+    property public abstract float dx;
+    property public abstract float dy;
+  }
+
+  public final class RRect {
+    ctor public RRect(float left, float top, float right, float bottom, float topLeftRadiusX, float topLeftRadiusY, float topRightRadiusX, float topRightRadiusY, float bottomRightRadiusX, float bottomRightRadiusY, float bottomLeftRadiusX, float bottomLeftRadiusY);
+    method public float component1();
+    method public float component10();
+    method public float component11();
+    method public float component12();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public float component5();
+    method public float component6();
+    method public float component7();
+    method public float component8();
+    method public float component9();
+    method public boolean contains(androidx.ui.geometry.Offset point);
+    method public androidx.ui.geometry.RRect copy(float left, float top, float right, float bottom, float topLeftRadiusX, float topLeftRadiusY, float topRightRadiusX, float topRightRadiusY, float bottomRightRadiusX, float bottomRightRadiusY, float bottomLeftRadiusX, float bottomLeftRadiusY);
+    method @Deprecated public androidx.ui.geometry.RRect deflate(float delta);
+    method public float getBottom();
+    method public float getBottomLeftRadiusX();
+    method public float getBottomLeftRadiusY();
+    method public float getBottomRightRadiusX();
+    method public float getBottomRightRadiusY();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getRight();
+    method public float getTop();
+    method public float getTopLeftRadiusX();
+    method public float getTopLeftRadiusY();
+    method public float getTopRightRadiusX();
+    method public float getTopRightRadiusY();
+    method public float getWidth();
+    method public static androidx.ui.geometry.RRect getZero();
+    method @Deprecated public androidx.ui.geometry.RRect inflate(float delta);
+    property public final float height;
+    property public final float width;
+    field public static final androidx.ui.geometry.RRect.Companion! Companion;
+  }
+
+  public static final class RRect.Companion {
+    method public androidx.ui.geometry.RRect getZero();
+    property public final androidx.ui.geometry.RRect Zero;
+  }
+
+  public final class RRectKt {
+    method public static androidx.ui.geometry.RRect RRect(float left, float top, float right, float bottom, float radiusX, float radiusY);
+    method public static androidx.ui.geometry.RRect RRect(float left, float top, float right, float bottom, androidx.ui.geometry.Radius radius);
+    method public static androidx.ui.geometry.RRect RRect(androidx.ui.geometry.Rect rect, float radiusX, float radiusY);
+    method public static androidx.ui.geometry.RRect RRect(androidx.ui.geometry.Rect rect, androidx.ui.geometry.Radius radius);
+    method public static androidx.ui.geometry.RRect RRect(float left, float top, float right, float bottom, androidx.ui.geometry.Radius topLeft = Radius.zero, androidx.ui.geometry.Radius topRight = Radius.zero, androidx.ui.geometry.Radius bottomRight = Radius.zero, androidx.ui.geometry.Radius bottomLeft = Radius.zero);
+    method public static androidx.ui.geometry.RRect RRect(androidx.ui.geometry.Rect rect, androidx.ui.geometry.Radius topLeft = Radius.zero, androidx.ui.geometry.Radius topRight = Radius.zero, androidx.ui.geometry.Radius bottomRight = Radius.zero, androidx.ui.geometry.Radius bottomLeft = Radius.zero);
+    method public static androidx.ui.geometry.Radius bottomLeftRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Radius bottomRightRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Offset center(androidx.ui.geometry.RRect);
+    method public static float getLongestSide(androidx.ui.geometry.RRect);
+    method public static float getShortestSide(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect grow(androidx.ui.geometry.RRect, float delta);
+    method public static boolean isCircle(androidx.ui.geometry.RRect);
+    method public static boolean isEllipse(androidx.ui.geometry.RRect);
+    method public static boolean isEmpty(androidx.ui.geometry.RRect);
+    method public static boolean isFinite(androidx.ui.geometry.RRect);
+    method public static boolean isRect(androidx.ui.geometry.RRect);
+    method public static boolean isSimple(androidx.ui.geometry.RRect);
+    method public static boolean isStadium(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect lerp(androidx.ui.geometry.RRect start, androidx.ui.geometry.RRect stop, float fraction);
+    method public static androidx.ui.geometry.Rect middleRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Rect outerRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Rect safeInnerRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect shift(androidx.ui.geometry.RRect, androidx.ui.geometry.Offset offset);
+    method public static androidx.ui.geometry.RRect shrink(androidx.ui.geometry.RRect, float delta);
+    method public static androidx.ui.geometry.Rect tallMiddleRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Radius topLeftRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Radius topRightRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Rect wideMiddleRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect withRadius(androidx.ui.geometry.RRect, androidx.ui.geometry.Radius radius);
+  }
+
+  public final class Radius {
+    ctor public Radius(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.geometry.Radius copy(float x, float y);
+    method public operator androidx.ui.geometry.Radius div(float operand);
+    method public float getX();
+    method public float getY();
+    method public operator androidx.ui.geometry.Radius minus(androidx.ui.geometry.Radius other);
+    method public operator androidx.ui.geometry.Radius plus(androidx.ui.geometry.Radius other);
+    method public operator androidx.ui.geometry.Radius rem(float operand);
+    method public operator androidx.ui.geometry.Radius times(float operand);
+    method public androidx.ui.geometry.Radius truncDiv(float operand);
+    method public operator androidx.ui.geometry.Radius unaryMinus();
+    field public static final androidx.ui.geometry.Radius.Companion! Companion;
+  }
+
+  public static final class Radius.Companion {
+    method public androidx.ui.geometry.Radius circular(float radius);
+    method public androidx.ui.geometry.Radius elliptical(float x, float y);
+    method public androidx.ui.geometry.Radius getZero();
+    property public final androidx.ui.geometry.Radius zero;
+  }
+
+  public final class RadiusKt {
+    method public static androidx.ui.geometry.Radius lerp(androidx.ui.geometry.Radius start, androidx.ui.geometry.Radius stop, float fraction);
+  }
+
+  public final class Rect {
+    ctor public Rect(float left, float top, float right, float bottom);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public boolean contains(androidx.ui.geometry.Offset offset);
+    method public androidx.ui.geometry.Rect copy(float left, float top, float right, float bottom);
+    method public androidx.ui.geometry.Rect deflate(float delta);
+    method public androidx.ui.geometry.Rect expandToInclude(androidx.ui.geometry.Rect other);
+    method public float getBottom();
+    method public androidx.ui.geometry.Offset getBottomCenter();
+    method public androidx.ui.geometry.Offset getBottomLeft();
+    method public androidx.ui.geometry.Offset getBottomRight();
+    method public androidx.ui.geometry.Offset getCenter();
+    method public androidx.ui.geometry.Offset getCenterLeft();
+    method public androidx.ui.geometry.Offset getCenterRight();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getLongestSide();
+    method public float getRight();
+    method public float getShortestSide();
+    method public androidx.ui.geometry.Size getSize();
+    method public float getTop();
+    method public androidx.ui.geometry.Offset getTopCenter();
+    method public androidx.ui.geometry.Offset getTopLeft();
+    method public androidx.ui.geometry.Offset getTopRight();
+    method public float getWidth();
+    method public androidx.ui.geometry.Rect inflate(float delta);
+    method public androidx.ui.geometry.Rect intersect(androidx.ui.geometry.Rect other);
+    method public boolean isEmpty();
+    method public boolean isFinite();
+    method public boolean isInfinite();
+    method public androidx.ui.geometry.Rect join(androidx.ui.geometry.Rect other);
+    method public boolean overlaps(androidx.ui.geometry.Rect other);
+    method public androidx.ui.geometry.Rect shift(androidx.ui.geometry.Offset offset);
+    method public androidx.ui.geometry.Rect translate(float translateX, float translateY);
+    property public final float height;
+    property public final float width;
+    field public static final androidx.ui.geometry.Rect.Companion! Companion;
+  }
+
+  public static final class Rect.Companion {
+    method public androidx.ui.geometry.Rect fromCircle(androidx.ui.geometry.Offset center, float radius);
+    method public androidx.ui.geometry.Rect fromLTRB(float left, float top, float right, float bottom);
+    method public androidx.ui.geometry.Rect fromLTWH(float left, float top, float width, float height);
+    method public androidx.ui.geometry.Rect fromPoints(androidx.ui.geometry.Offset a, androidx.ui.geometry.Offset b);
+    method public androidx.ui.geometry.Rect getLargest();
+    method public androidx.ui.geometry.Rect getZero();
+    method public float get_giantScalar();
+    property public final float _giantScalar;
+    property public final androidx.ui.geometry.Rect largest;
+    property public final androidx.ui.geometry.Rect zero;
+  }
+
+  public final class RectKt {
+    method public static androidx.ui.geometry.Rect lerp(androidx.ui.geometry.Rect start, androidx.ui.geometry.Rect stop, float fraction);
+  }
+
+  public class Size implements androidx.ui.geometry.OffsetBase {
+    ctor public Size(float width, float height);
+    method public final androidx.ui.geometry.Offset bottomCenter(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset bottomLeft(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset bottomRight(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset center(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset centerLeft(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset centerRight(androidx.ui.geometry.Offset origin);
+    method public final boolean contains(androidx.ui.geometry.Offset offset);
+    method public final operator androidx.ui.geometry.Size div(float operand);
+    method public float getDx();
+    method public float getDy();
+    method public final androidx.ui.geometry.Size getFlipped();
+    method public final float getHeight();
+    method public final float getLongestSide();
+    method public final float getShortestSide();
+    method public final float getWidth();
+    method public final boolean isEmpty();
+    method public final operator androidx.ui.geometry.Size minus(androidx.ui.geometry.Offset other);
+    method public final operator androidx.ui.geometry.Offset minus(androidx.ui.geometry.Size other);
+    method public final operator androidx.ui.geometry.Size plus(androidx.ui.geometry.Offset other);
+    method public final operator androidx.ui.geometry.Size rem(float operand);
+    method public final operator androidx.ui.geometry.Size times(float operand);
+    method public final androidx.ui.geometry.Offset topCenter(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset topLeft(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset topRight(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Size truncDiv(float operand);
+    property public float dx;
+    property public float dy;
+    field public static final androidx.ui.geometry.Size.Companion! Companion;
+  }
+
+  public static final class Size.Companion {
+    method public androidx.ui.geometry.Size copy(androidx.ui.geometry.Size source);
+    method public androidx.ui.geometry.Size fromHeight(float height);
+    method public androidx.ui.geometry.Size fromRadius(float radius);
+    method public androidx.ui.geometry.Size fromWidth(float width);
+    method public androidx.ui.geometry.Size getInfinite();
+    method public androidx.ui.geometry.Size getZero();
+    method public androidx.ui.geometry.Size? lerp(androidx.ui.geometry.Size start, androidx.ui.geometry.Size stop, float fraction);
+    method public androidx.ui.geometry.Size square(float dimension);
+    property public final androidx.ui.geometry.Size infinite;
+    property public final androidx.ui.geometry.Size zero;
+  }
+
+}
+
diff --git a/ui/ui-geometry/api/res-0.1.0-dev11.txt b/ui/ui-geometry/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-geometry/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-geometry/api/restricted_0.1.0-dev11.txt b/ui/ui-geometry/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..4ad12c3
--- /dev/null
+++ b/ui/ui-geometry/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,258 @@
+// Signature format: 3.0
+package androidx.ui.geometry {
+
+  public final class Offset implements androidx.ui.geometry.OffsetBase {
+    ctor public Offset(float dx, float dy);
+    method public infix androidx.ui.geometry.Rect and(androidx.ui.geometry.Size other);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.geometry.Offset copy(float dx, float dy);
+    method public operator androidx.ui.geometry.Offset div(float operand);
+    method public float getDirection();
+    method public float getDistance();
+    method public float getDistanceSquared();
+    method public float getDx();
+    method public float getDy();
+    method public operator androidx.ui.geometry.Offset minus(androidx.ui.geometry.Offset other);
+    method public operator androidx.ui.geometry.Offset plus(androidx.ui.geometry.Offset other);
+    method public operator androidx.ui.geometry.Offset rem(float operand);
+    method public androidx.ui.geometry.Offset scale(float scaleX, float scaleY);
+    method public operator androidx.ui.geometry.Offset times(float operand);
+    method public androidx.ui.geometry.Offset translate(float translateX, float translateY);
+    method public androidx.ui.geometry.Offset truncDiv(float operand);
+    method public operator androidx.ui.geometry.Offset unaryMinus();
+    field public static final androidx.ui.geometry.Offset.Companion! Companion;
+  }
+
+  public static final class Offset.Companion {
+    method public androidx.ui.geometry.Offset getInfinite();
+    method public androidx.ui.geometry.Offset getZero();
+    method public boolean isValid(androidx.ui.geometry.Offset offset);
+    method public androidx.ui.geometry.Offset lerp(androidx.ui.geometry.Offset start, androidx.ui.geometry.Offset stop, float fraction);
+    property public final androidx.ui.geometry.Offset infinite;
+    property public final androidx.ui.geometry.Offset zero;
+  }
+
+  public interface OffsetBase {
+    method public float getDx();
+    method public float getDy();
+    method public default boolean isFinite();
+    method public default boolean isGreaterOrEqThan(androidx.ui.geometry.OffsetBase other);
+    method public default boolean isGreaterThan(androidx.ui.geometry.OffsetBase other);
+    method public default boolean isInfinite();
+    method public default boolean isLessOrEqThan(androidx.ui.geometry.OffsetBase other);
+    method public default boolean isLessThan(androidx.ui.geometry.OffsetBase other);
+    property public abstract float dx;
+    property public abstract float dy;
+  }
+
+  public final class RRect {
+    ctor public RRect(float left, float top, float right, float bottom, float topLeftRadiusX, float topLeftRadiusY, float topRightRadiusX, float topRightRadiusY, float bottomRightRadiusX, float bottomRightRadiusY, float bottomLeftRadiusX, float bottomLeftRadiusY);
+    method public float component1();
+    method public float component10();
+    method public float component11();
+    method public float component12();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public float component5();
+    method public float component6();
+    method public float component7();
+    method public float component8();
+    method public float component9();
+    method public boolean contains(androidx.ui.geometry.Offset point);
+    method public androidx.ui.geometry.RRect copy(float left, float top, float right, float bottom, float topLeftRadiusX, float topLeftRadiusY, float topRightRadiusX, float topRightRadiusY, float bottomRightRadiusX, float bottomRightRadiusY, float bottomLeftRadiusX, float bottomLeftRadiusY);
+    method @Deprecated public androidx.ui.geometry.RRect deflate(float delta);
+    method public float getBottom();
+    method public float getBottomLeftRadiusX();
+    method public float getBottomLeftRadiusY();
+    method public float getBottomRightRadiusX();
+    method public float getBottomRightRadiusY();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getRight();
+    method public float getTop();
+    method public float getTopLeftRadiusX();
+    method public float getTopLeftRadiusY();
+    method public float getTopRightRadiusX();
+    method public float getTopRightRadiusY();
+    method public float getWidth();
+    method public static androidx.ui.geometry.RRect getZero();
+    method @Deprecated public androidx.ui.geometry.RRect inflate(float delta);
+    property public final float height;
+    property public final float width;
+    field public static final androidx.ui.geometry.RRect.Companion! Companion;
+  }
+
+  public static final class RRect.Companion {
+    method public androidx.ui.geometry.RRect getZero();
+    property public final androidx.ui.geometry.RRect Zero;
+  }
+
+  public final class RRectKt {
+    method public static androidx.ui.geometry.RRect RRect(float left, float top, float right, float bottom, float radiusX, float radiusY);
+    method public static androidx.ui.geometry.RRect RRect(float left, float top, float right, float bottom, androidx.ui.geometry.Radius radius);
+    method public static androidx.ui.geometry.RRect RRect(androidx.ui.geometry.Rect rect, float radiusX, float radiusY);
+    method public static androidx.ui.geometry.RRect RRect(androidx.ui.geometry.Rect rect, androidx.ui.geometry.Radius radius);
+    method public static androidx.ui.geometry.RRect RRect(float left, float top, float right, float bottom, androidx.ui.geometry.Radius topLeft = Radius.zero, androidx.ui.geometry.Radius topRight = Radius.zero, androidx.ui.geometry.Radius bottomRight = Radius.zero, androidx.ui.geometry.Radius bottomLeft = Radius.zero);
+    method public static androidx.ui.geometry.RRect RRect(androidx.ui.geometry.Rect rect, androidx.ui.geometry.Radius topLeft = Radius.zero, androidx.ui.geometry.Radius topRight = Radius.zero, androidx.ui.geometry.Radius bottomRight = Radius.zero, androidx.ui.geometry.Radius bottomLeft = Radius.zero);
+    method public static androidx.ui.geometry.Radius bottomLeftRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Radius bottomRightRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Offset center(androidx.ui.geometry.RRect);
+    method public static float getLongestSide(androidx.ui.geometry.RRect);
+    method public static float getShortestSide(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect grow(androidx.ui.geometry.RRect, float delta);
+    method public static boolean isCircle(androidx.ui.geometry.RRect);
+    method public static boolean isEllipse(androidx.ui.geometry.RRect);
+    method public static boolean isEmpty(androidx.ui.geometry.RRect);
+    method public static boolean isFinite(androidx.ui.geometry.RRect);
+    method public static boolean isRect(androidx.ui.geometry.RRect);
+    method public static boolean isSimple(androidx.ui.geometry.RRect);
+    method public static boolean isStadium(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect lerp(androidx.ui.geometry.RRect start, androidx.ui.geometry.RRect stop, float fraction);
+    method public static androidx.ui.geometry.Rect middleRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Rect outerRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Rect safeInnerRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect shift(androidx.ui.geometry.RRect, androidx.ui.geometry.Offset offset);
+    method public static androidx.ui.geometry.RRect shrink(androidx.ui.geometry.RRect, float delta);
+    method public static androidx.ui.geometry.Rect tallMiddleRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Radius topLeftRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Radius topRightRadius(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.Rect wideMiddleRect(androidx.ui.geometry.RRect);
+    method public static androidx.ui.geometry.RRect withRadius(androidx.ui.geometry.RRect, androidx.ui.geometry.Radius radius);
+  }
+
+  public final class Radius {
+    ctor public Radius(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.geometry.Radius copy(float x, float y);
+    method public operator androidx.ui.geometry.Radius div(float operand);
+    method public float getX();
+    method public float getY();
+    method public operator androidx.ui.geometry.Radius minus(androidx.ui.geometry.Radius other);
+    method public operator androidx.ui.geometry.Radius plus(androidx.ui.geometry.Radius other);
+    method public operator androidx.ui.geometry.Radius rem(float operand);
+    method public operator androidx.ui.geometry.Radius times(float operand);
+    method public androidx.ui.geometry.Radius truncDiv(float operand);
+    method public operator androidx.ui.geometry.Radius unaryMinus();
+    field public static final androidx.ui.geometry.Radius.Companion! Companion;
+  }
+
+  public static final class Radius.Companion {
+    method public androidx.ui.geometry.Radius circular(float radius);
+    method public androidx.ui.geometry.Radius elliptical(float x, float y);
+    method public androidx.ui.geometry.Radius getZero();
+    property public final androidx.ui.geometry.Radius zero;
+  }
+
+  public final class RadiusKt {
+    method public static androidx.ui.geometry.Radius lerp(androidx.ui.geometry.Radius start, androidx.ui.geometry.Radius stop, float fraction);
+  }
+
+  public final class Rect {
+    ctor public Rect(float left, float top, float right, float bottom);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public boolean contains(androidx.ui.geometry.Offset offset);
+    method public androidx.ui.geometry.Rect copy(float left, float top, float right, float bottom);
+    method public androidx.ui.geometry.Rect deflate(float delta);
+    method public androidx.ui.geometry.Rect expandToInclude(androidx.ui.geometry.Rect other);
+    method public float getBottom();
+    method public androidx.ui.geometry.Offset getBottomCenter();
+    method public androidx.ui.geometry.Offset getBottomLeft();
+    method public androidx.ui.geometry.Offset getBottomRight();
+    method public androidx.ui.geometry.Offset getCenter();
+    method public androidx.ui.geometry.Offset getCenterLeft();
+    method public androidx.ui.geometry.Offset getCenterRight();
+    method public float getHeight();
+    method public float getLeft();
+    method public float getLongestSide();
+    method public float getRight();
+    method public float getShortestSide();
+    method public androidx.ui.geometry.Size getSize();
+    method public float getTop();
+    method public androidx.ui.geometry.Offset getTopCenter();
+    method public androidx.ui.geometry.Offset getTopLeft();
+    method public androidx.ui.geometry.Offset getTopRight();
+    method public float getWidth();
+    method public androidx.ui.geometry.Rect inflate(float delta);
+    method public androidx.ui.geometry.Rect intersect(androidx.ui.geometry.Rect other);
+    method public boolean isEmpty();
+    method public boolean isFinite();
+    method public boolean isInfinite();
+    method public androidx.ui.geometry.Rect join(androidx.ui.geometry.Rect other);
+    method public boolean overlaps(androidx.ui.geometry.Rect other);
+    method public androidx.ui.geometry.Rect shift(androidx.ui.geometry.Offset offset);
+    method public androidx.ui.geometry.Rect translate(float translateX, float translateY);
+    property public final float height;
+    property public final float width;
+    field public static final androidx.ui.geometry.Rect.Companion! Companion;
+  }
+
+  public static final class Rect.Companion {
+    method public androidx.ui.geometry.Rect fromCircle(androidx.ui.geometry.Offset center, float radius);
+    method public androidx.ui.geometry.Rect fromLTRB(float left, float top, float right, float bottom);
+    method public androidx.ui.geometry.Rect fromLTWH(float left, float top, float width, float height);
+    method public androidx.ui.geometry.Rect fromPoints(androidx.ui.geometry.Offset a, androidx.ui.geometry.Offset b);
+    method public androidx.ui.geometry.Rect getLargest();
+    method public androidx.ui.geometry.Rect getZero();
+    method public float get_giantScalar();
+    property public final float _giantScalar;
+    property public final androidx.ui.geometry.Rect largest;
+    property public final androidx.ui.geometry.Rect zero;
+  }
+
+  public final class RectKt {
+    method public static androidx.ui.geometry.Rect lerp(androidx.ui.geometry.Rect start, androidx.ui.geometry.Rect stop, float fraction);
+  }
+
+  public class Size implements androidx.ui.geometry.OffsetBase {
+    ctor public Size(float width, float height);
+    method public final androidx.ui.geometry.Offset bottomCenter(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset bottomLeft(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset bottomRight(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset center(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset centerLeft(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset centerRight(androidx.ui.geometry.Offset origin);
+    method public final boolean contains(androidx.ui.geometry.Offset offset);
+    method public final operator androidx.ui.geometry.Size div(float operand);
+    method public float getDx();
+    method public float getDy();
+    method public final androidx.ui.geometry.Size getFlipped();
+    method public final float getHeight();
+    method public final float getLongestSide();
+    method public final float getShortestSide();
+    method public final float getWidth();
+    method public final boolean isEmpty();
+    method public final operator androidx.ui.geometry.Size minus(androidx.ui.geometry.Offset other);
+    method public final operator androidx.ui.geometry.Offset minus(androidx.ui.geometry.Size other);
+    method public final operator androidx.ui.geometry.Size plus(androidx.ui.geometry.Offset other);
+    method public final operator androidx.ui.geometry.Size rem(float operand);
+    method public final operator androidx.ui.geometry.Size times(float operand);
+    method public final androidx.ui.geometry.Offset topCenter(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset topLeft(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Offset topRight(androidx.ui.geometry.Offset origin);
+    method public final androidx.ui.geometry.Size truncDiv(float operand);
+    property public float dx;
+    property public float dy;
+    field public static final androidx.ui.geometry.Size.Companion! Companion;
+  }
+
+  public static final class Size.Companion {
+    method public androidx.ui.geometry.Size copy(androidx.ui.geometry.Size source);
+    method public androidx.ui.geometry.Size fromHeight(float height);
+    method public androidx.ui.geometry.Size fromRadius(float radius);
+    method public androidx.ui.geometry.Size fromWidth(float width);
+    method public androidx.ui.geometry.Size getInfinite();
+    method public androidx.ui.geometry.Size getZero();
+    method public androidx.ui.geometry.Size? lerp(androidx.ui.geometry.Size start, androidx.ui.geometry.Size stop, float fraction);
+    method public androidx.ui.geometry.Size square(float dimension);
+    property public final androidx.ui.geometry.Size infinite;
+    property public final androidx.ui.geometry.Size zero;
+  }
+
+}
+
diff --git a/ui/ui-graphics/api/0.1.0-dev10.txt b/ui/ui-graphics/api/0.1.0-dev10.txt
index 1f3ff55..a4896944 100644
--- a/ui/ui-graphics/api/0.1.0-dev10.txt
+++ b/ui/ui-graphics/api/0.1.0-dev10.txt
@@ -95,13 +95,6 @@
     enum_constant public static final androidx.ui.graphics.BlendMode xor;
   }
 
-  public enum BlurStyle {
-    enum_constant public static final androidx.ui.graphics.BlurStyle inner;
-    enum_constant public static final androidx.ui.graphics.BlurStyle normal;
-    enum_constant public static final androidx.ui.graphics.BlurStyle outer;
-    enum_constant public static final androidx.ui.graphics.BlurStyle solid;
-  }
-
   public interface Brush {
     method public void applyTo(androidx.ui.graphics.Paint p);
   }
@@ -278,21 +271,6 @@
     method public androidx.ui.graphics.LinearGradient copy-OCut9AY(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode);
   }
 
-  public final class MaskFilter {
-    ctor public MaskFilter(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public androidx.ui.graphics.BlurStyle component1();
-    method public float component2();
-    method public androidx.ui.graphics.MaskFilter copy(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public float getSigma();
-    method public androidx.ui.graphics.BlurStyle getStyle();
-    field public static final androidx.ui.graphics.MaskFilter.Companion! Companion;
-    field public static final int TYPE_BLUR = 1; // 0x1
-    field public static final int TYPE_NONE = 0; // 0x0
-  }
-
-  public static final class MaskFilter.Companion {
-  }
-
   public abstract sealed class Outline {
   }
 
@@ -330,7 +308,6 @@
     method public long getColor();
     method public androidx.ui.graphics.ColorFilter? getColorFilter();
     method public androidx.ui.graphics.FilterQuality getFilterQuality();
-    method public androidx.ui.graphics.MaskFilter getMaskFilter();
     method public android.graphics.Shader? getShader();
     method public androidx.ui.graphics.StrokeCap getStrokeCap();
     method public androidx.ui.graphics.StrokeJoin getStrokeJoin();
@@ -344,7 +321,6 @@
     method public void setColor-QEYXlZo(long color);
     method public void setColorFilter(androidx.ui.graphics.ColorFilter? value);
     method public void setFilterQuality(androidx.ui.graphics.FilterQuality value);
-    method public void setMaskFilter(androidx.ui.graphics.MaskFilter value);
     method public void setShader-DcPGf4I(android.graphics.Shader? value);
     method public void setStrokeCap(androidx.ui.graphics.StrokeCap value);
     method public void setStrokeJoin(androidx.ui.graphics.StrokeJoin value);
@@ -357,7 +333,6 @@
     property public final androidx.ui.graphics.ColorFilter? colorFilter;
     property public final androidx.ui.graphics.FilterQuality filterQuality;
     property public final boolean isAntiAlias;
-    property public final androidx.ui.graphics.MaskFilter maskFilter;
     property public final android.graphics.Shader? shader;
     property public final androidx.ui.graphics.StrokeCap strokeCap;
     property public final androidx.ui.graphics.StrokeJoin strokeJoin;
@@ -458,6 +433,10 @@
     method public androidx.ui.graphics.RadialGradient copy(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode);
   }
 
+  public final class RectangleShapeKt {
+    method public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
   public final inline class Shader {
     ctor public Shader();
     method public static android.graphics.Shader! constructor-impl(android.graphics.Shader nativeShader);
diff --git a/ui/ui-graphics/api/0.1.0-dev11.txt b/ui/ui-graphics/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..a4896944
--- /dev/null
+++ b/ui/ui-graphics/api/0.1.0-dev11.txt
@@ -0,0 +1,1515 @@
+// Signature format: 3.0
+package androidx.ui.core {
+
+  public final class RectHelperKt {
+    method public static android.graphics.Rect toAndroidRect(androidx.ui.geometry.Rect);
+    method public static android.graphics.RectF toAndroidRectF(androidx.ui.geometry.Rect);
+  }
+
+}
+
+package androidx.ui.graphics {
+
+  public final class AndroidCanvasKt {
+    method public static androidx.ui.graphics.Canvas Canvas(androidx.ui.graphics.ImageAsset image);
+    method public static androidx.ui.graphics.Canvas Canvas(androidx.ui.graphics.PictureRecorder recorder, androidx.ui.geometry.Rect cullRect = Rect.largest);
+    method public static androidx.ui.graphics.Canvas Canvas(android.graphics.Canvas c);
+  }
+
+  public final class AndroidImageAssetKt {
+    method public static androidx.ui.graphics.ImageAsset ImageAsset(int width, int height, androidx.ui.graphics.ImageAssetConfig config = androidx.ui.graphics.ImageAssetConfig.Argb8888, boolean hasAlpha = true, androidx.ui.graphics.colorspace.ColorSpace colorSpace = ColorSpaces.Srgb);
+    method public static android.graphics.Bitmap asAndroidBitmap(androidx.ui.graphics.ImageAsset);
+    method public static androidx.ui.graphics.ImageAsset asImageAsset(android.graphics.Bitmap);
+    method public static androidx.ui.graphics.ImageAsset imageFromResource(android.content.res.Resources res, int resId);
+  }
+
+  public final class AndroidPath implements androidx.ui.graphics.Path {
+    ctor public AndroidPath(android.graphics.Path internalPath);
+    ctor public AndroidPath();
+    method public void addArc(androidx.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.ui.geometry.Rect oval);
+    method public void addPath(androidx.ui.graphics.Path path, androidx.ui.geometry.Offset offset);
+    method public void addRRect(androidx.ui.geometry.RRect rrect);
+    method public void addRect(androidx.ui.geometry.Rect rect);
+    method public void arcTo(androidx.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.ui.geometry.Rect getBounds();
+    method public androidx.ui.graphics.PathFillType getFillType();
+    method public android.graphics.Path getInternalPath();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float dx, float dy);
+    method public void moveTo(float dx, float dy);
+    method public boolean op(androidx.ui.graphics.Path path1, androidx.ui.graphics.Path path2, androidx.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void reset();
+    method public void setFillType(androidx.ui.graphics.PathFillType value);
+    method public void shift(androidx.ui.geometry.Offset offset);
+    property public androidx.ui.graphics.PathFillType fillType;
+    property public boolean isConvex;
+    property public boolean isEmpty;
+  }
+
+  public final class AndroidPathKt {
+    method public static androidx.ui.graphics.Path Path();
+    method public static inline android.graphics.Path asAndroidPath(androidx.ui.graphics.Path);
+    method public static androidx.ui.graphics.Path asComposePath(android.graphics.Path);
+  }
+
+  public enum BlendMode {
+    method public final android.graphics.PorterDuff.Mode toPorterDuffMode();
+    enum_constant public static final androidx.ui.graphics.BlendMode clear;
+    enum_constant public static final androidx.ui.graphics.BlendMode color;
+    enum_constant public static final androidx.ui.graphics.BlendMode colorBurn;
+    enum_constant public static final androidx.ui.graphics.BlendMode colorDodge;
+    enum_constant public static final androidx.ui.graphics.BlendMode darken;
+    enum_constant public static final androidx.ui.graphics.BlendMode difference;
+    enum_constant public static final androidx.ui.graphics.BlendMode dst;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstATop;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstIn;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstOut;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstOver;
+    enum_constant public static final androidx.ui.graphics.BlendMode exclusion;
+    enum_constant public static final androidx.ui.graphics.BlendMode hardLight;
+    enum_constant public static final androidx.ui.graphics.BlendMode hue;
+    enum_constant public static final androidx.ui.graphics.BlendMode lighten;
+    enum_constant public static final androidx.ui.graphics.BlendMode luminosity;
+    enum_constant public static final androidx.ui.graphics.BlendMode modulate;
+    enum_constant public static final androidx.ui.graphics.BlendMode multiply;
+    enum_constant public static final androidx.ui.graphics.BlendMode overlay;
+    enum_constant public static final androidx.ui.graphics.BlendMode plus;
+    enum_constant public static final androidx.ui.graphics.BlendMode saturation;
+    enum_constant public static final androidx.ui.graphics.BlendMode screen;
+    enum_constant public static final androidx.ui.graphics.BlendMode softLight;
+    enum_constant public static final androidx.ui.graphics.BlendMode src;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcATop;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcIn;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcOut;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcOver;
+    enum_constant public static final androidx.ui.graphics.BlendMode xor;
+  }
+
+  public interface Brush {
+    method public void applyTo(androidx.ui.graphics.Paint p);
+  }
+
+  public final class BrushKt {
+    method public static androidx.ui.graphics.Brush HorizontalGradient-G0qqrXo(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float startX, float endX, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient HorizontalGradient-vcfwFIc(java.util.List<androidx.ui.graphics.Color> colors, float startX, float endX, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient LinearGradient-39rnqCc(java.util.List<androidx.ui.graphics.Color> colors, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient LinearGradient-gbNZAbE(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.RadialGradient RadialGradient(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.RadialGradient RadialGradient(java.util.List<androidx.ui.graphics.Color> colors, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient VerticalGradient-G0qqrXo(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float startY, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient VerticalGradient-vcfwFIc(java.util.List<androidx.ui.graphics.Color> colors, float startY, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+  }
+
+  public interface Canvas {
+    method public void clipPath(androidx.ui.graphics.Path path);
+    method public void clipRRect(androidx.ui.geometry.RRect rrect);
+    method public void clipRect(androidx.ui.geometry.Rect rect, androidx.ui.graphics.ClipOp clipOp = androidx.ui.graphics.ClipOp.intersect);
+    method public void concat(androidx.ui.graphics.vectormath.Matrix4 matrix4);
+    method public void disableZ();
+    method public void drawArc(androidx.ui.geometry.Rect rect, float startAngle, float sweepAngle, boolean useCenter, androidx.ui.graphics.Paint paint);
+    method public default void drawArcRad(androidx.ui.geometry.Rect rect, float startAngleRad, float sweepAngleRad, boolean useCenter, androidx.ui.graphics.Paint paint);
+    method public void drawCircle(androidx.ui.geometry.Offset center, float radius, androidx.ui.graphics.Paint paint);
+    method public void drawImage(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Offset topLeftOffset, androidx.ui.graphics.Paint paint);
+    method public void drawImageRect(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Rect? src, androidx.ui.geometry.Rect dst, androidx.ui.graphics.Paint paint);
+    method public void drawLine(androidx.ui.geometry.Offset p1, androidx.ui.geometry.Offset p2, androidx.ui.graphics.Paint paint);
+    method public void drawOval(androidx.ui.geometry.Rect rect, androidx.ui.graphics.Paint paint);
+    method public void drawPath(androidx.ui.graphics.Path path, androidx.ui.graphics.Paint paint);
+    method public void drawPicture(androidx.ui.graphics.Picture picture);
+    method public void drawPoints(androidx.ui.graphics.PointMode pointMode, java.util.List<androidx.ui.geometry.Offset> points, androidx.ui.graphics.Paint paint);
+    method public void drawRawPoints(androidx.ui.graphics.PointMode pointMode, float[] points, androidx.ui.graphics.Paint paint);
+    method public void drawRect(androidx.ui.geometry.Rect rect, androidx.ui.graphics.Paint paint);
+    method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.ui.graphics.Paint paint);
+    method public void drawVertices(androidx.ui.graphics.Vertices vertices, androidx.ui.graphics.BlendMode blendMode, androidx.ui.graphics.Paint paint);
+    method public void enableZ();
+    method public android.graphics.Canvas getNativeCanvas();
+    method public void restore();
+    method public void rotate(float degrees);
+    method public void save();
+    method public void saveLayer(androidx.ui.geometry.Rect bounds, androidx.ui.graphics.Paint paint);
+    method public void scale(float sx, float sy = sx);
+    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);
+    property public abstract android.graphics.Canvas nativeCanvas;
+  }
+
+  public final class CanvasKt {
+    method public static void rotate(androidx.ui.graphics.Canvas, float degrees, float pivotX, float pivotY);
+    method public static void rotateRad(androidx.ui.graphics.Canvas, float radians, float pivotX = 0.0f, float pivotY = 0.0f);
+    method public static void scale(androidx.ui.graphics.Canvas, float sx, float sy = sx, float pivotX, float pivotY);
+    method public static inline void withSave(androidx.ui.graphics.Canvas, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public static inline void withSaveLayer(androidx.ui.graphics.Canvas, androidx.ui.geometry.Rect bounds, androidx.ui.graphics.Paint paint, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public enum ClipOp {
+    enum_constant public static final androidx.ui.graphics.ClipOp difference;
+    enum_constant public static final androidx.ui.graphics.ClipOp intersect;
+  }
+
+  public final inline class Color {
+    ctor public Color();
+    method public static long constructor-impl(long value);
+    method public static long convert-impl(long $this, androidx.ui.graphics.colorspace.ColorSpace colorSpace);
+    method public static long copy-impl(long $this, float alpha = this.alpha, float red = this.red, float green = this.green, float blue = this.blue);
+    method public static 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.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();
+    method public static int hashCode-impl(long p);
+    method public static String toString-impl(long $this);
+    field public static final androidx.ui.graphics.Color.Companion! Companion;
+  }
+
+  public static final class Color.Companion {
+    method public long getBlack();
+    method public long getBlue();
+    method public long getCyan();
+    method public long getDarkGray();
+    method public long getGray();
+    method public long getGreen();
+    method public long getLightGray();
+    method public long getMagenta();
+    method public long getRed();
+    method public long getTransparent();
+    method public long getUnset();
+    method public long getWhite();
+    method public long getYellow();
+    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 Unset;
+    property public final long White;
+    property public final long Yellow;
+  }
+
+  public final class ColorFilter {
+    method public long component1();
+    method public androidx.ui.graphics.BlendMode component2();
+    method public androidx.ui.graphics.ColorFilter copy-vOa7YyA(long color, androidx.ui.graphics.BlendMode blendMode);
+    method public androidx.ui.graphics.BlendMode getBlendMode();
+    method public long getColor();
+    field public static final androidx.ui.graphics.ColorFilter.Companion! Companion;
+  }
+
+  public static final class ColorFilter.Companion {
+    method public androidx.ui.graphics.ColorFilter tint-QEYXlZo(long color);
+  }
+
+  public final class ColorKt {
+    method public static long Color(float red, float green, float blue, float alpha = 1f, androidx.ui.graphics.colorspace.ColorSpace colorSpace = ColorSpaces.Srgb);
+    method public static long Color(@ColorInt int color);
+    method public static long Color(long color);
+    method public static long Color(@IntRange(from=0, to=255) int red, @IntRange(from=0, to=255) int green, @IntRange(from=0, to=255) int blue, @IntRange(from=0, to=255) int alpha = 0xFF);
+    method public static long compositeOver-MsF30Tg(long, long background);
+    method public static inline boolean isSet-QEYXlZo(long);
+    method public static inline boolean isUnset-QEYXlZo(long);
+    method public static long lerp-hhXNEtA(long start, long stop, @FloatRange(from=0.0, to=1.0) float fraction);
+    method public static float luminance-QEYXlZo(long);
+    method @ColorInt public static int toArgb-QEYXlZo(long);
+    method public static inline long useOrElse-4UtWFt0(long, kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> block);
+  }
+
+  public enum FilterQuality {
+    enum_constant public static final androidx.ui.graphics.FilterQuality high;
+    enum_constant public static final androidx.ui.graphics.FilterQuality low;
+    enum_constant public static final androidx.ui.graphics.FilterQuality medium;
+    enum_constant public static final androidx.ui.graphics.FilterQuality none;
+  }
+
+  public final class Float16Kt {
+  }
+
+  public interface ImageAsset {
+    method public androidx.ui.graphics.colorspace.ColorSpace getColorSpace();
+    method public androidx.ui.graphics.ImageAssetConfig getConfig();
+    method public boolean getHasAlpha();
+    method public int getHeight();
+    method public int getWidth();
+    method public void prepareToDraw();
+    method public void readPixels(int[] buffer, int startX = 0, int startY = 0, int width = this.width, int height = this.height, int bufferOffset = 0, int stride = width);
+    property public abstract androidx.ui.graphics.colorspace.ColorSpace colorSpace;
+    property public abstract androidx.ui.graphics.ImageAssetConfig config;
+    property public abstract boolean hasAlpha;
+    property public abstract int height;
+    property public abstract int width;
+  }
+
+  public enum ImageAssetConfig {
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Alpha8;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Argb8888;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig F16;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Gpu;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Rgb565;
+  }
+
+  public final class ImageAssetKt {
+    method public static androidx.ui.graphics.PixelMap toPixelMap(androidx.ui.graphics.ImageAsset, int startX = 0, int startY = 0, int width = this.width, int height = this.height, int[] buffer = null(width * height), int bufferOffset = 0, int stride = width);
+  }
+
+  public final class LinearGradient extends androidx.ui.graphics.ShaderBrush {
+    method public androidx.ui.graphics.LinearGradient copy-OCut9AY(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode);
+  }
+
+  public abstract sealed class Outline {
+  }
+
+  public static final class Outline.Generic extends androidx.ui.graphics.Outline {
+    ctor public Outline.Generic(androidx.ui.graphics.Path path);
+    method public androidx.ui.graphics.Path component1();
+    method public androidx.ui.graphics.Outline.Generic copy(androidx.ui.graphics.Path path);
+    method public androidx.ui.graphics.Path getPath();
+  }
+
+  public static final class Outline.Rectangle extends androidx.ui.graphics.Outline {
+    ctor public Outline.Rectangle(androidx.ui.geometry.Rect rect);
+    method public androidx.ui.geometry.Rect component1();
+    method public androidx.ui.graphics.Outline.Rectangle copy(androidx.ui.geometry.Rect rect);
+    method public androidx.ui.geometry.Rect getRect();
+  }
+
+  public static final class Outline.Rounded extends androidx.ui.graphics.Outline {
+    ctor public Outline.Rounded(androidx.ui.geometry.RRect rrect);
+    method public androidx.ui.geometry.RRect component1();
+    method public androidx.ui.graphics.Outline.Rounded copy(androidx.ui.geometry.RRect rrect);
+    method public androidx.ui.geometry.RRect getRrect();
+  }
+
+  public final class OutlineKt {
+    method public static void addOutline(androidx.ui.graphics.Path, androidx.ui.graphics.Outline outline);
+    method public static void drawOutline(androidx.ui.graphics.Canvas, androidx.ui.graphics.Outline outline, androidx.ui.graphics.Paint paint);
+  }
+
+  public final class Paint {
+    ctor public Paint();
+    method public android.graphics.Paint asFrameworkPaint();
+    method public float getAlpha();
+    method public androidx.ui.graphics.BlendMode getBlendMode();
+    method public long getColor();
+    method public androidx.ui.graphics.ColorFilter? getColorFilter();
+    method public androidx.ui.graphics.FilterQuality getFilterQuality();
+    method public android.graphics.Shader? getShader();
+    method public androidx.ui.graphics.StrokeCap getStrokeCap();
+    method public androidx.ui.graphics.StrokeJoin getStrokeJoin();
+    method public float getStrokeMiterLimit();
+    method public float getStrokeWidth();
+    method public androidx.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.ui.graphics.BlendMode value);
+    method public void setColor-QEYXlZo(long color);
+    method public void setColorFilter(androidx.ui.graphics.ColorFilter? value);
+    method public void setFilterQuality(androidx.ui.graphics.FilterQuality value);
+    method public void setShader-DcPGf4I(android.graphics.Shader? value);
+    method public void setStrokeCap(androidx.ui.graphics.StrokeCap value);
+    method public void setStrokeJoin(androidx.ui.graphics.StrokeJoin value);
+    method public void setStrokeMiterLimit(float value);
+    method public void setStrokeWidth(float value);
+    method public void setStyle(androidx.ui.graphics.PaintingStyle value);
+    property public final float alpha;
+    property public final androidx.ui.graphics.BlendMode blendMode;
+    property public final long color;
+    property public final androidx.ui.graphics.ColorFilter? colorFilter;
+    property public final androidx.ui.graphics.FilterQuality filterQuality;
+    property public final boolean isAntiAlias;
+    property public final android.graphics.Shader? shader;
+    property public final androidx.ui.graphics.StrokeCap strokeCap;
+    property public final androidx.ui.graphics.StrokeJoin strokeJoin;
+    property public final float strokeMiterLimit;
+    property public final float strokeWidth;
+    property public final androidx.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.ui.graphics.PaintingStyle fill;
+    enum_constant public static final androidx.ui.graphics.PaintingStyle stroke;
+  }
+
+  public interface Path {
+    method public void addArc(androidx.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.ui.geometry.Rect oval);
+    method public void addPath(androidx.ui.graphics.Path path, androidx.ui.geometry.Offset offset = Offset.zero);
+    method public void addRRect(androidx.ui.geometry.RRect rrect);
+    method public void addRect(androidx.ui.geometry.Rect rect);
+    method public void arcTo(androidx.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+    method public default void arcToRad(androidx.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.ui.geometry.Rect getBounds();
+    method public androidx.ui.graphics.PathFillType getFillType();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float dx, float dy);
+    method public void moveTo(float dx, float dy);
+    method public boolean op(androidx.ui.graphics.Path path1, androidx.ui.graphics.Path path2, androidx.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void reset();
+    method public void setFillType(androidx.ui.graphics.PathFillType p);
+    method public void shift(androidx.ui.geometry.Offset offset);
+    property public abstract androidx.ui.graphics.PathFillType fillType;
+    property public abstract boolean isConvex;
+    property public abstract boolean isEmpty;
+    field public static final androidx.ui.graphics.Path.Companion! Companion;
+  }
+
+  public static final class Path.Companion {
+    method public androidx.ui.graphics.Path combine(androidx.ui.graphics.PathOperation operation, androidx.ui.graphics.Path path1, androidx.ui.graphics.Path path2);
+  }
+
+  public enum PathFillType {
+    enum_constant public static final androidx.ui.graphics.PathFillType evenOdd;
+    enum_constant public static final androidx.ui.graphics.PathFillType nonZero;
+  }
+
+  public enum PathOperation {
+    enum_constant public static final androidx.ui.graphics.PathOperation difference;
+    enum_constant public static final androidx.ui.graphics.PathOperation intersect;
+    enum_constant public static final androidx.ui.graphics.PathOperation reverseDifference;
+    enum_constant public static final androidx.ui.graphics.PathOperation union;
+    enum_constant public static final androidx.ui.graphics.PathOperation xor;
+  }
+
+  public final class Picture {
+    ctor public Picture(android.graphics.Picture frameworkPicture);
+    method public androidx.ui.geometry.Rect cullRect();
+    method public void dispose();
+    method public android.graphics.Picture getFrameworkPicture();
+  }
+
+  public final class PictureRecorder {
+    ctor public PictureRecorder();
+    method public androidx.ui.graphics.Picture endRecording();
+    method public boolean isRecording();
+    property public final boolean isRecording;
+  }
+
+  public final class PixelMap {
+    ctor public PixelMap(int[] buffer, int width, int height, int bufferOffset, int stride);
+    method public operator long get(@IntRange(from=0) int x, @IntRange(from=0) int y);
+    method public int[] getBuffer();
+    method public int getBufferOffset();
+    method public int getHeight();
+    method public int getStride();
+    method public int getWidth();
+  }
+
+  public enum PointMode {
+    enum_constant public static final androidx.ui.graphics.PointMode lines;
+    enum_constant public static final androidx.ui.graphics.PointMode points;
+    enum_constant public static final androidx.ui.graphics.PointMode polygon;
+  }
+
+  public final class RadialGradient extends androidx.ui.graphics.ShaderBrush {
+    method public androidx.ui.graphics.RadialGradient copy(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode);
+  }
+
+  public final class RectangleShapeKt {
+    method public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
+  public final inline class Shader {
+    ctor public Shader();
+    method public static android.graphics.Shader! constructor-impl(android.graphics.Shader nativeShader);
+    method public static boolean equals-impl(android.graphics.Shader! p, Object? p1);
+    method public static boolean equals-impl0(android.graphics.Shader p1, android.graphics.Shader p2);
+    method public android.graphics.Shader getNativeShader();
+    method public static int hashCode-impl(android.graphics.Shader! p);
+    method public static String toString-impl(android.graphics.Shader! p);
+  }
+
+  public class ShaderBrush implements androidx.ui.graphics.Brush {
+    method public void applyTo(androidx.ui.graphics.Paint p);
+    method public final android.graphics.Shader getShader();
+  }
+
+  public final class ShaderKt {
+    method public static android.graphics.Shader ImageShader(androidx.ui.graphics.ImageAsset image, androidx.ui.graphics.TileMode tileModeX = androidx.ui.graphics.TileMode.Clamp, androidx.ui.graphics.TileMode tileModeY = androidx.ui.graphics.TileMode.Clamp);
+    method public static android.graphics.Shader LinearGradientShader(androidx.ui.geometry.Offset from, androidx.ui.geometry.Offset to, java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? colorStops = null, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static android.graphics.Shader RadialGradientShader(androidx.ui.geometry.Offset center, float radius, java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? colorStops = null, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+  }
+
+  public final class Shadow {
+    method public long component1();
+    method public androidx.ui.geometry.Offset component2();
+    method public float component3();
+    method public androidx.ui.graphics.Shadow copy-1LPazZ4(long color, androidx.ui.geometry.Offset offset, float blurRadius);
+    method public float getBlurRadius();
+    method public long getColor();
+    method public androidx.ui.geometry.Offset getOffset();
+    field public static final androidx.ui.graphics.Shadow.Companion! Companion;
+  }
+
+  public static final class Shadow.Companion {
+    method public androidx.ui.graphics.Shadow getNone();
+    property public final androidx.ui.graphics.Shadow None;
+  }
+
+  public final class ShadowKt {
+    method public static androidx.ui.graphics.Shadow lerp(androidx.ui.graphics.Shadow start, androidx.ui.graphics.Shadow stop, float fraction);
+  }
+
+  public interface Shape {
+    method public androidx.ui.graphics.Outline createOutline(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+  }
+
+  public final class SolidColor implements androidx.ui.graphics.Brush {
+    method public void applyTo(androidx.ui.graphics.Paint p);
+    method public long component1();
+    method public androidx.ui.graphics.SolidColor copy-QEYXlZo(long value);
+    method public long getValue();
+  }
+
+  public enum StrokeCap {
+    enum_constant public static final androidx.ui.graphics.StrokeCap butt;
+    enum_constant public static final androidx.ui.graphics.StrokeCap round;
+    enum_constant public static final androidx.ui.graphics.StrokeCap square;
+  }
+
+  public enum StrokeJoin {
+    enum_constant public static final androidx.ui.graphics.StrokeJoin bevel;
+    enum_constant public static final androidx.ui.graphics.StrokeJoin miter;
+    enum_constant public static final androidx.ui.graphics.StrokeJoin round;
+  }
+
+  public enum TileMode {
+    method public final android.graphics.Shader.TileMode getNativeTileMode();
+    enum_constant public static final androidx.ui.graphics.TileMode Clamp;
+    enum_constant public static final androidx.ui.graphics.TileMode Mirror;
+    enum_constant public static final androidx.ui.graphics.TileMode Repeated;
+  }
+
+  public final class TileModeKt {
+    method public static android.graphics.Shader.TileMode NativeClampTileMode();
+    method public static android.graphics.Shader.TileMode NativeMirrorTileMode();
+    method public static android.graphics.Shader.TileMode NativeRepeatedTileMode();
+  }
+
+  public enum VertexMode {
+    method public final android.graphics.Canvas.VertexMode toFrameworkVertexMode();
+    enum_constant public static final androidx.ui.graphics.VertexMode triangleFan;
+    enum_constant public static final androidx.ui.graphics.VertexMode triangleStrip;
+    enum_constant public static final androidx.ui.graphics.VertexMode triangles;
+  }
+
+  public final class Vertices {
+    ctor public Vertices(androidx.ui.graphics.VertexMode vertexMode, java.util.List<androidx.ui.geometry.Offset> positions, java.util.List<androidx.ui.geometry.Offset> textureCoordinates, java.util.List<androidx.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.ui.graphics.VertexMode getVertexMode();
+    property public final int[] colors;
+    property public final short[] indices;
+    property public final float[] positions;
+    property public final float[] textureCoordinates;
+  }
+
+}
+
+package androidx.ui.graphics.colorspace {
+
+  public enum Adaptation {
+    enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Bradford;
+    enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Ciecat02;
+    enum_constant public static final androidx.ui.graphics.colorspace.Adaptation VonKries;
+  }
+
+  public enum ColorModel {
+    method public final int getComponentCount();
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Cmyk;
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Lab;
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Rgb;
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Xyz;
+  }
+
+  public abstract class ColorSpace {
+    ctor public ColorSpace(String name, androidx.ui.graphics.colorspace.ColorModel model);
+    method @Size(min=3) public final float[] fromXyz(float x, float y, float z);
+    method @Size(min=3) public abstract float[] fromXyz(@Size(min=3) float[] v);
+    method @IntRange(from=1, to=4) public final int getComponentCount();
+    method public abstract float getMaxValue(@IntRange(from=0, to=3) int component);
+    method public abstract float getMinValue(@IntRange(from=0, to=3) int component);
+    method public final androidx.ui.graphics.colorspace.ColorModel getModel();
+    method public final String getName();
+    method public boolean isSrgb();
+    method public abstract boolean isWideGamut();
+    method @Size(3) public final float[] toXyz(float r, float g, float b);
+    method @Size(min=3) public abstract float[] toXyz(@Size(min=3) float[] v);
+    property @IntRange(from=1, to=4) public final int componentCount;
+    property public boolean isSrgb;
+    property public abstract boolean isWideGamut;
+  }
+
+  public final class ColorSpaceKt {
+    method public static androidx.ui.graphics.colorspace.ColorSpace adapt(androidx.ui.graphics.colorspace.ColorSpace, androidx.ui.graphics.colorspace.WhitePoint whitePoint, androidx.ui.graphics.colorspace.Adaptation adaptation = androidx.ui.graphics.colorspace.Adaptation.Bradford);
+    method public static androidx.ui.graphics.colorspace.ColorSpace adapt(androidx.ui.graphics.colorspace.ColorSpace, androidx.ui.graphics.colorspace.WhitePoint whitePoint);
+    method public static androidx.ui.graphics.colorspace.Connector connect(androidx.ui.graphics.colorspace.ColorSpace, androidx.ui.graphics.colorspace.ColorSpace destination = ColorSpaces.Srgb, androidx.ui.graphics.colorspace.RenderIntent intent = androidx.ui.graphics.colorspace.RenderIntent.Perceptual);
+  }
+
+  public final class ColorSpaces {
+    method public androidx.ui.graphics.colorspace.Rgb getAces();
+    method public androidx.ui.graphics.colorspace.Rgb getAcescg();
+    method public androidx.ui.graphics.colorspace.Rgb getAdobeRgb();
+    method public androidx.ui.graphics.colorspace.Rgb getBt2020();
+    method public androidx.ui.graphics.colorspace.Rgb getBt709();
+    method public androidx.ui.graphics.colorspace.ColorSpace getCieLab();
+    method public androidx.ui.graphics.colorspace.ColorSpace getCieXyz();
+    method public androidx.ui.graphics.colorspace.Rgb getDciP3();
+    method public androidx.ui.graphics.colorspace.Rgb getDisplayP3();
+    method public androidx.ui.graphics.colorspace.Rgb getExtendedSrgb();
+    method public androidx.ui.graphics.colorspace.Rgb getLinearExtendedSrgb();
+    method public androidx.ui.graphics.colorspace.Rgb getLinearSrgb();
+    method public androidx.ui.graphics.colorspace.Rgb getNtsc1953();
+    method public androidx.ui.graphics.colorspace.Rgb getProPhotoRgb();
+    method public androidx.ui.graphics.colorspace.Rgb getSmpteC();
+    method public androidx.ui.graphics.colorspace.Rgb getSrgb();
+    method public androidx.ui.graphics.colorspace.ColorSpace? match(@Size(9) float[] toXYZD50, androidx.ui.graphics.colorspace.TransferParameters function);
+    property public final androidx.ui.graphics.colorspace.Rgb Aces;
+    property public final androidx.ui.graphics.colorspace.Rgb Acescg;
+    property public final androidx.ui.graphics.colorspace.Rgb AdobeRgb;
+    property public final androidx.ui.graphics.colorspace.Rgb Bt2020;
+    property public final androidx.ui.graphics.colorspace.Rgb Bt709;
+    property public final androidx.ui.graphics.colorspace.ColorSpace CieLab;
+    property public final androidx.ui.graphics.colorspace.ColorSpace CieXyz;
+    property public final androidx.ui.graphics.colorspace.Rgb DciP3;
+    property public final androidx.ui.graphics.colorspace.Rgb DisplayP3;
+    property public final androidx.ui.graphics.colorspace.Rgb ExtendedSrgb;
+    property public final androidx.ui.graphics.colorspace.Rgb LinearExtendedSrgb;
+    property public final androidx.ui.graphics.colorspace.Rgb LinearSrgb;
+    property public final androidx.ui.graphics.colorspace.Rgb Ntsc1953;
+    property public final androidx.ui.graphics.colorspace.Rgb ProPhotoRgb;
+    property public final androidx.ui.graphics.colorspace.Rgb SmpteC;
+    property public final androidx.ui.graphics.colorspace.Rgb Srgb;
+    field public static final androidx.ui.graphics.colorspace.ColorSpaces! INSTANCE;
+  }
+
+  public class Connector {
+    method public final androidx.ui.graphics.colorspace.ColorSpace getDestination();
+    method public final androidx.ui.graphics.colorspace.RenderIntent getRenderIntent();
+    method public final androidx.ui.graphics.colorspace.ColorSpace getSource();
+    method @Size(3) public final float[] transform(float r, float g, float b);
+    method @Size(min=3) public float[] transform(@Size(min=3) float[] v);
+  }
+
+  public final class Illuminant {
+    method public androidx.ui.graphics.colorspace.WhitePoint getA();
+    method public androidx.ui.graphics.colorspace.WhitePoint getB();
+    method public androidx.ui.graphics.colorspace.WhitePoint getC();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD50();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD55();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD60();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD65();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD75();
+    method public androidx.ui.graphics.colorspace.WhitePoint getE();
+    property public final androidx.ui.graphics.colorspace.WhitePoint A;
+    property public final androidx.ui.graphics.colorspace.WhitePoint B;
+    property public final androidx.ui.graphics.colorspace.WhitePoint C;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D50;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D55;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D60;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D65;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D75;
+    property public final androidx.ui.graphics.colorspace.WhitePoint E;
+    field public static final androidx.ui.graphics.colorspace.Illuminant! INSTANCE;
+  }
+
+  public enum RenderIntent {
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Absolute;
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Perceptual;
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Relative;
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Saturation;
+  }
+
+  public final class Rgb extends androidx.ui.graphics.colorspace.ColorSpace {
+    ctor public Rgb(@Size(min=null) String name, @Size(null) 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(@Size(min=null) String name, @Size(min=null, max=null) float[] primaries, androidx.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(@Size(min=null) String name, @Size(null) float[] toXYZ, androidx.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(@Size(min=null) String name, @Size(min=null, max=null) float[] primaries, androidx.ui.graphics.colorspace.WhitePoint whitePoint, androidx.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(@Size(min=null) String name, @Size(null) float[] toXYZ, double gamma);
+    ctor public Rgb(@Size(min=null) String name, @Size(min=null, max=null) float[] primaries, androidx.ui.graphics.colorspace.WhitePoint whitePoint, double gamma);
+    method @Size(3) public float[] fromLinear(float r, float g, float b);
+    method @Size(min=3) public float[] fromLinear(@Size(min=3) float[] v);
+    method @Size(min=3) public float[] fromXyz(@Size(min=3) float[] v);
+    method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getEotf();
+    method @Size(9) public float[] getInverseTransform();
+    method @Size(min=9) public float[] getInverseTransform(@Size(min=9) 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 @Size(6) public float[] getPrimaries();
+    method @Size(min=6) public float[] getPrimaries(@Size(min=6) float[] primaries);
+    method public androidx.ui.graphics.colorspace.TransferParameters? getTransferParameters();
+    method @Size(9) public float[] getTransform();
+    method @Size(min=9) public float[] getTransform(@Size(min=9) float[] transform);
+    method public androidx.ui.graphics.colorspace.WhitePoint getWhitePoint();
+    method public boolean isWideGamut();
+    method @Size(3) public float[] toLinear(float r, float g, float b);
+    method @Size(min=3) public float[] toLinear(@Size(min=3) float[] v);
+    method @Size(min=3) public float[] toXyz(@Size(min=3) 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;
+  }
+
+  public final class TransferParameters {
+    ctor public TransferParameters(double gamma, double a, double b, double c, double d, double e, 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.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();
+  }
+
+  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.ui.graphics.colorspace.WhitePoint copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+}
+
+package androidx.ui.graphics.painter {
+
+  public final class ColorPainter extends androidx.ui.graphics.painter.Painter {
+    method public long component1();
+    method public androidx.ui.graphics.painter.ColorPainter copy-QEYXlZo(long color);
+    method public long getColor();
+    method public androidx.ui.unit.PxSize getIntrinsicSize();
+    method protected void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+  public final class ImagePainter extends androidx.ui.graphics.painter.Painter {
+    ctor public ImagePainter(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Rect? srcBounds);
+    method public androidx.ui.geometry.Rect? component2();
+    method public androidx.ui.graphics.painter.ImagePainter copy(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Rect? srcBounds);
+    method public androidx.ui.unit.PxSize getIntrinsicSize();
+    method public androidx.ui.geometry.Rect? getSrcBounds();
+    method protected void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+  public final class ImagePainterKt {
+  }
+
+  public abstract class Painter {
+    ctor public Painter();
+    method protected boolean applyAlpha(float alpha);
+    method protected boolean applyColorFilter(androidx.ui.graphics.ColorFilter? colorFilter);
+    method protected boolean applyRtl(boolean rtl);
+    method public final void draw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null, boolean rtl = false);
+    method public abstract androidx.ui.unit.PxSize getIntrinsicSize();
+    method protected abstract void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public abstract androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+}
+
+package androidx.ui.graphics.vector {
+
+  public final class PathBuilder {
+    ctor public PathBuilder();
+    method public androidx.ui.graphics.vector.PathBuilder arcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder arcToRelative(float a, float b, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder close();
+    method public androidx.ui.graphics.vector.PathBuilder curveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.ui.graphics.vector.PathBuilder curveToRelative(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> getNodes();
+    method public androidx.ui.graphics.vector.PathBuilder horizontalLineTo(float x);
+    method public androidx.ui.graphics.vector.PathBuilder horizontalLineToRelative(float x);
+    method public androidx.ui.graphics.vector.PathBuilder lineTo(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder lineToRelative(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder moveTo(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder moveToRelative(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder quadTo(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder quadToRelative(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveCurveTo(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveCurveToRelative(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveQuadTo(float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveQuadToRelative(float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder verticalLineTo(float y);
+    method public androidx.ui.graphics.vector.PathBuilder verticalLineToRelative(float y);
+  }
+
+  public abstract sealed class PathNode {
+    method public final boolean isCurve();
+    method public final boolean isQuad();
+  }
+
+  public static final class PathNode.ArcTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.Close extends androidx.ui.graphics.vector.PathNode {
+    field public static final androidx.ui.graphics.vector.PathNode.Close! INSTANCE;
+  }
+
+  public static final class PathNode.CurveTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.HorizontalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.HorizontalTo(float x);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.HorizontalTo copy(float x);
+    method public float getX();
+  }
+
+  public static final class PathNode.LineTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.LineTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.LineTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.MoveTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.MoveTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.MoveTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.QuadTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.ReflectiveCurveTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.ReflectiveQuadTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.ReflectiveQuadTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.ReflectiveQuadTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeArcTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.RelativeCurveTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.RelativeHorizontalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeHorizontalTo(float x);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.RelativeHorizontalTo copy(float x);
+    method public float getX();
+  }
+
+  public static final class PathNode.RelativeLineTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeLineTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.RelativeLineTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeMoveTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeMoveTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.RelativeMoveTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeQuadTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeQuadTo(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 public androidx.ui.graphics.vector.PathNode.RelativeQuadTo 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();
+  }
+
+  public static final class PathNode.RelativeReflectiveCurveTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveCurveTo(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 public androidx.ui.graphics.vector.PathNode.RelativeReflectiveCurveTo 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();
+  }
+
+  public static final class PathNode.RelativeReflectiveQuadTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveQuadTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.RelativeReflectiveQuadTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeVerticalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeVerticalTo(float y);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.RelativeVerticalTo copy(float y);
+    method public float getY();
+  }
+
+  public static final class PathNode.VerticalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.VerticalTo(float y);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.VerticalTo copy(float y);
+    method public float getY();
+  }
+
+  public final class PathNodeKt {
+  }
+
+  public final class PathParser {
+    ctor public PathParser();
+    method public androidx.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.ui.graphics.vector.PathNode> nodes);
+    method public void clear();
+    method public androidx.ui.graphics.vector.PathParser parsePathString(String pathData);
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> toNodes();
+    method public androidx.ui.graphics.Path toPath(androidx.ui.graphics.Path target = Path());
+  }
+
+  public final class PathParserKt {
+  }
+
+}
+
+package androidx.ui.graphics.vectormath {
+
+  public final class Matrix3 {
+    ctor public Matrix3(androidx.ui.graphics.vectormath.Vector3 x, androidx.ui.graphics.vectormath.Vector3 y, androidx.ui.graphics.vectormath.Vector3 z);
+    ctor public Matrix3();
+    ctor public Matrix3(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public androidx.ui.graphics.vectormath.Vector3 component1();
+    method public androidx.ui.graphics.vectormath.Vector3 component2();
+    method public androidx.ui.graphics.vectormath.Vector3 component3();
+    method public androidx.ui.graphics.vectormath.Matrix3 copy(androidx.ui.graphics.vectormath.Vector3 x, androidx.ui.graphics.vectormath.Vector3 y, androidx.ui.graphics.vectormath.Vector3 z);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 dec();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 div(float v);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(int column);
+    method public operator float get(int column, int row);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(androidx.ui.graphics.vectormath.MatrixColumn column);
+    method public operator float get(androidx.ui.graphics.vectormath.MatrixColumn column, int row);
+    method public inline java.util.List<java.lang.Float> getM3storage();
+    method public androidx.ui.graphics.vectormath.Vector3 getX();
+    method public androidx.ui.graphics.vectormath.Vector3 getY();
+    method public androidx.ui.graphics.vectormath.Vector3 getZ();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 inc();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 minus(float v);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 plus(float v);
+    method public operator void set(int column, androidx.ui.graphics.vectormath.Vector3 v);
+    method public operator void set(int column, int row, float v);
+    method public void setX(androidx.ui.graphics.vectormath.Vector3 p);
+    method public void setY(androidx.ui.graphics.vectormath.Vector3 p);
+    method public void setZ(androidx.ui.graphics.vectormath.Vector3 p);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 times(float v);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 times(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public operator androidx.ui.graphics.vectormath.Vector3 times(androidx.ui.graphics.vectormath.Vector3 v);
+    method public float[] toFloatArray();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 unaryMinus();
+    property public final inline java.util.List<java.lang.Float> m3storage;
+    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion! Companion;
+  }
+
+  public static final class Matrix3.Companion {
+    method public androidx.ui.graphics.vectormath.Matrix3 identity();
+    method public androidx.ui.graphics.vectormath.Matrix3 of(float... a);
+  }
+
+  public final class Matrix4 {
+    ctor public Matrix4(androidx.ui.graphics.vectormath.Vector4 x, androidx.ui.graphics.vectormath.Vector4 y, androidx.ui.graphics.vectormath.Vector4 z, androidx.ui.graphics.vectormath.Vector4 w);
+    ctor public Matrix4();
+    ctor public Matrix4(androidx.ui.graphics.vectormath.Vector3 right, androidx.ui.graphics.vectormath.Vector3 up, androidx.ui.graphics.vectormath.Vector3 forward, androidx.ui.graphics.vectormath.Vector3 position);
+    ctor public Matrix4(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public void assignColumns(androidx.ui.graphics.vectormath.Matrix4 other);
+    method public void assignFromStorage(java.util.List<java.lang.Float> storage);
+    method public androidx.ui.graphics.vectormath.Vector4 component1();
+    method public androidx.ui.graphics.vectormath.Vector4 component2();
+    method public androidx.ui.graphics.vectormath.Vector4 component3();
+    method public androidx.ui.graphics.vectormath.Vector4 component4();
+    method public androidx.ui.graphics.vectormath.Matrix4 copy(androidx.ui.graphics.vectormath.Vector4 x, androidx.ui.graphics.vectormath.Vector4 y, androidx.ui.graphics.vectormath.Vector4 z, androidx.ui.graphics.vectormath.Vector4 w);
+    method public float copyInverse(androidx.ui.graphics.vectormath.Matrix4 arg);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 dec();
+    method public operator androidx.ui.graphics.vectormath.Matrix4 div(float v);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(int column);
+    method public operator float get(int column, int row);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(androidx.ui.graphics.vectormath.MatrixColumn column);
+    method public operator float get(androidx.ui.graphics.vectormath.MatrixColumn column, int row);
+    method public float getDeterminant();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getForward();
+    method public inline java.util.List<java.lang.Float> getM4storage();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getPosition();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getRight();
+    method public androidx.ui.graphics.vectormath.Vector3 getRotation();
+    method public androidx.ui.graphics.vectormath.Vector4 getRow(int row);
+    method public inline androidx.ui.graphics.vectormath.Vector3 getScale();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getTranslation();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getUp();
+    method public inline androidx.ui.graphics.vectormath.Matrix3 getUpperLeft();
+    method public androidx.ui.graphics.vectormath.Vector4 getW();
+    method public androidx.ui.graphics.vectormath.Vector4 getX();
+    method public androidx.ui.graphics.vectormath.Vector4 getY();
+    method public androidx.ui.graphics.vectormath.Vector4 getZ();
+    method public operator androidx.ui.graphics.vectormath.Matrix4 inc();
+    method public float invert();
+    method public operator androidx.ui.graphics.vectormath.Matrix4 minus(float v);
+    method public androidx.ui.graphics.vectormath.Vector3 perspectiveTransform(androidx.ui.graphics.vectormath.Vector3 arg);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 plus(float v);
+    method public void rotateX(float radians);
+    method public void rotateY(float radians);
+    method public void rotateZ(float radians);
+    method public void scale(Object x, Float? y = null, Float? z = null);
+    method public operator void set(int column, androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator void set(int column, int row, float v);
+    method public inline void setForward(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setFrom(androidx.ui.graphics.vectormath.Matrix4 arg);
+    method public inline void setPosition(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setRight(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setTranslationRaw(float x, float y, float z);
+    method public inline void setUp(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setW(androidx.ui.graphics.vectormath.Vector4 p);
+    method public void setX(androidx.ui.graphics.vectormath.Vector4 p);
+    method public void setY(androidx.ui.graphics.vectormath.Vector4 p);
+    method public void setZ(androidx.ui.graphics.vectormath.Vector4 p);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 times(float v);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 times(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator void timesAssign(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public float[] toFloatArray();
+    method public void translate(Object x, float y = 0.0f, float z = 0.0f);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 unaryMinus();
+    property public final float determinant;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 forward;
+    property public final inline java.util.List<java.lang.Float> m4storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 position;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 right;
+    property public final androidx.ui.graphics.vectormath.Vector3 rotation;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 scale;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 translation;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 up;
+    property public final inline androidx.ui.graphics.vectormath.Matrix3 upperLeft;
+    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion! Companion;
+  }
+
+  public static final class Matrix4.Companion {
+    method public androidx.ui.graphics.vectormath.Matrix4 diagonal3(androidx.ui.graphics.vectormath.Vector3 scale);
+    method public androidx.ui.graphics.vectormath.Matrix4 diagonal3Values(float x, float y, float z);
+    method public androidx.ui.graphics.vectormath.Matrix4 identity();
+    method public androidx.ui.graphics.vectormath.Matrix4 of(float... a);
+    method public androidx.ui.graphics.vectormath.Matrix4 rotationX(float radians);
+    method public androidx.ui.graphics.vectormath.Matrix4 rotationY(float radians);
+    method public androidx.ui.graphics.vectormath.Matrix4 rotationZ(float radians);
+    method public androidx.ui.graphics.vectormath.Matrix4 translation(androidx.ui.graphics.vectormath.Vector3 translation);
+    method public androidx.ui.graphics.vectormath.Matrix4 translationValues(float x, float y, float z);
+    method public androidx.ui.graphics.vectormath.Matrix4 zero();
+  }
+
+  public final class Matrix4Kt {
+    method public static Float? getAsScale(androidx.ui.graphics.vectormath.Matrix4);
+    method public static androidx.ui.geometry.Offset? getAsTranslation(androidx.ui.graphics.vectormath.Matrix4);
+    method public static androidx.ui.geometry.Rect inverseTransformRect(androidx.ui.graphics.vectormath.Matrix4 transform, androidx.ui.geometry.Rect rect);
+    method public static boolean isIdentity(androidx.ui.graphics.vectormath.Matrix4);
+    method public static boolean matrixEquals(androidx.ui.graphics.vectormath.Matrix4? a, androidx.ui.graphics.vectormath.Matrix4? b);
+    method public static androidx.ui.geometry.Offset transformPoint(androidx.ui.graphics.vectormath.Matrix4, androidx.ui.geometry.Offset point);
+    method public static androidx.ui.geometry.Rect transformRect(androidx.ui.graphics.vectormath.Matrix4, androidx.ui.geometry.Rect rect);
+  }
+
+  public enum MatrixColumn {
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn W;
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn X;
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Y;
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Z;
+  }
+
+  public final class MatrixExtensionsKt {
+    method public static androidx.ui.graphics.vectormath.Matrix3 inverse(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 inverse(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 lookAt(androidx.ui.graphics.vectormath.Vector3 eye, androidx.ui.graphics.vectormath.Vector3 target, androidx.ui.graphics.vectormath.Vector3 up = androidx.ui.graphics.vectormath.Vector3(1.0));
+    method public static androidx.ui.graphics.vectormath.Matrix4 lookTowards(androidx.ui.graphics.vectormath.Vector3 eye, androidx.ui.graphics.vectormath.Vector3 forward, androidx.ui.graphics.vectormath.Vector3 up = androidx.ui.graphics.vectormath.Vector3(1.0));
+    method public static androidx.ui.graphics.vectormath.Matrix4 normal(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 ortho(float l, float r, float b, float t, float n, float f);
+    method public static androidx.ui.graphics.vectormath.Matrix4 perspective(float fov, float ratio, float near, float far);
+    method public static androidx.ui.graphics.vectormath.Matrix4 rotation(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 rotation(androidx.ui.graphics.vectormath.Vector3 d);
+    method public static androidx.ui.graphics.vectormath.Matrix4 rotation(androidx.ui.graphics.vectormath.Vector3 axis, float angle);
+    method public static androidx.ui.graphics.vectormath.Matrix4 scale(androidx.ui.graphics.vectormath.Vector3 s);
+    method public static androidx.ui.graphics.vectormath.Matrix4 scale(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 translation(androidx.ui.graphics.vectormath.Vector3 t);
+    method public static androidx.ui.graphics.vectormath.Matrix4 translation(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix3 transpose(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 transpose(androidx.ui.graphics.vectormath.Matrix4 m);
+  }
+
+  public final class ScalarKt {
+    method public static inline float degrees(float v);
+    method public static inline float radians(float v);
+    field public static final float FOUR_PI = 12.566371f;
+    field public static final float HALF_PI = 1.5707964f;
+    field public static final float INV_FOUR_PI = 0.07957747f;
+    field public static final float INV_PI = 0.31830987f;
+    field public static final float INV_TWO_PI = 0.15915494f;
+    field public static final float PI = 3.1415927f;
+    field public static final float TWO_PI = 6.2831855f;
+  }
+
+  public final class Vector2 {
+    ctor public Vector2(float x, float y);
+    ctor public Vector2();
+    ctor public Vector2(androidx.ui.graphics.vectormath.Vector2 v);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vectormath.Vector2 copy(float x, float y);
+    method public operator androidx.ui.graphics.vectormath.Vector2 dec();
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 div(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 div(androidx.ui.graphics.vectormath.Vector2 v);
+    method public operator float get(androidx.ui.graphics.vectormath.VectorComponent index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2);
+    method public operator float get(int index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(int index1, int index2);
+    method public inline float getG();
+    method public inline float getR();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getRg();
+    method public inline float getS();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getSt();
+    method public inline float getT();
+    method public inline java.util.List<java.lang.Float> getV2storage();
+    method public float getX();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getXy();
+    method public float getY();
+    method public operator androidx.ui.graphics.vectormath.Vector2 inc();
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 minus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 minus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 plus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 plus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public operator void set(int index, float v);
+    method public operator void set(int index1, int index2, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, float v);
+    method public inline void setG(float value);
+    method public inline void setR(float value);
+    method public inline void setRg(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setS(float value);
+    method public inline void setSt(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setT(float value);
+    method public void setX(float p);
+    method public inline void setXy(androidx.ui.graphics.vectormath.Vector2 value);
+    method public void setY(float p);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 times(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 times(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline androidx.ui.graphics.vectormath.Vector2 transform(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public operator androidx.ui.graphics.vectormath.Vector2 unaryMinus();
+    property public final inline float g;
+    property public final inline float r;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 rg;
+    property public final inline float s;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 st;
+    property public final inline float t;
+    property public final inline java.util.List<java.lang.Float> v2storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 xy;
+  }
+
+  public final class Vector3 {
+    ctor public Vector3(float x, float y, float z);
+    ctor public Vector3();
+    ctor public Vector3(androidx.ui.graphics.vectormath.Vector2 v, float z);
+    ctor public Vector3(androidx.ui.graphics.vectormath.Vector3 v);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public androidx.ui.graphics.vectormath.Vector3 copy(float x, float y, float z);
+    method public operator androidx.ui.graphics.vectormath.Vector3 dec();
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 div(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 div(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 div(androidx.ui.graphics.vectormath.Vector3 v);
+    method public operator float get(androidx.ui.graphics.vectormath.VectorComponent index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3);
+    method public operator float get(int index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(int index1, int index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(int index1, int index2, int index3);
+    method public inline float getB();
+    method public inline float getG();
+    method public inline float getP();
+    method public inline float getR();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getRg();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getRgb();
+    method public inline float getS();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getSt();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getStp();
+    method public inline float getT();
+    method public inline java.util.List<java.lang.Float> getV3storage();
+    method public float getX();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getXy();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getXyz();
+    method public float getY();
+    method public float getZ();
+    method public operator androidx.ui.graphics.vectormath.Vector3 inc();
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 minus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 minus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 minus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 plus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 plus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 plus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public operator void set(int index, float v);
+    method public operator void set(int index1, int index2, float v);
+    method public operator void set(int index1, int index2, int index3, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, float v);
+    method public inline void setB(float value);
+    method public inline void setG(float value);
+    method public inline void setP(float value);
+    method public inline void setR(float value);
+    method public inline void setRg(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setRgb(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setS(float value);
+    method public inline void setSt(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setStp(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setT(float value);
+    method public void setX(float p);
+    method public inline void setXy(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setXyz(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setY(float p);
+    method public void setZ(float p);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 times(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 times(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 times(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline androidx.ui.graphics.vectormath.Vector3 transform(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public operator androidx.ui.graphics.vectormath.Vector3 unaryMinus();
+    property public final inline float b;
+    property public final inline float g;
+    property public final inline float p;
+    property public final inline float r;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 rg;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 rgb;
+    property public final inline float s;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 st;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 stp;
+    property public final inline float t;
+    property public final inline java.util.List<java.lang.Float> v3storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 xy;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 xyz;
+  }
+
+  public final class Vector4 {
+    ctor public Vector4(float x, float y, float z, float w);
+    ctor public Vector4();
+    ctor public Vector4(androidx.ui.graphics.vectormath.Vector2 v, float z, float w);
+    ctor public Vector4(androidx.ui.graphics.vectormath.Vector3 v, float w);
+    ctor public Vector4(androidx.ui.graphics.vectormath.Vector4 v);
+    method public void assignFromStorage(java.util.List<java.lang.Float> storage);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public androidx.ui.graphics.vectormath.Vector4 copy(float x, float y, float z, float w);
+    method public operator androidx.ui.graphics.vectormath.Vector4 dec();
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator float get(androidx.ui.graphics.vectormath.VectorComponent index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, androidx.ui.graphics.vectormath.VectorComponent index4);
+    method public operator float get(int index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(int index1, int index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(int index1, int index2, int index3);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(int index1, int index2, int index3, int index4);
+    method public inline float getA();
+    method public inline float getB();
+    method public inline float getG();
+    method public inline float getP();
+    method public inline float getQ();
+    method public inline float getR();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getRg();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getRgb();
+    method public inline androidx.ui.graphics.vectormath.Vector4 getRgba();
+    method public inline float getS();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getSt();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getStp();
+    method public inline androidx.ui.graphics.vectormath.Vector4 getStpq();
+    method public inline float getT();
+    method public inline java.util.List<java.lang.Float> getV4storage();
+    method public float getW();
+    method public float getX();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getXy();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getXyz();
+    method public inline androidx.ui.graphics.vectormath.Vector4 getXyzw();
+    method public float getY();
+    method public float getZ();
+    method public operator androidx.ui.graphics.vectormath.Vector4 inc();
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(androidx.ui.graphics.vectormath.Vector4 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator void set(int index, float v);
+    method public operator void set(int index1, int index2, float v);
+    method public operator void set(int index1, int index2, int index3, float v);
+    method public operator void set(int index1, int index2, int index3, int index4, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, androidx.ui.graphics.vectormath.VectorComponent index4, float v);
+    method public inline void setA(float value);
+    method public inline void setB(float value);
+    method public inline void setG(float value);
+    method public inline void setP(float value);
+    method public inline void setQ(float value);
+    method public inline void setR(float value);
+    method public inline void setRg(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setRgb(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setRgba(androidx.ui.graphics.vectormath.Vector4 value);
+    method public inline void setS(float value);
+    method public inline void setSt(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setStp(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setStpq(androidx.ui.graphics.vectormath.Vector4 value);
+    method public inline void setT(float value);
+    method public void setW(float p);
+    method public void setX(float p);
+    method public inline void setXy(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setXyz(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setXyzw(androidx.ui.graphics.vectormath.Vector4 value);
+    method public void setY(float p);
+    method public void setZ(float p);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector4 v);
+    method public inline androidx.ui.graphics.vectormath.Vector4 transform(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public operator androidx.ui.graphics.vectormath.Vector4 unaryMinus();
+    property public final inline float a;
+    property public final inline float b;
+    property public final inline float g;
+    property public final inline float p;
+    property public final inline float q;
+    property public final inline float r;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 rg;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 rgb;
+    property public final inline androidx.ui.graphics.vectormath.Vector4 rgba;
+    property public final inline float s;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 st;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 stp;
+    property public final inline androidx.ui.graphics.vectormath.Vector4 stpq;
+    property public final inline float t;
+    property public final inline java.util.List<java.lang.Float> v4storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 xy;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 xyz;
+    property public final inline androidx.ui.graphics.vectormath.Vector4 xyzw;
+  }
+
+  public enum VectorComponent {
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent A;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent B;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent G;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent P;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent Q;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent R;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent S;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent T;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent W;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent X;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent Y;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent Z;
+  }
+
+  public final class VectorExtensionsKt {
+    method public static inline androidx.ui.graphics.vectormath.Vector2 abs(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 abs(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 abs(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 coerceIn(androidx.ui.graphics.vectormath.Vector2, float min, float max);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 coerceIn(androidx.ui.graphics.vectormath.Vector2, androidx.ui.graphics.vectormath.Vector2 min, androidx.ui.graphics.vectormath.Vector2 max);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 coerceIn(androidx.ui.graphics.vectormath.Vector3, float min, float max);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 coerceIn(androidx.ui.graphics.vectormath.Vector3, androidx.ui.graphics.vectormath.Vector3 min, androidx.ui.graphics.vectormath.Vector3 max);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 coerceIn(androidx.ui.graphics.vectormath.Vector4, float min, float max);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 coerceIn(androidx.ui.graphics.vectormath.Vector4, androidx.ui.graphics.vectormath.Vector4 min, androidx.ui.graphics.vectormath.Vector4 max);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 cross(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float distance(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float distance(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float distance(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 div(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 div(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 div(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline float dot(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float dot(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float dot(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline float length(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline float length(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline float length(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline float length2(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline float length2(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline float length2(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline float max(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 max(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float max(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 max(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float max(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 max(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline float min(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 min(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float min(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 min(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float min(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 min(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 minus(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 minus(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 minus(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static androidx.ui.graphics.vectormath.Vector2 normalize(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static androidx.ui.graphics.vectormath.Vector3 normalize(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static androidx.ui.graphics.vectormath.Vector4 normalize(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 plus(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 plus(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 plus(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 reflect(androidx.ui.graphics.vectormath.Vector2 i, androidx.ui.graphics.vectormath.Vector2 n);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 reflect(androidx.ui.graphics.vectormath.Vector3 i, androidx.ui.graphics.vectormath.Vector3 n);
+    method public static androidx.ui.graphics.vectormath.Vector2 refract(androidx.ui.graphics.vectormath.Vector2 i, androidx.ui.graphics.vectormath.Vector2 n, float eta);
+    method public static androidx.ui.graphics.vectormath.Vector3 refract(androidx.ui.graphics.vectormath.Vector3 i, androidx.ui.graphics.vectormath.Vector3 n, float eta);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 times(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 times(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 times(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 transform(androidx.ui.graphics.vectormath.Vector2 v, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 transform(androidx.ui.graphics.vectormath.Vector3 v, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 transform(androidx.ui.graphics.vectormath.Vector4 v, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public static inline infix androidx.ui.graphics.vectormath.Vector3 x(androidx.ui.graphics.vectormath.Vector3, androidx.ui.graphics.vectormath.Vector3 v);
+  }
+
+}
+
diff --git a/ui/ui-graphics/api/current.txt b/ui/ui-graphics/api/current.txt
index 1f3ff55..a4896944 100644
--- a/ui/ui-graphics/api/current.txt
+++ b/ui/ui-graphics/api/current.txt
@@ -95,13 +95,6 @@
     enum_constant public static final androidx.ui.graphics.BlendMode xor;
   }
 
-  public enum BlurStyle {
-    enum_constant public static final androidx.ui.graphics.BlurStyle inner;
-    enum_constant public static final androidx.ui.graphics.BlurStyle normal;
-    enum_constant public static final androidx.ui.graphics.BlurStyle outer;
-    enum_constant public static final androidx.ui.graphics.BlurStyle solid;
-  }
-
   public interface Brush {
     method public void applyTo(androidx.ui.graphics.Paint p);
   }
@@ -278,21 +271,6 @@
     method public androidx.ui.graphics.LinearGradient copy-OCut9AY(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode);
   }
 
-  public final class MaskFilter {
-    ctor public MaskFilter(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public androidx.ui.graphics.BlurStyle component1();
-    method public float component2();
-    method public androidx.ui.graphics.MaskFilter copy(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public float getSigma();
-    method public androidx.ui.graphics.BlurStyle getStyle();
-    field public static final androidx.ui.graphics.MaskFilter.Companion! Companion;
-    field public static final int TYPE_BLUR = 1; // 0x1
-    field public static final int TYPE_NONE = 0; // 0x0
-  }
-
-  public static final class MaskFilter.Companion {
-  }
-
   public abstract sealed class Outline {
   }
 
@@ -330,7 +308,6 @@
     method public long getColor();
     method public androidx.ui.graphics.ColorFilter? getColorFilter();
     method public androidx.ui.graphics.FilterQuality getFilterQuality();
-    method public androidx.ui.graphics.MaskFilter getMaskFilter();
     method public android.graphics.Shader? getShader();
     method public androidx.ui.graphics.StrokeCap getStrokeCap();
     method public androidx.ui.graphics.StrokeJoin getStrokeJoin();
@@ -344,7 +321,6 @@
     method public void setColor-QEYXlZo(long color);
     method public void setColorFilter(androidx.ui.graphics.ColorFilter? value);
     method public void setFilterQuality(androidx.ui.graphics.FilterQuality value);
-    method public void setMaskFilter(androidx.ui.graphics.MaskFilter value);
     method public void setShader-DcPGf4I(android.graphics.Shader? value);
     method public void setStrokeCap(androidx.ui.graphics.StrokeCap value);
     method public void setStrokeJoin(androidx.ui.graphics.StrokeJoin value);
@@ -357,7 +333,6 @@
     property public final androidx.ui.graphics.ColorFilter? colorFilter;
     property public final androidx.ui.graphics.FilterQuality filterQuality;
     property public final boolean isAntiAlias;
-    property public final androidx.ui.graphics.MaskFilter maskFilter;
     property public final android.graphics.Shader? shader;
     property public final androidx.ui.graphics.StrokeCap strokeCap;
     property public final androidx.ui.graphics.StrokeJoin strokeJoin;
@@ -458,6 +433,10 @@
     method public androidx.ui.graphics.RadialGradient copy(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode);
   }
 
+  public final class RectangleShapeKt {
+    method public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
   public final inline class Shader {
     ctor public Shader();
     method public static android.graphics.Shader! constructor-impl(android.graphics.Shader nativeShader);
diff --git a/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev10.txt
index 1f3ff55..a4896944 100644
--- a/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev10.txt
@@ -95,13 +95,6 @@
     enum_constant public static final androidx.ui.graphics.BlendMode xor;
   }
 
-  public enum BlurStyle {
-    enum_constant public static final androidx.ui.graphics.BlurStyle inner;
-    enum_constant public static final androidx.ui.graphics.BlurStyle normal;
-    enum_constant public static final androidx.ui.graphics.BlurStyle outer;
-    enum_constant public static final androidx.ui.graphics.BlurStyle solid;
-  }
-
   public interface Brush {
     method public void applyTo(androidx.ui.graphics.Paint p);
   }
@@ -278,21 +271,6 @@
     method public androidx.ui.graphics.LinearGradient copy-OCut9AY(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode);
   }
 
-  public final class MaskFilter {
-    ctor public MaskFilter(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public androidx.ui.graphics.BlurStyle component1();
-    method public float component2();
-    method public androidx.ui.graphics.MaskFilter copy(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public float getSigma();
-    method public androidx.ui.graphics.BlurStyle getStyle();
-    field public static final androidx.ui.graphics.MaskFilter.Companion! Companion;
-    field public static final int TYPE_BLUR = 1; // 0x1
-    field public static final int TYPE_NONE = 0; // 0x0
-  }
-
-  public static final class MaskFilter.Companion {
-  }
-
   public abstract sealed class Outline {
   }
 
@@ -330,7 +308,6 @@
     method public long getColor();
     method public androidx.ui.graphics.ColorFilter? getColorFilter();
     method public androidx.ui.graphics.FilterQuality getFilterQuality();
-    method public androidx.ui.graphics.MaskFilter getMaskFilter();
     method public android.graphics.Shader? getShader();
     method public androidx.ui.graphics.StrokeCap getStrokeCap();
     method public androidx.ui.graphics.StrokeJoin getStrokeJoin();
@@ -344,7 +321,6 @@
     method public void setColor-QEYXlZo(long color);
     method public void setColorFilter(androidx.ui.graphics.ColorFilter? value);
     method public void setFilterQuality(androidx.ui.graphics.FilterQuality value);
-    method public void setMaskFilter(androidx.ui.graphics.MaskFilter value);
     method public void setShader-DcPGf4I(android.graphics.Shader? value);
     method public void setStrokeCap(androidx.ui.graphics.StrokeCap value);
     method public void setStrokeJoin(androidx.ui.graphics.StrokeJoin value);
@@ -357,7 +333,6 @@
     property public final androidx.ui.graphics.ColorFilter? colorFilter;
     property public final androidx.ui.graphics.FilterQuality filterQuality;
     property public final boolean isAntiAlias;
-    property public final androidx.ui.graphics.MaskFilter maskFilter;
     property public final android.graphics.Shader? shader;
     property public final androidx.ui.graphics.StrokeCap strokeCap;
     property public final androidx.ui.graphics.StrokeJoin strokeJoin;
@@ -458,6 +433,10 @@
     method public androidx.ui.graphics.RadialGradient copy(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode);
   }
 
+  public final class RectangleShapeKt {
+    method public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
   public final inline class Shader {
     ctor public Shader();
     method public static android.graphics.Shader! constructor-impl(android.graphics.Shader nativeShader);
diff --git a/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..a4896944
--- /dev/null
+++ b/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,1515 @@
+// Signature format: 3.0
+package androidx.ui.core {
+
+  public final class RectHelperKt {
+    method public static android.graphics.Rect toAndroidRect(androidx.ui.geometry.Rect);
+    method public static android.graphics.RectF toAndroidRectF(androidx.ui.geometry.Rect);
+  }
+
+}
+
+package androidx.ui.graphics {
+
+  public final class AndroidCanvasKt {
+    method public static androidx.ui.graphics.Canvas Canvas(androidx.ui.graphics.ImageAsset image);
+    method public static androidx.ui.graphics.Canvas Canvas(androidx.ui.graphics.PictureRecorder recorder, androidx.ui.geometry.Rect cullRect = Rect.largest);
+    method public static androidx.ui.graphics.Canvas Canvas(android.graphics.Canvas c);
+  }
+
+  public final class AndroidImageAssetKt {
+    method public static androidx.ui.graphics.ImageAsset ImageAsset(int width, int height, androidx.ui.graphics.ImageAssetConfig config = androidx.ui.graphics.ImageAssetConfig.Argb8888, boolean hasAlpha = true, androidx.ui.graphics.colorspace.ColorSpace colorSpace = ColorSpaces.Srgb);
+    method public static android.graphics.Bitmap asAndroidBitmap(androidx.ui.graphics.ImageAsset);
+    method public static androidx.ui.graphics.ImageAsset asImageAsset(android.graphics.Bitmap);
+    method public static androidx.ui.graphics.ImageAsset imageFromResource(android.content.res.Resources res, int resId);
+  }
+
+  public final class AndroidPath implements androidx.ui.graphics.Path {
+    ctor public AndroidPath(android.graphics.Path internalPath);
+    ctor public AndroidPath();
+    method public void addArc(androidx.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.ui.geometry.Rect oval);
+    method public void addPath(androidx.ui.graphics.Path path, androidx.ui.geometry.Offset offset);
+    method public void addRRect(androidx.ui.geometry.RRect rrect);
+    method public void addRect(androidx.ui.geometry.Rect rect);
+    method public void arcTo(androidx.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.ui.geometry.Rect getBounds();
+    method public androidx.ui.graphics.PathFillType getFillType();
+    method public android.graphics.Path getInternalPath();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float dx, float dy);
+    method public void moveTo(float dx, float dy);
+    method public boolean op(androidx.ui.graphics.Path path1, androidx.ui.graphics.Path path2, androidx.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void reset();
+    method public void setFillType(androidx.ui.graphics.PathFillType value);
+    method public void shift(androidx.ui.geometry.Offset offset);
+    property public androidx.ui.graphics.PathFillType fillType;
+    property public boolean isConvex;
+    property public boolean isEmpty;
+  }
+
+  public final class AndroidPathKt {
+    method public static androidx.ui.graphics.Path Path();
+    method public static inline android.graphics.Path asAndroidPath(androidx.ui.graphics.Path);
+    method public static androidx.ui.graphics.Path asComposePath(android.graphics.Path);
+  }
+
+  public enum BlendMode {
+    method public final android.graphics.PorterDuff.Mode toPorterDuffMode();
+    enum_constant public static final androidx.ui.graphics.BlendMode clear;
+    enum_constant public static final androidx.ui.graphics.BlendMode color;
+    enum_constant public static final androidx.ui.graphics.BlendMode colorBurn;
+    enum_constant public static final androidx.ui.graphics.BlendMode colorDodge;
+    enum_constant public static final androidx.ui.graphics.BlendMode darken;
+    enum_constant public static final androidx.ui.graphics.BlendMode difference;
+    enum_constant public static final androidx.ui.graphics.BlendMode dst;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstATop;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstIn;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstOut;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstOver;
+    enum_constant public static final androidx.ui.graphics.BlendMode exclusion;
+    enum_constant public static final androidx.ui.graphics.BlendMode hardLight;
+    enum_constant public static final androidx.ui.graphics.BlendMode hue;
+    enum_constant public static final androidx.ui.graphics.BlendMode lighten;
+    enum_constant public static final androidx.ui.graphics.BlendMode luminosity;
+    enum_constant public static final androidx.ui.graphics.BlendMode modulate;
+    enum_constant public static final androidx.ui.graphics.BlendMode multiply;
+    enum_constant public static final androidx.ui.graphics.BlendMode overlay;
+    enum_constant public static final androidx.ui.graphics.BlendMode plus;
+    enum_constant public static final androidx.ui.graphics.BlendMode saturation;
+    enum_constant public static final androidx.ui.graphics.BlendMode screen;
+    enum_constant public static final androidx.ui.graphics.BlendMode softLight;
+    enum_constant public static final androidx.ui.graphics.BlendMode src;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcATop;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcIn;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcOut;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcOver;
+    enum_constant public static final androidx.ui.graphics.BlendMode xor;
+  }
+
+  public interface Brush {
+    method public void applyTo(androidx.ui.graphics.Paint p);
+  }
+
+  public final class BrushKt {
+    method public static androidx.ui.graphics.Brush HorizontalGradient-G0qqrXo(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float startX, float endX, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient HorizontalGradient-vcfwFIc(java.util.List<androidx.ui.graphics.Color> colors, float startX, float endX, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient LinearGradient-39rnqCc(java.util.List<androidx.ui.graphics.Color> colors, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient LinearGradient-gbNZAbE(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.RadialGradient RadialGradient(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.RadialGradient RadialGradient(java.util.List<androidx.ui.graphics.Color> colors, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient VerticalGradient-G0qqrXo(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float startY, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient VerticalGradient-vcfwFIc(java.util.List<androidx.ui.graphics.Color> colors, float startY, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+  }
+
+  public interface Canvas {
+    method public void clipPath(androidx.ui.graphics.Path path);
+    method public void clipRRect(androidx.ui.geometry.RRect rrect);
+    method public void clipRect(androidx.ui.geometry.Rect rect, androidx.ui.graphics.ClipOp clipOp = androidx.ui.graphics.ClipOp.intersect);
+    method public void concat(androidx.ui.graphics.vectormath.Matrix4 matrix4);
+    method public void disableZ();
+    method public void drawArc(androidx.ui.geometry.Rect rect, float startAngle, float sweepAngle, boolean useCenter, androidx.ui.graphics.Paint paint);
+    method public default void drawArcRad(androidx.ui.geometry.Rect rect, float startAngleRad, float sweepAngleRad, boolean useCenter, androidx.ui.graphics.Paint paint);
+    method public void drawCircle(androidx.ui.geometry.Offset center, float radius, androidx.ui.graphics.Paint paint);
+    method public void drawImage(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Offset topLeftOffset, androidx.ui.graphics.Paint paint);
+    method public void drawImageRect(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Rect? src, androidx.ui.geometry.Rect dst, androidx.ui.graphics.Paint paint);
+    method public void drawLine(androidx.ui.geometry.Offset p1, androidx.ui.geometry.Offset p2, androidx.ui.graphics.Paint paint);
+    method public void drawOval(androidx.ui.geometry.Rect rect, androidx.ui.graphics.Paint paint);
+    method public void drawPath(androidx.ui.graphics.Path path, androidx.ui.graphics.Paint paint);
+    method public void drawPicture(androidx.ui.graphics.Picture picture);
+    method public void drawPoints(androidx.ui.graphics.PointMode pointMode, java.util.List<androidx.ui.geometry.Offset> points, androidx.ui.graphics.Paint paint);
+    method public void drawRawPoints(androidx.ui.graphics.PointMode pointMode, float[] points, androidx.ui.graphics.Paint paint);
+    method public void drawRect(androidx.ui.geometry.Rect rect, androidx.ui.graphics.Paint paint);
+    method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.ui.graphics.Paint paint);
+    method public void drawVertices(androidx.ui.graphics.Vertices vertices, androidx.ui.graphics.BlendMode blendMode, androidx.ui.graphics.Paint paint);
+    method public void enableZ();
+    method public android.graphics.Canvas getNativeCanvas();
+    method public void restore();
+    method public void rotate(float degrees);
+    method public void save();
+    method public void saveLayer(androidx.ui.geometry.Rect bounds, androidx.ui.graphics.Paint paint);
+    method public void scale(float sx, float sy = sx);
+    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);
+    property public abstract android.graphics.Canvas nativeCanvas;
+  }
+
+  public final class CanvasKt {
+    method public static void rotate(androidx.ui.graphics.Canvas, float degrees, float pivotX, float pivotY);
+    method public static void rotateRad(androidx.ui.graphics.Canvas, float radians, float pivotX = 0.0f, float pivotY = 0.0f);
+    method public static void scale(androidx.ui.graphics.Canvas, float sx, float sy = sx, float pivotX, float pivotY);
+    method public static inline void withSave(androidx.ui.graphics.Canvas, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public static inline void withSaveLayer(androidx.ui.graphics.Canvas, androidx.ui.geometry.Rect bounds, androidx.ui.graphics.Paint paint, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public enum ClipOp {
+    enum_constant public static final androidx.ui.graphics.ClipOp difference;
+    enum_constant public static final androidx.ui.graphics.ClipOp intersect;
+  }
+
+  public final inline class Color {
+    ctor public Color();
+    method public static long constructor-impl(long value);
+    method public static long convert-impl(long $this, androidx.ui.graphics.colorspace.ColorSpace colorSpace);
+    method public static long copy-impl(long $this, float alpha = this.alpha, float red = this.red, float green = this.green, float blue = this.blue);
+    method public static 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.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();
+    method public static int hashCode-impl(long p);
+    method public static String toString-impl(long $this);
+    field public static final androidx.ui.graphics.Color.Companion! Companion;
+  }
+
+  public static final class Color.Companion {
+    method public long getBlack();
+    method public long getBlue();
+    method public long getCyan();
+    method public long getDarkGray();
+    method public long getGray();
+    method public long getGreen();
+    method public long getLightGray();
+    method public long getMagenta();
+    method public long getRed();
+    method public long getTransparent();
+    method public long getUnset();
+    method public long getWhite();
+    method public long getYellow();
+    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 Unset;
+    property public final long White;
+    property public final long Yellow;
+  }
+
+  public final class ColorFilter {
+    method public long component1();
+    method public androidx.ui.graphics.BlendMode component2();
+    method public androidx.ui.graphics.ColorFilter copy-vOa7YyA(long color, androidx.ui.graphics.BlendMode blendMode);
+    method public androidx.ui.graphics.BlendMode getBlendMode();
+    method public long getColor();
+    field public static final androidx.ui.graphics.ColorFilter.Companion! Companion;
+  }
+
+  public static final class ColorFilter.Companion {
+    method public androidx.ui.graphics.ColorFilter tint-QEYXlZo(long color);
+  }
+
+  public final class ColorKt {
+    method public static long Color(float red, float green, float blue, float alpha = 1f, androidx.ui.graphics.colorspace.ColorSpace colorSpace = ColorSpaces.Srgb);
+    method public static long Color(@ColorInt int color);
+    method public static long Color(long color);
+    method public static long Color(@IntRange(from=0, to=255) int red, @IntRange(from=0, to=255) int green, @IntRange(from=0, to=255) int blue, @IntRange(from=0, to=255) int alpha = 0xFF);
+    method public static long compositeOver-MsF30Tg(long, long background);
+    method public static inline boolean isSet-QEYXlZo(long);
+    method public static inline boolean isUnset-QEYXlZo(long);
+    method public static long lerp-hhXNEtA(long start, long stop, @FloatRange(from=0.0, to=1.0) float fraction);
+    method public static float luminance-QEYXlZo(long);
+    method @ColorInt public static int toArgb-QEYXlZo(long);
+    method public static inline long useOrElse-4UtWFt0(long, kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> block);
+  }
+
+  public enum FilterQuality {
+    enum_constant public static final androidx.ui.graphics.FilterQuality high;
+    enum_constant public static final androidx.ui.graphics.FilterQuality low;
+    enum_constant public static final androidx.ui.graphics.FilterQuality medium;
+    enum_constant public static final androidx.ui.graphics.FilterQuality none;
+  }
+
+  public final class Float16Kt {
+  }
+
+  public interface ImageAsset {
+    method public androidx.ui.graphics.colorspace.ColorSpace getColorSpace();
+    method public androidx.ui.graphics.ImageAssetConfig getConfig();
+    method public boolean getHasAlpha();
+    method public int getHeight();
+    method public int getWidth();
+    method public void prepareToDraw();
+    method public void readPixels(int[] buffer, int startX = 0, int startY = 0, int width = this.width, int height = this.height, int bufferOffset = 0, int stride = width);
+    property public abstract androidx.ui.graphics.colorspace.ColorSpace colorSpace;
+    property public abstract androidx.ui.graphics.ImageAssetConfig config;
+    property public abstract boolean hasAlpha;
+    property public abstract int height;
+    property public abstract int width;
+  }
+
+  public enum ImageAssetConfig {
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Alpha8;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Argb8888;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig F16;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Gpu;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Rgb565;
+  }
+
+  public final class ImageAssetKt {
+    method public static androidx.ui.graphics.PixelMap toPixelMap(androidx.ui.graphics.ImageAsset, int startX = 0, int startY = 0, int width = this.width, int height = this.height, int[] buffer = null(width * height), int bufferOffset = 0, int stride = width);
+  }
+
+  public final class LinearGradient extends androidx.ui.graphics.ShaderBrush {
+    method public androidx.ui.graphics.LinearGradient copy-OCut9AY(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode);
+  }
+
+  public abstract sealed class Outline {
+  }
+
+  public static final class Outline.Generic extends androidx.ui.graphics.Outline {
+    ctor public Outline.Generic(androidx.ui.graphics.Path path);
+    method public androidx.ui.graphics.Path component1();
+    method public androidx.ui.graphics.Outline.Generic copy(androidx.ui.graphics.Path path);
+    method public androidx.ui.graphics.Path getPath();
+  }
+
+  public static final class Outline.Rectangle extends androidx.ui.graphics.Outline {
+    ctor public Outline.Rectangle(androidx.ui.geometry.Rect rect);
+    method public androidx.ui.geometry.Rect component1();
+    method public androidx.ui.graphics.Outline.Rectangle copy(androidx.ui.geometry.Rect rect);
+    method public androidx.ui.geometry.Rect getRect();
+  }
+
+  public static final class Outline.Rounded extends androidx.ui.graphics.Outline {
+    ctor public Outline.Rounded(androidx.ui.geometry.RRect rrect);
+    method public androidx.ui.geometry.RRect component1();
+    method public androidx.ui.graphics.Outline.Rounded copy(androidx.ui.geometry.RRect rrect);
+    method public androidx.ui.geometry.RRect getRrect();
+  }
+
+  public final class OutlineKt {
+    method public static void addOutline(androidx.ui.graphics.Path, androidx.ui.graphics.Outline outline);
+    method public static void drawOutline(androidx.ui.graphics.Canvas, androidx.ui.graphics.Outline outline, androidx.ui.graphics.Paint paint);
+  }
+
+  public final class Paint {
+    ctor public Paint();
+    method public android.graphics.Paint asFrameworkPaint();
+    method public float getAlpha();
+    method public androidx.ui.graphics.BlendMode getBlendMode();
+    method public long getColor();
+    method public androidx.ui.graphics.ColorFilter? getColorFilter();
+    method public androidx.ui.graphics.FilterQuality getFilterQuality();
+    method public android.graphics.Shader? getShader();
+    method public androidx.ui.graphics.StrokeCap getStrokeCap();
+    method public androidx.ui.graphics.StrokeJoin getStrokeJoin();
+    method public float getStrokeMiterLimit();
+    method public float getStrokeWidth();
+    method public androidx.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.ui.graphics.BlendMode value);
+    method public void setColor-QEYXlZo(long color);
+    method public void setColorFilter(androidx.ui.graphics.ColorFilter? value);
+    method public void setFilterQuality(androidx.ui.graphics.FilterQuality value);
+    method public void setShader-DcPGf4I(android.graphics.Shader? value);
+    method public void setStrokeCap(androidx.ui.graphics.StrokeCap value);
+    method public void setStrokeJoin(androidx.ui.graphics.StrokeJoin value);
+    method public void setStrokeMiterLimit(float value);
+    method public void setStrokeWidth(float value);
+    method public void setStyle(androidx.ui.graphics.PaintingStyle value);
+    property public final float alpha;
+    property public final androidx.ui.graphics.BlendMode blendMode;
+    property public final long color;
+    property public final androidx.ui.graphics.ColorFilter? colorFilter;
+    property public final androidx.ui.graphics.FilterQuality filterQuality;
+    property public final boolean isAntiAlias;
+    property public final android.graphics.Shader? shader;
+    property public final androidx.ui.graphics.StrokeCap strokeCap;
+    property public final androidx.ui.graphics.StrokeJoin strokeJoin;
+    property public final float strokeMiterLimit;
+    property public final float strokeWidth;
+    property public final androidx.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.ui.graphics.PaintingStyle fill;
+    enum_constant public static final androidx.ui.graphics.PaintingStyle stroke;
+  }
+
+  public interface Path {
+    method public void addArc(androidx.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.ui.geometry.Rect oval);
+    method public void addPath(androidx.ui.graphics.Path path, androidx.ui.geometry.Offset offset = Offset.zero);
+    method public void addRRect(androidx.ui.geometry.RRect rrect);
+    method public void addRect(androidx.ui.geometry.Rect rect);
+    method public void arcTo(androidx.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+    method public default void arcToRad(androidx.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.ui.geometry.Rect getBounds();
+    method public androidx.ui.graphics.PathFillType getFillType();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float dx, float dy);
+    method public void moveTo(float dx, float dy);
+    method public boolean op(androidx.ui.graphics.Path path1, androidx.ui.graphics.Path path2, androidx.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void reset();
+    method public void setFillType(androidx.ui.graphics.PathFillType p);
+    method public void shift(androidx.ui.geometry.Offset offset);
+    property public abstract androidx.ui.graphics.PathFillType fillType;
+    property public abstract boolean isConvex;
+    property public abstract boolean isEmpty;
+    field public static final androidx.ui.graphics.Path.Companion! Companion;
+  }
+
+  public static final class Path.Companion {
+    method public androidx.ui.graphics.Path combine(androidx.ui.graphics.PathOperation operation, androidx.ui.graphics.Path path1, androidx.ui.graphics.Path path2);
+  }
+
+  public enum PathFillType {
+    enum_constant public static final androidx.ui.graphics.PathFillType evenOdd;
+    enum_constant public static final androidx.ui.graphics.PathFillType nonZero;
+  }
+
+  public enum PathOperation {
+    enum_constant public static final androidx.ui.graphics.PathOperation difference;
+    enum_constant public static final androidx.ui.graphics.PathOperation intersect;
+    enum_constant public static final androidx.ui.graphics.PathOperation reverseDifference;
+    enum_constant public static final androidx.ui.graphics.PathOperation union;
+    enum_constant public static final androidx.ui.graphics.PathOperation xor;
+  }
+
+  public final class Picture {
+    ctor public Picture(android.graphics.Picture frameworkPicture);
+    method public androidx.ui.geometry.Rect cullRect();
+    method public void dispose();
+    method public android.graphics.Picture getFrameworkPicture();
+  }
+
+  public final class PictureRecorder {
+    ctor public PictureRecorder();
+    method public androidx.ui.graphics.Picture endRecording();
+    method public boolean isRecording();
+    property public final boolean isRecording;
+  }
+
+  public final class PixelMap {
+    ctor public PixelMap(int[] buffer, int width, int height, int bufferOffset, int stride);
+    method public operator long get(@IntRange(from=0) int x, @IntRange(from=0) int y);
+    method public int[] getBuffer();
+    method public int getBufferOffset();
+    method public int getHeight();
+    method public int getStride();
+    method public int getWidth();
+  }
+
+  public enum PointMode {
+    enum_constant public static final androidx.ui.graphics.PointMode lines;
+    enum_constant public static final androidx.ui.graphics.PointMode points;
+    enum_constant public static final androidx.ui.graphics.PointMode polygon;
+  }
+
+  public final class RadialGradient extends androidx.ui.graphics.ShaderBrush {
+    method public androidx.ui.graphics.RadialGradient copy(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode);
+  }
+
+  public final class RectangleShapeKt {
+    method public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
+  public final inline class Shader {
+    ctor public Shader();
+    method public static android.graphics.Shader! constructor-impl(android.graphics.Shader nativeShader);
+    method public static boolean equals-impl(android.graphics.Shader! p, Object? p1);
+    method public static boolean equals-impl0(android.graphics.Shader p1, android.graphics.Shader p2);
+    method public android.graphics.Shader getNativeShader();
+    method public static int hashCode-impl(android.graphics.Shader! p);
+    method public static String toString-impl(android.graphics.Shader! p);
+  }
+
+  public class ShaderBrush implements androidx.ui.graphics.Brush {
+    method public void applyTo(androidx.ui.graphics.Paint p);
+    method public final android.graphics.Shader getShader();
+  }
+
+  public final class ShaderKt {
+    method public static android.graphics.Shader ImageShader(androidx.ui.graphics.ImageAsset image, androidx.ui.graphics.TileMode tileModeX = androidx.ui.graphics.TileMode.Clamp, androidx.ui.graphics.TileMode tileModeY = androidx.ui.graphics.TileMode.Clamp);
+    method public static android.graphics.Shader LinearGradientShader(androidx.ui.geometry.Offset from, androidx.ui.geometry.Offset to, java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? colorStops = null, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static android.graphics.Shader RadialGradientShader(androidx.ui.geometry.Offset center, float radius, java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? colorStops = null, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+  }
+
+  public final class Shadow {
+    method public long component1();
+    method public androidx.ui.geometry.Offset component2();
+    method public float component3();
+    method public androidx.ui.graphics.Shadow copy-1LPazZ4(long color, androidx.ui.geometry.Offset offset, float blurRadius);
+    method public float getBlurRadius();
+    method public long getColor();
+    method public androidx.ui.geometry.Offset getOffset();
+    field public static final androidx.ui.graphics.Shadow.Companion! Companion;
+  }
+
+  public static final class Shadow.Companion {
+    method public androidx.ui.graphics.Shadow getNone();
+    property public final androidx.ui.graphics.Shadow None;
+  }
+
+  public final class ShadowKt {
+    method public static androidx.ui.graphics.Shadow lerp(androidx.ui.graphics.Shadow start, androidx.ui.graphics.Shadow stop, float fraction);
+  }
+
+  public interface Shape {
+    method public androidx.ui.graphics.Outline createOutline(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+  }
+
+  public final class SolidColor implements androidx.ui.graphics.Brush {
+    method public void applyTo(androidx.ui.graphics.Paint p);
+    method public long component1();
+    method public androidx.ui.graphics.SolidColor copy-QEYXlZo(long value);
+    method public long getValue();
+  }
+
+  public enum StrokeCap {
+    enum_constant public static final androidx.ui.graphics.StrokeCap butt;
+    enum_constant public static final androidx.ui.graphics.StrokeCap round;
+    enum_constant public static final androidx.ui.graphics.StrokeCap square;
+  }
+
+  public enum StrokeJoin {
+    enum_constant public static final androidx.ui.graphics.StrokeJoin bevel;
+    enum_constant public static final androidx.ui.graphics.StrokeJoin miter;
+    enum_constant public static final androidx.ui.graphics.StrokeJoin round;
+  }
+
+  public enum TileMode {
+    method public final android.graphics.Shader.TileMode getNativeTileMode();
+    enum_constant public static final androidx.ui.graphics.TileMode Clamp;
+    enum_constant public static final androidx.ui.graphics.TileMode Mirror;
+    enum_constant public static final androidx.ui.graphics.TileMode Repeated;
+  }
+
+  public final class TileModeKt {
+    method public static android.graphics.Shader.TileMode NativeClampTileMode();
+    method public static android.graphics.Shader.TileMode NativeMirrorTileMode();
+    method public static android.graphics.Shader.TileMode NativeRepeatedTileMode();
+  }
+
+  public enum VertexMode {
+    method public final android.graphics.Canvas.VertexMode toFrameworkVertexMode();
+    enum_constant public static final androidx.ui.graphics.VertexMode triangleFan;
+    enum_constant public static final androidx.ui.graphics.VertexMode triangleStrip;
+    enum_constant public static final androidx.ui.graphics.VertexMode triangles;
+  }
+
+  public final class Vertices {
+    ctor public Vertices(androidx.ui.graphics.VertexMode vertexMode, java.util.List<androidx.ui.geometry.Offset> positions, java.util.List<androidx.ui.geometry.Offset> textureCoordinates, java.util.List<androidx.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.ui.graphics.VertexMode getVertexMode();
+    property public final int[] colors;
+    property public final short[] indices;
+    property public final float[] positions;
+    property public final float[] textureCoordinates;
+  }
+
+}
+
+package androidx.ui.graphics.colorspace {
+
+  public enum Adaptation {
+    enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Bradford;
+    enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Ciecat02;
+    enum_constant public static final androidx.ui.graphics.colorspace.Adaptation VonKries;
+  }
+
+  public enum ColorModel {
+    method public final int getComponentCount();
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Cmyk;
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Lab;
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Rgb;
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Xyz;
+  }
+
+  public abstract class ColorSpace {
+    ctor public ColorSpace(String name, androidx.ui.graphics.colorspace.ColorModel model);
+    method @Size(min=3) public final float[] fromXyz(float x, float y, float z);
+    method @Size(min=3) public abstract float[] fromXyz(@Size(min=3) float[] v);
+    method @IntRange(from=1, to=4) public final int getComponentCount();
+    method public abstract float getMaxValue(@IntRange(from=0, to=3) int component);
+    method public abstract float getMinValue(@IntRange(from=0, to=3) int component);
+    method public final androidx.ui.graphics.colorspace.ColorModel getModel();
+    method public final String getName();
+    method public boolean isSrgb();
+    method public abstract boolean isWideGamut();
+    method @Size(3) public final float[] toXyz(float r, float g, float b);
+    method @Size(min=3) public abstract float[] toXyz(@Size(min=3) float[] v);
+    property @IntRange(from=1, to=4) public final int componentCount;
+    property public boolean isSrgb;
+    property public abstract boolean isWideGamut;
+  }
+
+  public final class ColorSpaceKt {
+    method public static androidx.ui.graphics.colorspace.ColorSpace adapt(androidx.ui.graphics.colorspace.ColorSpace, androidx.ui.graphics.colorspace.WhitePoint whitePoint, androidx.ui.graphics.colorspace.Adaptation adaptation = androidx.ui.graphics.colorspace.Adaptation.Bradford);
+    method public static androidx.ui.graphics.colorspace.ColorSpace adapt(androidx.ui.graphics.colorspace.ColorSpace, androidx.ui.graphics.colorspace.WhitePoint whitePoint);
+    method public static androidx.ui.graphics.colorspace.Connector connect(androidx.ui.graphics.colorspace.ColorSpace, androidx.ui.graphics.colorspace.ColorSpace destination = ColorSpaces.Srgb, androidx.ui.graphics.colorspace.RenderIntent intent = androidx.ui.graphics.colorspace.RenderIntent.Perceptual);
+  }
+
+  public final class ColorSpaces {
+    method public androidx.ui.graphics.colorspace.Rgb getAces();
+    method public androidx.ui.graphics.colorspace.Rgb getAcescg();
+    method public androidx.ui.graphics.colorspace.Rgb getAdobeRgb();
+    method public androidx.ui.graphics.colorspace.Rgb getBt2020();
+    method public androidx.ui.graphics.colorspace.Rgb getBt709();
+    method public androidx.ui.graphics.colorspace.ColorSpace getCieLab();
+    method public androidx.ui.graphics.colorspace.ColorSpace getCieXyz();
+    method public androidx.ui.graphics.colorspace.Rgb getDciP3();
+    method public androidx.ui.graphics.colorspace.Rgb getDisplayP3();
+    method public androidx.ui.graphics.colorspace.Rgb getExtendedSrgb();
+    method public androidx.ui.graphics.colorspace.Rgb getLinearExtendedSrgb();
+    method public androidx.ui.graphics.colorspace.Rgb getLinearSrgb();
+    method public androidx.ui.graphics.colorspace.Rgb getNtsc1953();
+    method public androidx.ui.graphics.colorspace.Rgb getProPhotoRgb();
+    method public androidx.ui.graphics.colorspace.Rgb getSmpteC();
+    method public androidx.ui.graphics.colorspace.Rgb getSrgb();
+    method public androidx.ui.graphics.colorspace.ColorSpace? match(@Size(9) float[] toXYZD50, androidx.ui.graphics.colorspace.TransferParameters function);
+    property public final androidx.ui.graphics.colorspace.Rgb Aces;
+    property public final androidx.ui.graphics.colorspace.Rgb Acescg;
+    property public final androidx.ui.graphics.colorspace.Rgb AdobeRgb;
+    property public final androidx.ui.graphics.colorspace.Rgb Bt2020;
+    property public final androidx.ui.graphics.colorspace.Rgb Bt709;
+    property public final androidx.ui.graphics.colorspace.ColorSpace CieLab;
+    property public final androidx.ui.graphics.colorspace.ColorSpace CieXyz;
+    property public final androidx.ui.graphics.colorspace.Rgb DciP3;
+    property public final androidx.ui.graphics.colorspace.Rgb DisplayP3;
+    property public final androidx.ui.graphics.colorspace.Rgb ExtendedSrgb;
+    property public final androidx.ui.graphics.colorspace.Rgb LinearExtendedSrgb;
+    property public final androidx.ui.graphics.colorspace.Rgb LinearSrgb;
+    property public final androidx.ui.graphics.colorspace.Rgb Ntsc1953;
+    property public final androidx.ui.graphics.colorspace.Rgb ProPhotoRgb;
+    property public final androidx.ui.graphics.colorspace.Rgb SmpteC;
+    property public final androidx.ui.graphics.colorspace.Rgb Srgb;
+    field public static final androidx.ui.graphics.colorspace.ColorSpaces! INSTANCE;
+  }
+
+  public class Connector {
+    method public final androidx.ui.graphics.colorspace.ColorSpace getDestination();
+    method public final androidx.ui.graphics.colorspace.RenderIntent getRenderIntent();
+    method public final androidx.ui.graphics.colorspace.ColorSpace getSource();
+    method @Size(3) public final float[] transform(float r, float g, float b);
+    method @Size(min=3) public float[] transform(@Size(min=3) float[] v);
+  }
+
+  public final class Illuminant {
+    method public androidx.ui.graphics.colorspace.WhitePoint getA();
+    method public androidx.ui.graphics.colorspace.WhitePoint getB();
+    method public androidx.ui.graphics.colorspace.WhitePoint getC();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD50();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD55();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD60();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD65();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD75();
+    method public androidx.ui.graphics.colorspace.WhitePoint getE();
+    property public final androidx.ui.graphics.colorspace.WhitePoint A;
+    property public final androidx.ui.graphics.colorspace.WhitePoint B;
+    property public final androidx.ui.graphics.colorspace.WhitePoint C;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D50;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D55;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D60;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D65;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D75;
+    property public final androidx.ui.graphics.colorspace.WhitePoint E;
+    field public static final androidx.ui.graphics.colorspace.Illuminant! INSTANCE;
+  }
+
+  public enum RenderIntent {
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Absolute;
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Perceptual;
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Relative;
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Saturation;
+  }
+
+  public final class Rgb extends androidx.ui.graphics.colorspace.ColorSpace {
+    ctor public Rgb(@Size(min=null) String name, @Size(null) 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(@Size(min=null) String name, @Size(min=null, max=null) float[] primaries, androidx.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(@Size(min=null) String name, @Size(null) float[] toXYZ, androidx.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(@Size(min=null) String name, @Size(min=null, max=null) float[] primaries, androidx.ui.graphics.colorspace.WhitePoint whitePoint, androidx.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(@Size(min=null) String name, @Size(null) float[] toXYZ, double gamma);
+    ctor public Rgb(@Size(min=null) String name, @Size(min=null, max=null) float[] primaries, androidx.ui.graphics.colorspace.WhitePoint whitePoint, double gamma);
+    method @Size(3) public float[] fromLinear(float r, float g, float b);
+    method @Size(min=3) public float[] fromLinear(@Size(min=3) float[] v);
+    method @Size(min=3) public float[] fromXyz(@Size(min=3) float[] v);
+    method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getEotf();
+    method @Size(9) public float[] getInverseTransform();
+    method @Size(min=9) public float[] getInverseTransform(@Size(min=9) 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 @Size(6) public float[] getPrimaries();
+    method @Size(min=6) public float[] getPrimaries(@Size(min=6) float[] primaries);
+    method public androidx.ui.graphics.colorspace.TransferParameters? getTransferParameters();
+    method @Size(9) public float[] getTransform();
+    method @Size(min=9) public float[] getTransform(@Size(min=9) float[] transform);
+    method public androidx.ui.graphics.colorspace.WhitePoint getWhitePoint();
+    method public boolean isWideGamut();
+    method @Size(3) public float[] toLinear(float r, float g, float b);
+    method @Size(min=3) public float[] toLinear(@Size(min=3) float[] v);
+    method @Size(min=3) public float[] toXyz(@Size(min=3) 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;
+  }
+
+  public final class TransferParameters {
+    ctor public TransferParameters(double gamma, double a, double b, double c, double d, double e, 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.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();
+  }
+
+  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.ui.graphics.colorspace.WhitePoint copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+}
+
+package androidx.ui.graphics.painter {
+
+  public final class ColorPainter extends androidx.ui.graphics.painter.Painter {
+    method public long component1();
+    method public androidx.ui.graphics.painter.ColorPainter copy-QEYXlZo(long color);
+    method public long getColor();
+    method public androidx.ui.unit.PxSize getIntrinsicSize();
+    method protected void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+  public final class ImagePainter extends androidx.ui.graphics.painter.Painter {
+    ctor public ImagePainter(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Rect? srcBounds);
+    method public androidx.ui.geometry.Rect? component2();
+    method public androidx.ui.graphics.painter.ImagePainter copy(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Rect? srcBounds);
+    method public androidx.ui.unit.PxSize getIntrinsicSize();
+    method public androidx.ui.geometry.Rect? getSrcBounds();
+    method protected void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+  public final class ImagePainterKt {
+  }
+
+  public abstract class Painter {
+    ctor public Painter();
+    method protected boolean applyAlpha(float alpha);
+    method protected boolean applyColorFilter(androidx.ui.graphics.ColorFilter? colorFilter);
+    method protected boolean applyRtl(boolean rtl);
+    method public final void draw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null, boolean rtl = false);
+    method public abstract androidx.ui.unit.PxSize getIntrinsicSize();
+    method protected abstract void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public abstract androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+}
+
+package androidx.ui.graphics.vector {
+
+  public final class PathBuilder {
+    ctor public PathBuilder();
+    method public androidx.ui.graphics.vector.PathBuilder arcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder arcToRelative(float a, float b, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder close();
+    method public androidx.ui.graphics.vector.PathBuilder curveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.ui.graphics.vector.PathBuilder curveToRelative(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> getNodes();
+    method public androidx.ui.graphics.vector.PathBuilder horizontalLineTo(float x);
+    method public androidx.ui.graphics.vector.PathBuilder horizontalLineToRelative(float x);
+    method public androidx.ui.graphics.vector.PathBuilder lineTo(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder lineToRelative(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder moveTo(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder moveToRelative(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder quadTo(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder quadToRelative(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveCurveTo(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveCurveToRelative(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveQuadTo(float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveQuadToRelative(float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder verticalLineTo(float y);
+    method public androidx.ui.graphics.vector.PathBuilder verticalLineToRelative(float y);
+  }
+
+  public abstract sealed class PathNode {
+    method public final boolean isCurve();
+    method public final boolean isQuad();
+  }
+
+  public static final class PathNode.ArcTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.Close extends androidx.ui.graphics.vector.PathNode {
+    field public static final androidx.ui.graphics.vector.PathNode.Close! INSTANCE;
+  }
+
+  public static final class PathNode.CurveTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.HorizontalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.HorizontalTo(float x);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.HorizontalTo copy(float x);
+    method public float getX();
+  }
+
+  public static final class PathNode.LineTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.LineTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.LineTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.MoveTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.MoveTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.MoveTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.QuadTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.ReflectiveCurveTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.ReflectiveQuadTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.ReflectiveQuadTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.ReflectiveQuadTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeArcTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.RelativeCurveTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.RelativeHorizontalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeHorizontalTo(float x);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.RelativeHorizontalTo copy(float x);
+    method public float getX();
+  }
+
+  public static final class PathNode.RelativeLineTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeLineTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.RelativeLineTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeMoveTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeMoveTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.RelativeMoveTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeQuadTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeQuadTo(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 public androidx.ui.graphics.vector.PathNode.RelativeQuadTo 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();
+  }
+
+  public static final class PathNode.RelativeReflectiveCurveTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveCurveTo(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 public androidx.ui.graphics.vector.PathNode.RelativeReflectiveCurveTo 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();
+  }
+
+  public static final class PathNode.RelativeReflectiveQuadTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveQuadTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.RelativeReflectiveQuadTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeVerticalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeVerticalTo(float y);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.RelativeVerticalTo copy(float y);
+    method public float getY();
+  }
+
+  public static final class PathNode.VerticalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.VerticalTo(float y);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.VerticalTo copy(float y);
+    method public float getY();
+  }
+
+  public final class PathNodeKt {
+  }
+
+  public final class PathParser {
+    ctor public PathParser();
+    method public androidx.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.ui.graphics.vector.PathNode> nodes);
+    method public void clear();
+    method public androidx.ui.graphics.vector.PathParser parsePathString(String pathData);
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> toNodes();
+    method public androidx.ui.graphics.Path toPath(androidx.ui.graphics.Path target = Path());
+  }
+
+  public final class PathParserKt {
+  }
+
+}
+
+package androidx.ui.graphics.vectormath {
+
+  public final class Matrix3 {
+    ctor public Matrix3(androidx.ui.graphics.vectormath.Vector3 x, androidx.ui.graphics.vectormath.Vector3 y, androidx.ui.graphics.vectormath.Vector3 z);
+    ctor public Matrix3();
+    ctor public Matrix3(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public androidx.ui.graphics.vectormath.Vector3 component1();
+    method public androidx.ui.graphics.vectormath.Vector3 component2();
+    method public androidx.ui.graphics.vectormath.Vector3 component3();
+    method public androidx.ui.graphics.vectormath.Matrix3 copy(androidx.ui.graphics.vectormath.Vector3 x, androidx.ui.graphics.vectormath.Vector3 y, androidx.ui.graphics.vectormath.Vector3 z);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 dec();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 div(float v);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(int column);
+    method public operator float get(int column, int row);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(androidx.ui.graphics.vectormath.MatrixColumn column);
+    method public operator float get(androidx.ui.graphics.vectormath.MatrixColumn column, int row);
+    method public inline java.util.List<java.lang.Float> getM3storage();
+    method public androidx.ui.graphics.vectormath.Vector3 getX();
+    method public androidx.ui.graphics.vectormath.Vector3 getY();
+    method public androidx.ui.graphics.vectormath.Vector3 getZ();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 inc();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 minus(float v);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 plus(float v);
+    method public operator void set(int column, androidx.ui.graphics.vectormath.Vector3 v);
+    method public operator void set(int column, int row, float v);
+    method public void setX(androidx.ui.graphics.vectormath.Vector3 p);
+    method public void setY(androidx.ui.graphics.vectormath.Vector3 p);
+    method public void setZ(androidx.ui.graphics.vectormath.Vector3 p);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 times(float v);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 times(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public operator androidx.ui.graphics.vectormath.Vector3 times(androidx.ui.graphics.vectormath.Vector3 v);
+    method public float[] toFloatArray();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 unaryMinus();
+    property public final inline java.util.List<java.lang.Float> m3storage;
+    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion! Companion;
+  }
+
+  public static final class Matrix3.Companion {
+    method public androidx.ui.graphics.vectormath.Matrix3 identity();
+    method public androidx.ui.graphics.vectormath.Matrix3 of(float... a);
+  }
+
+  public final class Matrix4 {
+    ctor public Matrix4(androidx.ui.graphics.vectormath.Vector4 x, androidx.ui.graphics.vectormath.Vector4 y, androidx.ui.graphics.vectormath.Vector4 z, androidx.ui.graphics.vectormath.Vector4 w);
+    ctor public Matrix4();
+    ctor public Matrix4(androidx.ui.graphics.vectormath.Vector3 right, androidx.ui.graphics.vectormath.Vector3 up, androidx.ui.graphics.vectormath.Vector3 forward, androidx.ui.graphics.vectormath.Vector3 position);
+    ctor public Matrix4(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public void assignColumns(androidx.ui.graphics.vectormath.Matrix4 other);
+    method public void assignFromStorage(java.util.List<java.lang.Float> storage);
+    method public androidx.ui.graphics.vectormath.Vector4 component1();
+    method public androidx.ui.graphics.vectormath.Vector4 component2();
+    method public androidx.ui.graphics.vectormath.Vector4 component3();
+    method public androidx.ui.graphics.vectormath.Vector4 component4();
+    method public androidx.ui.graphics.vectormath.Matrix4 copy(androidx.ui.graphics.vectormath.Vector4 x, androidx.ui.graphics.vectormath.Vector4 y, androidx.ui.graphics.vectormath.Vector4 z, androidx.ui.graphics.vectormath.Vector4 w);
+    method public float copyInverse(androidx.ui.graphics.vectormath.Matrix4 arg);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 dec();
+    method public operator androidx.ui.graphics.vectormath.Matrix4 div(float v);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(int column);
+    method public operator float get(int column, int row);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(androidx.ui.graphics.vectormath.MatrixColumn column);
+    method public operator float get(androidx.ui.graphics.vectormath.MatrixColumn column, int row);
+    method public float getDeterminant();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getForward();
+    method public inline java.util.List<java.lang.Float> getM4storage();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getPosition();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getRight();
+    method public androidx.ui.graphics.vectormath.Vector3 getRotation();
+    method public androidx.ui.graphics.vectormath.Vector4 getRow(int row);
+    method public inline androidx.ui.graphics.vectormath.Vector3 getScale();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getTranslation();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getUp();
+    method public inline androidx.ui.graphics.vectormath.Matrix3 getUpperLeft();
+    method public androidx.ui.graphics.vectormath.Vector4 getW();
+    method public androidx.ui.graphics.vectormath.Vector4 getX();
+    method public androidx.ui.graphics.vectormath.Vector4 getY();
+    method public androidx.ui.graphics.vectormath.Vector4 getZ();
+    method public operator androidx.ui.graphics.vectormath.Matrix4 inc();
+    method public float invert();
+    method public operator androidx.ui.graphics.vectormath.Matrix4 minus(float v);
+    method public androidx.ui.graphics.vectormath.Vector3 perspectiveTransform(androidx.ui.graphics.vectormath.Vector3 arg);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 plus(float v);
+    method public void rotateX(float radians);
+    method public void rotateY(float radians);
+    method public void rotateZ(float radians);
+    method public void scale(Object x, Float? y = null, Float? z = null);
+    method public operator void set(int column, androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator void set(int column, int row, float v);
+    method public inline void setForward(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setFrom(androidx.ui.graphics.vectormath.Matrix4 arg);
+    method public inline void setPosition(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setRight(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setTranslationRaw(float x, float y, float z);
+    method public inline void setUp(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setW(androidx.ui.graphics.vectormath.Vector4 p);
+    method public void setX(androidx.ui.graphics.vectormath.Vector4 p);
+    method public void setY(androidx.ui.graphics.vectormath.Vector4 p);
+    method public void setZ(androidx.ui.graphics.vectormath.Vector4 p);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 times(float v);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 times(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator void timesAssign(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public float[] toFloatArray();
+    method public void translate(Object x, float y = 0.0f, float z = 0.0f);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 unaryMinus();
+    property public final float determinant;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 forward;
+    property public final inline java.util.List<java.lang.Float> m4storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 position;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 right;
+    property public final androidx.ui.graphics.vectormath.Vector3 rotation;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 scale;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 translation;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 up;
+    property public final inline androidx.ui.graphics.vectormath.Matrix3 upperLeft;
+    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion! Companion;
+  }
+
+  public static final class Matrix4.Companion {
+    method public androidx.ui.graphics.vectormath.Matrix4 diagonal3(androidx.ui.graphics.vectormath.Vector3 scale);
+    method public androidx.ui.graphics.vectormath.Matrix4 diagonal3Values(float x, float y, float z);
+    method public androidx.ui.graphics.vectormath.Matrix4 identity();
+    method public androidx.ui.graphics.vectormath.Matrix4 of(float... a);
+    method public androidx.ui.graphics.vectormath.Matrix4 rotationX(float radians);
+    method public androidx.ui.graphics.vectormath.Matrix4 rotationY(float radians);
+    method public androidx.ui.graphics.vectormath.Matrix4 rotationZ(float radians);
+    method public androidx.ui.graphics.vectormath.Matrix4 translation(androidx.ui.graphics.vectormath.Vector3 translation);
+    method public androidx.ui.graphics.vectormath.Matrix4 translationValues(float x, float y, float z);
+    method public androidx.ui.graphics.vectormath.Matrix4 zero();
+  }
+
+  public final class Matrix4Kt {
+    method public static Float? getAsScale(androidx.ui.graphics.vectormath.Matrix4);
+    method public static androidx.ui.geometry.Offset? getAsTranslation(androidx.ui.graphics.vectormath.Matrix4);
+    method public static androidx.ui.geometry.Rect inverseTransformRect(androidx.ui.graphics.vectormath.Matrix4 transform, androidx.ui.geometry.Rect rect);
+    method public static boolean isIdentity(androidx.ui.graphics.vectormath.Matrix4);
+    method public static boolean matrixEquals(androidx.ui.graphics.vectormath.Matrix4? a, androidx.ui.graphics.vectormath.Matrix4? b);
+    method public static androidx.ui.geometry.Offset transformPoint(androidx.ui.graphics.vectormath.Matrix4, androidx.ui.geometry.Offset point);
+    method public static androidx.ui.geometry.Rect transformRect(androidx.ui.graphics.vectormath.Matrix4, androidx.ui.geometry.Rect rect);
+  }
+
+  public enum MatrixColumn {
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn W;
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn X;
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Y;
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Z;
+  }
+
+  public final class MatrixExtensionsKt {
+    method public static androidx.ui.graphics.vectormath.Matrix3 inverse(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 inverse(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 lookAt(androidx.ui.graphics.vectormath.Vector3 eye, androidx.ui.graphics.vectormath.Vector3 target, androidx.ui.graphics.vectormath.Vector3 up = androidx.ui.graphics.vectormath.Vector3(1.0));
+    method public static androidx.ui.graphics.vectormath.Matrix4 lookTowards(androidx.ui.graphics.vectormath.Vector3 eye, androidx.ui.graphics.vectormath.Vector3 forward, androidx.ui.graphics.vectormath.Vector3 up = androidx.ui.graphics.vectormath.Vector3(1.0));
+    method public static androidx.ui.graphics.vectormath.Matrix4 normal(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 ortho(float l, float r, float b, float t, float n, float f);
+    method public static androidx.ui.graphics.vectormath.Matrix4 perspective(float fov, float ratio, float near, float far);
+    method public static androidx.ui.graphics.vectormath.Matrix4 rotation(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 rotation(androidx.ui.graphics.vectormath.Vector3 d);
+    method public static androidx.ui.graphics.vectormath.Matrix4 rotation(androidx.ui.graphics.vectormath.Vector3 axis, float angle);
+    method public static androidx.ui.graphics.vectormath.Matrix4 scale(androidx.ui.graphics.vectormath.Vector3 s);
+    method public static androidx.ui.graphics.vectormath.Matrix4 scale(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 translation(androidx.ui.graphics.vectormath.Vector3 t);
+    method public static androidx.ui.graphics.vectormath.Matrix4 translation(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix3 transpose(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 transpose(androidx.ui.graphics.vectormath.Matrix4 m);
+  }
+
+  public final class ScalarKt {
+    method public static inline float degrees(float v);
+    method public static inline float radians(float v);
+    field public static final float FOUR_PI = 12.566371f;
+    field public static final float HALF_PI = 1.5707964f;
+    field public static final float INV_FOUR_PI = 0.07957747f;
+    field public static final float INV_PI = 0.31830987f;
+    field public static final float INV_TWO_PI = 0.15915494f;
+    field public static final float PI = 3.1415927f;
+    field public static final float TWO_PI = 6.2831855f;
+  }
+
+  public final class Vector2 {
+    ctor public Vector2(float x, float y);
+    ctor public Vector2();
+    ctor public Vector2(androidx.ui.graphics.vectormath.Vector2 v);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vectormath.Vector2 copy(float x, float y);
+    method public operator androidx.ui.graphics.vectormath.Vector2 dec();
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 div(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 div(androidx.ui.graphics.vectormath.Vector2 v);
+    method public operator float get(androidx.ui.graphics.vectormath.VectorComponent index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2);
+    method public operator float get(int index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(int index1, int index2);
+    method public inline float getG();
+    method public inline float getR();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getRg();
+    method public inline float getS();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getSt();
+    method public inline float getT();
+    method public inline java.util.List<java.lang.Float> getV2storage();
+    method public float getX();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getXy();
+    method public float getY();
+    method public operator androidx.ui.graphics.vectormath.Vector2 inc();
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 minus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 minus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 plus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 plus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public operator void set(int index, float v);
+    method public operator void set(int index1, int index2, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, float v);
+    method public inline void setG(float value);
+    method public inline void setR(float value);
+    method public inline void setRg(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setS(float value);
+    method public inline void setSt(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setT(float value);
+    method public void setX(float p);
+    method public inline void setXy(androidx.ui.graphics.vectormath.Vector2 value);
+    method public void setY(float p);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 times(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 times(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline androidx.ui.graphics.vectormath.Vector2 transform(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public operator androidx.ui.graphics.vectormath.Vector2 unaryMinus();
+    property public final inline float g;
+    property public final inline float r;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 rg;
+    property public final inline float s;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 st;
+    property public final inline float t;
+    property public final inline java.util.List<java.lang.Float> v2storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 xy;
+  }
+
+  public final class Vector3 {
+    ctor public Vector3(float x, float y, float z);
+    ctor public Vector3();
+    ctor public Vector3(androidx.ui.graphics.vectormath.Vector2 v, float z);
+    ctor public Vector3(androidx.ui.graphics.vectormath.Vector3 v);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public androidx.ui.graphics.vectormath.Vector3 copy(float x, float y, float z);
+    method public operator androidx.ui.graphics.vectormath.Vector3 dec();
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 div(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 div(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 div(androidx.ui.graphics.vectormath.Vector3 v);
+    method public operator float get(androidx.ui.graphics.vectormath.VectorComponent index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3);
+    method public operator float get(int index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(int index1, int index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(int index1, int index2, int index3);
+    method public inline float getB();
+    method public inline float getG();
+    method public inline float getP();
+    method public inline float getR();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getRg();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getRgb();
+    method public inline float getS();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getSt();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getStp();
+    method public inline float getT();
+    method public inline java.util.List<java.lang.Float> getV3storage();
+    method public float getX();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getXy();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getXyz();
+    method public float getY();
+    method public float getZ();
+    method public operator androidx.ui.graphics.vectormath.Vector3 inc();
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 minus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 minus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 minus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 plus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 plus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 plus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public operator void set(int index, float v);
+    method public operator void set(int index1, int index2, float v);
+    method public operator void set(int index1, int index2, int index3, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, float v);
+    method public inline void setB(float value);
+    method public inline void setG(float value);
+    method public inline void setP(float value);
+    method public inline void setR(float value);
+    method public inline void setRg(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setRgb(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setS(float value);
+    method public inline void setSt(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setStp(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setT(float value);
+    method public void setX(float p);
+    method public inline void setXy(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setXyz(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setY(float p);
+    method public void setZ(float p);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 times(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 times(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 times(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline androidx.ui.graphics.vectormath.Vector3 transform(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public operator androidx.ui.graphics.vectormath.Vector3 unaryMinus();
+    property public final inline float b;
+    property public final inline float g;
+    property public final inline float p;
+    property public final inline float r;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 rg;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 rgb;
+    property public final inline float s;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 st;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 stp;
+    property public final inline float t;
+    property public final inline java.util.List<java.lang.Float> v3storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 xy;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 xyz;
+  }
+
+  public final class Vector4 {
+    ctor public Vector4(float x, float y, float z, float w);
+    ctor public Vector4();
+    ctor public Vector4(androidx.ui.graphics.vectormath.Vector2 v, float z, float w);
+    ctor public Vector4(androidx.ui.graphics.vectormath.Vector3 v, float w);
+    ctor public Vector4(androidx.ui.graphics.vectormath.Vector4 v);
+    method public void assignFromStorage(java.util.List<java.lang.Float> storage);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public androidx.ui.graphics.vectormath.Vector4 copy(float x, float y, float z, float w);
+    method public operator androidx.ui.graphics.vectormath.Vector4 dec();
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator float get(androidx.ui.graphics.vectormath.VectorComponent index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, androidx.ui.graphics.vectormath.VectorComponent index4);
+    method public operator float get(int index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(int index1, int index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(int index1, int index2, int index3);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(int index1, int index2, int index3, int index4);
+    method public inline float getA();
+    method public inline float getB();
+    method public inline float getG();
+    method public inline float getP();
+    method public inline float getQ();
+    method public inline float getR();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getRg();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getRgb();
+    method public inline androidx.ui.graphics.vectormath.Vector4 getRgba();
+    method public inline float getS();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getSt();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getStp();
+    method public inline androidx.ui.graphics.vectormath.Vector4 getStpq();
+    method public inline float getT();
+    method public inline java.util.List<java.lang.Float> getV4storage();
+    method public float getW();
+    method public float getX();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getXy();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getXyz();
+    method public inline androidx.ui.graphics.vectormath.Vector4 getXyzw();
+    method public float getY();
+    method public float getZ();
+    method public operator androidx.ui.graphics.vectormath.Vector4 inc();
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(androidx.ui.graphics.vectormath.Vector4 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator void set(int index, float v);
+    method public operator void set(int index1, int index2, float v);
+    method public operator void set(int index1, int index2, int index3, float v);
+    method public operator void set(int index1, int index2, int index3, int index4, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, androidx.ui.graphics.vectormath.VectorComponent index4, float v);
+    method public inline void setA(float value);
+    method public inline void setB(float value);
+    method public inline void setG(float value);
+    method public inline void setP(float value);
+    method public inline void setQ(float value);
+    method public inline void setR(float value);
+    method public inline void setRg(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setRgb(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setRgba(androidx.ui.graphics.vectormath.Vector4 value);
+    method public inline void setS(float value);
+    method public inline void setSt(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setStp(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setStpq(androidx.ui.graphics.vectormath.Vector4 value);
+    method public inline void setT(float value);
+    method public void setW(float p);
+    method public void setX(float p);
+    method public inline void setXy(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setXyz(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setXyzw(androidx.ui.graphics.vectormath.Vector4 value);
+    method public void setY(float p);
+    method public void setZ(float p);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector4 v);
+    method public inline androidx.ui.graphics.vectormath.Vector4 transform(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public operator androidx.ui.graphics.vectormath.Vector4 unaryMinus();
+    property public final inline float a;
+    property public final inline float b;
+    property public final inline float g;
+    property public final inline float p;
+    property public final inline float q;
+    property public final inline float r;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 rg;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 rgb;
+    property public final inline androidx.ui.graphics.vectormath.Vector4 rgba;
+    property public final inline float s;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 st;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 stp;
+    property public final inline androidx.ui.graphics.vectormath.Vector4 stpq;
+    property public final inline float t;
+    property public final inline java.util.List<java.lang.Float> v4storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 xy;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 xyz;
+    property public final inline androidx.ui.graphics.vectormath.Vector4 xyzw;
+  }
+
+  public enum VectorComponent {
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent A;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent B;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent G;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent P;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent Q;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent R;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent S;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent T;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent W;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent X;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent Y;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent Z;
+  }
+
+  public final class VectorExtensionsKt {
+    method public static inline androidx.ui.graphics.vectormath.Vector2 abs(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 abs(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 abs(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 coerceIn(androidx.ui.graphics.vectormath.Vector2, float min, float max);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 coerceIn(androidx.ui.graphics.vectormath.Vector2, androidx.ui.graphics.vectormath.Vector2 min, androidx.ui.graphics.vectormath.Vector2 max);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 coerceIn(androidx.ui.graphics.vectormath.Vector3, float min, float max);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 coerceIn(androidx.ui.graphics.vectormath.Vector3, androidx.ui.graphics.vectormath.Vector3 min, androidx.ui.graphics.vectormath.Vector3 max);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 coerceIn(androidx.ui.graphics.vectormath.Vector4, float min, float max);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 coerceIn(androidx.ui.graphics.vectormath.Vector4, androidx.ui.graphics.vectormath.Vector4 min, androidx.ui.graphics.vectormath.Vector4 max);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 cross(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float distance(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float distance(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float distance(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 div(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 div(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 div(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline float dot(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float dot(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float dot(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline float length(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline float length(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline float length(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline float length2(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline float length2(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline float length2(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline float max(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 max(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float max(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 max(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float max(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 max(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline float min(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 min(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float min(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 min(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float min(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 min(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 minus(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 minus(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 minus(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static androidx.ui.graphics.vectormath.Vector2 normalize(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static androidx.ui.graphics.vectormath.Vector3 normalize(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static androidx.ui.graphics.vectormath.Vector4 normalize(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 plus(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 plus(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 plus(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 reflect(androidx.ui.graphics.vectormath.Vector2 i, androidx.ui.graphics.vectormath.Vector2 n);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 reflect(androidx.ui.graphics.vectormath.Vector3 i, androidx.ui.graphics.vectormath.Vector3 n);
+    method public static androidx.ui.graphics.vectormath.Vector2 refract(androidx.ui.graphics.vectormath.Vector2 i, androidx.ui.graphics.vectormath.Vector2 n, float eta);
+    method public static androidx.ui.graphics.vectormath.Vector3 refract(androidx.ui.graphics.vectormath.Vector3 i, androidx.ui.graphics.vectormath.Vector3 n, float eta);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 times(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 times(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 times(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 transform(androidx.ui.graphics.vectormath.Vector2 v, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 transform(androidx.ui.graphics.vectormath.Vector3 v, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 transform(androidx.ui.graphics.vectormath.Vector4 v, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public static inline infix androidx.ui.graphics.vectormath.Vector3 x(androidx.ui.graphics.vectormath.Vector3, androidx.ui.graphics.vectormath.Vector3 v);
+  }
+
+}
+
diff --git a/ui/ui-graphics/api/public_plus_experimental_current.txt b/ui/ui-graphics/api/public_plus_experimental_current.txt
index 1f3ff55..a4896944 100644
--- a/ui/ui-graphics/api/public_plus_experimental_current.txt
+++ b/ui/ui-graphics/api/public_plus_experimental_current.txt
@@ -95,13 +95,6 @@
     enum_constant public static final androidx.ui.graphics.BlendMode xor;
   }
 
-  public enum BlurStyle {
-    enum_constant public static final androidx.ui.graphics.BlurStyle inner;
-    enum_constant public static final androidx.ui.graphics.BlurStyle normal;
-    enum_constant public static final androidx.ui.graphics.BlurStyle outer;
-    enum_constant public static final androidx.ui.graphics.BlurStyle solid;
-  }
-
   public interface Brush {
     method public void applyTo(androidx.ui.graphics.Paint p);
   }
@@ -278,21 +271,6 @@
     method public androidx.ui.graphics.LinearGradient copy-OCut9AY(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode);
   }
 
-  public final class MaskFilter {
-    ctor public MaskFilter(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public androidx.ui.graphics.BlurStyle component1();
-    method public float component2();
-    method public androidx.ui.graphics.MaskFilter copy(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public float getSigma();
-    method public androidx.ui.graphics.BlurStyle getStyle();
-    field public static final androidx.ui.graphics.MaskFilter.Companion! Companion;
-    field public static final int TYPE_BLUR = 1; // 0x1
-    field public static final int TYPE_NONE = 0; // 0x0
-  }
-
-  public static final class MaskFilter.Companion {
-  }
-
   public abstract sealed class Outline {
   }
 
@@ -330,7 +308,6 @@
     method public long getColor();
     method public androidx.ui.graphics.ColorFilter? getColorFilter();
     method public androidx.ui.graphics.FilterQuality getFilterQuality();
-    method public androidx.ui.graphics.MaskFilter getMaskFilter();
     method public android.graphics.Shader? getShader();
     method public androidx.ui.graphics.StrokeCap getStrokeCap();
     method public androidx.ui.graphics.StrokeJoin getStrokeJoin();
@@ -344,7 +321,6 @@
     method public void setColor-QEYXlZo(long color);
     method public void setColorFilter(androidx.ui.graphics.ColorFilter? value);
     method public void setFilterQuality(androidx.ui.graphics.FilterQuality value);
-    method public void setMaskFilter(androidx.ui.graphics.MaskFilter value);
     method public void setShader-DcPGf4I(android.graphics.Shader? value);
     method public void setStrokeCap(androidx.ui.graphics.StrokeCap value);
     method public void setStrokeJoin(androidx.ui.graphics.StrokeJoin value);
@@ -357,7 +333,6 @@
     property public final androidx.ui.graphics.ColorFilter? colorFilter;
     property public final androidx.ui.graphics.FilterQuality filterQuality;
     property public final boolean isAntiAlias;
-    property public final androidx.ui.graphics.MaskFilter maskFilter;
     property public final android.graphics.Shader? shader;
     property public final androidx.ui.graphics.StrokeCap strokeCap;
     property public final androidx.ui.graphics.StrokeJoin strokeJoin;
@@ -458,6 +433,10 @@
     method public androidx.ui.graphics.RadialGradient copy(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode);
   }
 
+  public final class RectangleShapeKt {
+    method public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
   public final inline class Shader {
     ctor public Shader();
     method public static android.graphics.Shader! constructor-impl(android.graphics.Shader nativeShader);
diff --git a/ui/ui-graphics/api/res-0.1.0-dev11.txt b/ui/ui-graphics/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-graphics/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-graphics/api/restricted_0.1.0-dev10.txt b/ui/ui-graphics/api/restricted_0.1.0-dev10.txt
index 1f3ff55..a4896944 100644
--- a/ui/ui-graphics/api/restricted_0.1.0-dev10.txt
+++ b/ui/ui-graphics/api/restricted_0.1.0-dev10.txt
@@ -95,13 +95,6 @@
     enum_constant public static final androidx.ui.graphics.BlendMode xor;
   }
 
-  public enum BlurStyle {
-    enum_constant public static final androidx.ui.graphics.BlurStyle inner;
-    enum_constant public static final androidx.ui.graphics.BlurStyle normal;
-    enum_constant public static final androidx.ui.graphics.BlurStyle outer;
-    enum_constant public static final androidx.ui.graphics.BlurStyle solid;
-  }
-
   public interface Brush {
     method public void applyTo(androidx.ui.graphics.Paint p);
   }
@@ -278,21 +271,6 @@
     method public androidx.ui.graphics.LinearGradient copy-OCut9AY(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode);
   }
 
-  public final class MaskFilter {
-    ctor public MaskFilter(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public androidx.ui.graphics.BlurStyle component1();
-    method public float component2();
-    method public androidx.ui.graphics.MaskFilter copy(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public float getSigma();
-    method public androidx.ui.graphics.BlurStyle getStyle();
-    field public static final androidx.ui.graphics.MaskFilter.Companion! Companion;
-    field public static final int TYPE_BLUR = 1; // 0x1
-    field public static final int TYPE_NONE = 0; // 0x0
-  }
-
-  public static final class MaskFilter.Companion {
-  }
-
   public abstract sealed class Outline {
   }
 
@@ -330,7 +308,6 @@
     method public long getColor();
     method public androidx.ui.graphics.ColorFilter? getColorFilter();
     method public androidx.ui.graphics.FilterQuality getFilterQuality();
-    method public androidx.ui.graphics.MaskFilter getMaskFilter();
     method public android.graphics.Shader? getShader();
     method public androidx.ui.graphics.StrokeCap getStrokeCap();
     method public androidx.ui.graphics.StrokeJoin getStrokeJoin();
@@ -344,7 +321,6 @@
     method public void setColor-QEYXlZo(long color);
     method public void setColorFilter(androidx.ui.graphics.ColorFilter? value);
     method public void setFilterQuality(androidx.ui.graphics.FilterQuality value);
-    method public void setMaskFilter(androidx.ui.graphics.MaskFilter value);
     method public void setShader-DcPGf4I(android.graphics.Shader? value);
     method public void setStrokeCap(androidx.ui.graphics.StrokeCap value);
     method public void setStrokeJoin(androidx.ui.graphics.StrokeJoin value);
@@ -357,7 +333,6 @@
     property public final androidx.ui.graphics.ColorFilter? colorFilter;
     property public final androidx.ui.graphics.FilterQuality filterQuality;
     property public final boolean isAntiAlias;
-    property public final androidx.ui.graphics.MaskFilter maskFilter;
     property public final android.graphics.Shader? shader;
     property public final androidx.ui.graphics.StrokeCap strokeCap;
     property public final androidx.ui.graphics.StrokeJoin strokeJoin;
@@ -458,6 +433,10 @@
     method public androidx.ui.graphics.RadialGradient copy(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode);
   }
 
+  public final class RectangleShapeKt {
+    method public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
   public final inline class Shader {
     ctor public Shader();
     method public static android.graphics.Shader! constructor-impl(android.graphics.Shader nativeShader);
diff --git a/ui/ui-graphics/api/restricted_0.1.0-dev11.txt b/ui/ui-graphics/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..a4896944
--- /dev/null
+++ b/ui/ui-graphics/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,1515 @@
+// Signature format: 3.0
+package androidx.ui.core {
+
+  public final class RectHelperKt {
+    method public static android.graphics.Rect toAndroidRect(androidx.ui.geometry.Rect);
+    method public static android.graphics.RectF toAndroidRectF(androidx.ui.geometry.Rect);
+  }
+
+}
+
+package androidx.ui.graphics {
+
+  public final class AndroidCanvasKt {
+    method public static androidx.ui.graphics.Canvas Canvas(androidx.ui.graphics.ImageAsset image);
+    method public static androidx.ui.graphics.Canvas Canvas(androidx.ui.graphics.PictureRecorder recorder, androidx.ui.geometry.Rect cullRect = Rect.largest);
+    method public static androidx.ui.graphics.Canvas Canvas(android.graphics.Canvas c);
+  }
+
+  public final class AndroidImageAssetKt {
+    method public static androidx.ui.graphics.ImageAsset ImageAsset(int width, int height, androidx.ui.graphics.ImageAssetConfig config = androidx.ui.graphics.ImageAssetConfig.Argb8888, boolean hasAlpha = true, androidx.ui.graphics.colorspace.ColorSpace colorSpace = ColorSpaces.Srgb);
+    method public static android.graphics.Bitmap asAndroidBitmap(androidx.ui.graphics.ImageAsset);
+    method public static androidx.ui.graphics.ImageAsset asImageAsset(android.graphics.Bitmap);
+    method public static androidx.ui.graphics.ImageAsset imageFromResource(android.content.res.Resources res, int resId);
+  }
+
+  public final class AndroidPath implements androidx.ui.graphics.Path {
+    ctor public AndroidPath(android.graphics.Path internalPath);
+    ctor public AndroidPath();
+    method public void addArc(androidx.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.ui.geometry.Rect oval);
+    method public void addPath(androidx.ui.graphics.Path path, androidx.ui.geometry.Offset offset);
+    method public void addRRect(androidx.ui.geometry.RRect rrect);
+    method public void addRect(androidx.ui.geometry.Rect rect);
+    method public void arcTo(androidx.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.ui.geometry.Rect getBounds();
+    method public androidx.ui.graphics.PathFillType getFillType();
+    method public android.graphics.Path getInternalPath();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float dx, float dy);
+    method public void moveTo(float dx, float dy);
+    method public boolean op(androidx.ui.graphics.Path path1, androidx.ui.graphics.Path path2, androidx.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void reset();
+    method public void setFillType(androidx.ui.graphics.PathFillType value);
+    method public void shift(androidx.ui.geometry.Offset offset);
+    property public androidx.ui.graphics.PathFillType fillType;
+    property public boolean isConvex;
+    property public boolean isEmpty;
+  }
+
+  public final class AndroidPathKt {
+    method public static androidx.ui.graphics.Path Path();
+    method public static inline android.graphics.Path asAndroidPath(androidx.ui.graphics.Path);
+    method public static androidx.ui.graphics.Path asComposePath(android.graphics.Path);
+  }
+
+  public enum BlendMode {
+    method public final android.graphics.PorterDuff.Mode toPorterDuffMode();
+    enum_constant public static final androidx.ui.graphics.BlendMode clear;
+    enum_constant public static final androidx.ui.graphics.BlendMode color;
+    enum_constant public static final androidx.ui.graphics.BlendMode colorBurn;
+    enum_constant public static final androidx.ui.graphics.BlendMode colorDodge;
+    enum_constant public static final androidx.ui.graphics.BlendMode darken;
+    enum_constant public static final androidx.ui.graphics.BlendMode difference;
+    enum_constant public static final androidx.ui.graphics.BlendMode dst;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstATop;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstIn;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstOut;
+    enum_constant public static final androidx.ui.graphics.BlendMode dstOver;
+    enum_constant public static final androidx.ui.graphics.BlendMode exclusion;
+    enum_constant public static final androidx.ui.graphics.BlendMode hardLight;
+    enum_constant public static final androidx.ui.graphics.BlendMode hue;
+    enum_constant public static final androidx.ui.graphics.BlendMode lighten;
+    enum_constant public static final androidx.ui.graphics.BlendMode luminosity;
+    enum_constant public static final androidx.ui.graphics.BlendMode modulate;
+    enum_constant public static final androidx.ui.graphics.BlendMode multiply;
+    enum_constant public static final androidx.ui.graphics.BlendMode overlay;
+    enum_constant public static final androidx.ui.graphics.BlendMode plus;
+    enum_constant public static final androidx.ui.graphics.BlendMode saturation;
+    enum_constant public static final androidx.ui.graphics.BlendMode screen;
+    enum_constant public static final androidx.ui.graphics.BlendMode softLight;
+    enum_constant public static final androidx.ui.graphics.BlendMode src;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcATop;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcIn;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcOut;
+    enum_constant public static final androidx.ui.graphics.BlendMode srcOver;
+    enum_constant public static final androidx.ui.graphics.BlendMode xor;
+  }
+
+  public interface Brush {
+    method public void applyTo(androidx.ui.graphics.Paint p);
+  }
+
+  public final class BrushKt {
+    method public static androidx.ui.graphics.Brush HorizontalGradient-G0qqrXo(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float startX, float endX, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient HorizontalGradient-vcfwFIc(java.util.List<androidx.ui.graphics.Color> colors, float startX, float endX, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient LinearGradient-39rnqCc(java.util.List<androidx.ui.graphics.Color> colors, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient LinearGradient-gbNZAbE(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.RadialGradient RadialGradient(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.RadialGradient RadialGradient(java.util.List<androidx.ui.graphics.Color> colors, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient VerticalGradient-G0qqrXo(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>![] colorStops, float startY, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static androidx.ui.graphics.LinearGradient VerticalGradient-vcfwFIc(java.util.List<androidx.ui.graphics.Color> colors, float startY, float endY, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+  }
+
+  public interface Canvas {
+    method public void clipPath(androidx.ui.graphics.Path path);
+    method public void clipRRect(androidx.ui.geometry.RRect rrect);
+    method public void clipRect(androidx.ui.geometry.Rect rect, androidx.ui.graphics.ClipOp clipOp = androidx.ui.graphics.ClipOp.intersect);
+    method public void concat(androidx.ui.graphics.vectormath.Matrix4 matrix4);
+    method public void disableZ();
+    method public void drawArc(androidx.ui.geometry.Rect rect, float startAngle, float sweepAngle, boolean useCenter, androidx.ui.graphics.Paint paint);
+    method public default void drawArcRad(androidx.ui.geometry.Rect rect, float startAngleRad, float sweepAngleRad, boolean useCenter, androidx.ui.graphics.Paint paint);
+    method public void drawCircle(androidx.ui.geometry.Offset center, float radius, androidx.ui.graphics.Paint paint);
+    method public void drawImage(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Offset topLeftOffset, androidx.ui.graphics.Paint paint);
+    method public void drawImageRect(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Rect? src, androidx.ui.geometry.Rect dst, androidx.ui.graphics.Paint paint);
+    method public void drawLine(androidx.ui.geometry.Offset p1, androidx.ui.geometry.Offset p2, androidx.ui.graphics.Paint paint);
+    method public void drawOval(androidx.ui.geometry.Rect rect, androidx.ui.graphics.Paint paint);
+    method public void drawPath(androidx.ui.graphics.Path path, androidx.ui.graphics.Paint paint);
+    method public void drawPicture(androidx.ui.graphics.Picture picture);
+    method public void drawPoints(androidx.ui.graphics.PointMode pointMode, java.util.List<androidx.ui.geometry.Offset> points, androidx.ui.graphics.Paint paint);
+    method public void drawRawPoints(androidx.ui.graphics.PointMode pointMode, float[] points, androidx.ui.graphics.Paint paint);
+    method public void drawRect(androidx.ui.geometry.Rect rect, androidx.ui.graphics.Paint paint);
+    method public void drawRoundRect(float left, float top, float right, float bottom, float radiusX, float radiusY, androidx.ui.graphics.Paint paint);
+    method public void drawVertices(androidx.ui.graphics.Vertices vertices, androidx.ui.graphics.BlendMode blendMode, androidx.ui.graphics.Paint paint);
+    method public void enableZ();
+    method public android.graphics.Canvas getNativeCanvas();
+    method public void restore();
+    method public void rotate(float degrees);
+    method public void save();
+    method public void saveLayer(androidx.ui.geometry.Rect bounds, androidx.ui.graphics.Paint paint);
+    method public void scale(float sx, float sy = sx);
+    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);
+    property public abstract android.graphics.Canvas nativeCanvas;
+  }
+
+  public final class CanvasKt {
+    method public static void rotate(androidx.ui.graphics.Canvas, float degrees, float pivotX, float pivotY);
+    method public static void rotateRad(androidx.ui.graphics.Canvas, float radians, float pivotX = 0.0f, float pivotY = 0.0f);
+    method public static void scale(androidx.ui.graphics.Canvas, float sx, float sy = sx, float pivotX, float pivotY);
+    method public static inline void withSave(androidx.ui.graphics.Canvas, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public static inline void withSaveLayer(androidx.ui.graphics.Canvas, androidx.ui.geometry.Rect bounds, androidx.ui.graphics.Paint paint, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public enum ClipOp {
+    enum_constant public static final androidx.ui.graphics.ClipOp difference;
+    enum_constant public static final androidx.ui.graphics.ClipOp intersect;
+  }
+
+  public final inline class Color {
+    ctor public Color();
+    method public static long constructor-impl(long value);
+    method public static long convert-impl(long $this, androidx.ui.graphics.colorspace.ColorSpace colorSpace);
+    method public static long copy-impl(long $this, float alpha = this.alpha, float red = this.red, float green = this.green, float blue = this.blue);
+    method public static 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.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();
+    method public static int hashCode-impl(long p);
+    method public static String toString-impl(long $this);
+    field public static final androidx.ui.graphics.Color.Companion! Companion;
+  }
+
+  public static final class Color.Companion {
+    method public long getBlack();
+    method public long getBlue();
+    method public long getCyan();
+    method public long getDarkGray();
+    method public long getGray();
+    method public long getGreen();
+    method public long getLightGray();
+    method public long getMagenta();
+    method public long getRed();
+    method public long getTransparent();
+    method public long getUnset();
+    method public long getWhite();
+    method public long getYellow();
+    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 Unset;
+    property public final long White;
+    property public final long Yellow;
+  }
+
+  public final class ColorFilter {
+    method public long component1();
+    method public androidx.ui.graphics.BlendMode component2();
+    method public androidx.ui.graphics.ColorFilter copy-vOa7YyA(long color, androidx.ui.graphics.BlendMode blendMode);
+    method public androidx.ui.graphics.BlendMode getBlendMode();
+    method public long getColor();
+    field public static final androidx.ui.graphics.ColorFilter.Companion! Companion;
+  }
+
+  public static final class ColorFilter.Companion {
+    method public androidx.ui.graphics.ColorFilter tint-QEYXlZo(long color);
+  }
+
+  public final class ColorKt {
+    method public static long Color(float red, float green, float blue, float alpha = 1f, androidx.ui.graphics.colorspace.ColorSpace colorSpace = ColorSpaces.Srgb);
+    method public static long Color(@ColorInt int color);
+    method public static long Color(long color);
+    method public static long Color(@IntRange(from=0, to=255) int red, @IntRange(from=0, to=255) int green, @IntRange(from=0, to=255) int blue, @IntRange(from=0, to=255) int alpha = 0xFF);
+    method public static long compositeOver-MsF30Tg(long, long background);
+    method public static inline boolean isSet-QEYXlZo(long);
+    method public static inline boolean isUnset-QEYXlZo(long);
+    method public static long lerp-hhXNEtA(long start, long stop, @FloatRange(from=0.0, to=1.0) float fraction);
+    method public static float luminance-QEYXlZo(long);
+    method @ColorInt public static int toArgb-QEYXlZo(long);
+    method public static inline long useOrElse-4UtWFt0(long, kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> block);
+  }
+
+  public enum FilterQuality {
+    enum_constant public static final androidx.ui.graphics.FilterQuality high;
+    enum_constant public static final androidx.ui.graphics.FilterQuality low;
+    enum_constant public static final androidx.ui.graphics.FilterQuality medium;
+    enum_constant public static final androidx.ui.graphics.FilterQuality none;
+  }
+
+  public final class Float16Kt {
+  }
+
+  public interface ImageAsset {
+    method public androidx.ui.graphics.colorspace.ColorSpace getColorSpace();
+    method public androidx.ui.graphics.ImageAssetConfig getConfig();
+    method public boolean getHasAlpha();
+    method public int getHeight();
+    method public int getWidth();
+    method public void prepareToDraw();
+    method public void readPixels(int[] buffer, int startX = 0, int startY = 0, int width = this.width, int height = this.height, int bufferOffset = 0, int stride = width);
+    property public abstract androidx.ui.graphics.colorspace.ColorSpace colorSpace;
+    property public abstract androidx.ui.graphics.ImageAssetConfig config;
+    property public abstract boolean hasAlpha;
+    property public abstract int height;
+    property public abstract int width;
+  }
+
+  public enum ImageAssetConfig {
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Alpha8;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Argb8888;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig F16;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Gpu;
+    enum_constant public static final androidx.ui.graphics.ImageAssetConfig Rgb565;
+  }
+
+  public final class ImageAssetKt {
+    method public static androidx.ui.graphics.PixelMap toPixelMap(androidx.ui.graphics.ImageAsset, int startX = 0, int startY = 0, int width = this.width, int height = this.height, int[] buffer = null(width * height), int bufferOffset = 0, int stride = width);
+  }
+
+  public final class LinearGradient extends androidx.ui.graphics.ShaderBrush {
+    method public androidx.ui.graphics.LinearGradient copy-OCut9AY(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode);
+  }
+
+  public abstract sealed class Outline {
+  }
+
+  public static final class Outline.Generic extends androidx.ui.graphics.Outline {
+    ctor public Outline.Generic(androidx.ui.graphics.Path path);
+    method public androidx.ui.graphics.Path component1();
+    method public androidx.ui.graphics.Outline.Generic copy(androidx.ui.graphics.Path path);
+    method public androidx.ui.graphics.Path getPath();
+  }
+
+  public static final class Outline.Rectangle extends androidx.ui.graphics.Outline {
+    ctor public Outline.Rectangle(androidx.ui.geometry.Rect rect);
+    method public androidx.ui.geometry.Rect component1();
+    method public androidx.ui.graphics.Outline.Rectangle copy(androidx.ui.geometry.Rect rect);
+    method public androidx.ui.geometry.Rect getRect();
+  }
+
+  public static final class Outline.Rounded extends androidx.ui.graphics.Outline {
+    ctor public Outline.Rounded(androidx.ui.geometry.RRect rrect);
+    method public androidx.ui.geometry.RRect component1();
+    method public androidx.ui.graphics.Outline.Rounded copy(androidx.ui.geometry.RRect rrect);
+    method public androidx.ui.geometry.RRect getRrect();
+  }
+
+  public final class OutlineKt {
+    method public static void addOutline(androidx.ui.graphics.Path, androidx.ui.graphics.Outline outline);
+    method public static void drawOutline(androidx.ui.graphics.Canvas, androidx.ui.graphics.Outline outline, androidx.ui.graphics.Paint paint);
+  }
+
+  public final class Paint {
+    ctor public Paint();
+    method public android.graphics.Paint asFrameworkPaint();
+    method public float getAlpha();
+    method public androidx.ui.graphics.BlendMode getBlendMode();
+    method public long getColor();
+    method public androidx.ui.graphics.ColorFilter? getColorFilter();
+    method public androidx.ui.graphics.FilterQuality getFilterQuality();
+    method public android.graphics.Shader? getShader();
+    method public androidx.ui.graphics.StrokeCap getStrokeCap();
+    method public androidx.ui.graphics.StrokeJoin getStrokeJoin();
+    method public float getStrokeMiterLimit();
+    method public float getStrokeWidth();
+    method public androidx.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.ui.graphics.BlendMode value);
+    method public void setColor-QEYXlZo(long color);
+    method public void setColorFilter(androidx.ui.graphics.ColorFilter? value);
+    method public void setFilterQuality(androidx.ui.graphics.FilterQuality value);
+    method public void setShader-DcPGf4I(android.graphics.Shader? value);
+    method public void setStrokeCap(androidx.ui.graphics.StrokeCap value);
+    method public void setStrokeJoin(androidx.ui.graphics.StrokeJoin value);
+    method public void setStrokeMiterLimit(float value);
+    method public void setStrokeWidth(float value);
+    method public void setStyle(androidx.ui.graphics.PaintingStyle value);
+    property public final float alpha;
+    property public final androidx.ui.graphics.BlendMode blendMode;
+    property public final long color;
+    property public final androidx.ui.graphics.ColorFilter? colorFilter;
+    property public final androidx.ui.graphics.FilterQuality filterQuality;
+    property public final boolean isAntiAlias;
+    property public final android.graphics.Shader? shader;
+    property public final androidx.ui.graphics.StrokeCap strokeCap;
+    property public final androidx.ui.graphics.StrokeJoin strokeJoin;
+    property public final float strokeMiterLimit;
+    property public final float strokeWidth;
+    property public final androidx.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.ui.graphics.PaintingStyle fill;
+    enum_constant public static final androidx.ui.graphics.PaintingStyle stroke;
+  }
+
+  public interface Path {
+    method public void addArc(androidx.ui.geometry.Rect oval, float startAngleDegrees, float sweepAngleDegrees);
+    method public void addArcRad(androidx.ui.geometry.Rect oval, float startAngleRadians, float sweepAngleRadians);
+    method public void addOval(androidx.ui.geometry.Rect oval);
+    method public void addPath(androidx.ui.graphics.Path path, androidx.ui.geometry.Offset offset = Offset.zero);
+    method public void addRRect(androidx.ui.geometry.RRect rrect);
+    method public void addRect(androidx.ui.geometry.Rect rect);
+    method public void arcTo(androidx.ui.geometry.Rect rect, float startAngleDegrees, float sweepAngleDegrees, boolean forceMoveTo);
+    method public default void arcToRad(androidx.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.ui.geometry.Rect getBounds();
+    method public androidx.ui.graphics.PathFillType getFillType();
+    method public boolean isConvex();
+    method public boolean isEmpty();
+    method public void lineTo(float dx, float dy);
+    method public void moveTo(float dx, float dy);
+    method public boolean op(androidx.ui.graphics.Path path1, androidx.ui.graphics.Path path2, androidx.ui.graphics.PathOperation operation);
+    method public void quadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void relativeCubicTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public void relativeLineTo(float dx, float dy);
+    method public void relativeMoveTo(float dx, float dy);
+    method public void relativeQuadraticBezierTo(float x1, float y1, float x2, float y2);
+    method public void reset();
+    method public void setFillType(androidx.ui.graphics.PathFillType p);
+    method public void shift(androidx.ui.geometry.Offset offset);
+    property public abstract androidx.ui.graphics.PathFillType fillType;
+    property public abstract boolean isConvex;
+    property public abstract boolean isEmpty;
+    field public static final androidx.ui.graphics.Path.Companion! Companion;
+  }
+
+  public static final class Path.Companion {
+    method public androidx.ui.graphics.Path combine(androidx.ui.graphics.PathOperation operation, androidx.ui.graphics.Path path1, androidx.ui.graphics.Path path2);
+  }
+
+  public enum PathFillType {
+    enum_constant public static final androidx.ui.graphics.PathFillType evenOdd;
+    enum_constant public static final androidx.ui.graphics.PathFillType nonZero;
+  }
+
+  public enum PathOperation {
+    enum_constant public static final androidx.ui.graphics.PathOperation difference;
+    enum_constant public static final androidx.ui.graphics.PathOperation intersect;
+    enum_constant public static final androidx.ui.graphics.PathOperation reverseDifference;
+    enum_constant public static final androidx.ui.graphics.PathOperation union;
+    enum_constant public static final androidx.ui.graphics.PathOperation xor;
+  }
+
+  public final class Picture {
+    ctor public Picture(android.graphics.Picture frameworkPicture);
+    method public androidx.ui.geometry.Rect cullRect();
+    method public void dispose();
+    method public android.graphics.Picture getFrameworkPicture();
+  }
+
+  public final class PictureRecorder {
+    ctor public PictureRecorder();
+    method public androidx.ui.graphics.Picture endRecording();
+    method public boolean isRecording();
+    property public final boolean isRecording;
+  }
+
+  public final class PixelMap {
+    ctor public PixelMap(int[] buffer, int width, int height, int bufferOffset, int stride);
+    method public operator long get(@IntRange(from=0) int x, @IntRange(from=0) int y);
+    method public int[] getBuffer();
+    method public int getBufferOffset();
+    method public int getHeight();
+    method public int getStride();
+    method public int getWidth();
+  }
+
+  public enum PointMode {
+    enum_constant public static final androidx.ui.graphics.PointMode lines;
+    enum_constant public static final androidx.ui.graphics.PointMode points;
+    enum_constant public static final androidx.ui.graphics.PointMode polygon;
+  }
+
+  public final class RadialGradient extends androidx.ui.graphics.ShaderBrush {
+    method public androidx.ui.graphics.RadialGradient copy(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode);
+  }
+
+  public final class RectangleShapeKt {
+    method public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
+  public final inline class Shader {
+    ctor public Shader();
+    method public static android.graphics.Shader! constructor-impl(android.graphics.Shader nativeShader);
+    method public static boolean equals-impl(android.graphics.Shader! p, Object? p1);
+    method public static boolean equals-impl0(android.graphics.Shader p1, android.graphics.Shader p2);
+    method public android.graphics.Shader getNativeShader();
+    method public static int hashCode-impl(android.graphics.Shader! p);
+    method public static String toString-impl(android.graphics.Shader! p);
+  }
+
+  public class ShaderBrush implements androidx.ui.graphics.Brush {
+    method public void applyTo(androidx.ui.graphics.Paint p);
+    method public final android.graphics.Shader getShader();
+  }
+
+  public final class ShaderKt {
+    method public static android.graphics.Shader ImageShader(androidx.ui.graphics.ImageAsset image, androidx.ui.graphics.TileMode tileModeX = androidx.ui.graphics.TileMode.Clamp, androidx.ui.graphics.TileMode tileModeY = androidx.ui.graphics.TileMode.Clamp);
+    method public static android.graphics.Shader LinearGradientShader(androidx.ui.geometry.Offset from, androidx.ui.geometry.Offset to, java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? colorStops = null, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+    method public static android.graphics.Shader RadialGradientShader(androidx.ui.geometry.Offset center, float radius, java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? colorStops = null, androidx.ui.graphics.TileMode tileMode = androidx.ui.graphics.TileMode.Clamp);
+  }
+
+  public final class Shadow {
+    method public long component1();
+    method public androidx.ui.geometry.Offset component2();
+    method public float component3();
+    method public androidx.ui.graphics.Shadow copy-1LPazZ4(long color, androidx.ui.geometry.Offset offset, float blurRadius);
+    method public float getBlurRadius();
+    method public long getColor();
+    method public androidx.ui.geometry.Offset getOffset();
+    field public static final androidx.ui.graphics.Shadow.Companion! Companion;
+  }
+
+  public static final class Shadow.Companion {
+    method public androidx.ui.graphics.Shadow getNone();
+    property public final androidx.ui.graphics.Shadow None;
+  }
+
+  public final class ShadowKt {
+    method public static androidx.ui.graphics.Shadow lerp(androidx.ui.graphics.Shadow start, androidx.ui.graphics.Shadow stop, float fraction);
+  }
+
+  public interface Shape {
+    method public androidx.ui.graphics.Outline createOutline(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+  }
+
+  public final class SolidColor implements androidx.ui.graphics.Brush {
+    method public void applyTo(androidx.ui.graphics.Paint p);
+    method public long component1();
+    method public androidx.ui.graphics.SolidColor copy-QEYXlZo(long value);
+    method public long getValue();
+  }
+
+  public enum StrokeCap {
+    enum_constant public static final androidx.ui.graphics.StrokeCap butt;
+    enum_constant public static final androidx.ui.graphics.StrokeCap round;
+    enum_constant public static final androidx.ui.graphics.StrokeCap square;
+  }
+
+  public enum StrokeJoin {
+    enum_constant public static final androidx.ui.graphics.StrokeJoin bevel;
+    enum_constant public static final androidx.ui.graphics.StrokeJoin miter;
+    enum_constant public static final androidx.ui.graphics.StrokeJoin round;
+  }
+
+  public enum TileMode {
+    method public final android.graphics.Shader.TileMode getNativeTileMode();
+    enum_constant public static final androidx.ui.graphics.TileMode Clamp;
+    enum_constant public static final androidx.ui.graphics.TileMode Mirror;
+    enum_constant public static final androidx.ui.graphics.TileMode Repeated;
+  }
+
+  public final class TileModeKt {
+    method public static android.graphics.Shader.TileMode NativeClampTileMode();
+    method public static android.graphics.Shader.TileMode NativeMirrorTileMode();
+    method public static android.graphics.Shader.TileMode NativeRepeatedTileMode();
+  }
+
+  public enum VertexMode {
+    method public final android.graphics.Canvas.VertexMode toFrameworkVertexMode();
+    enum_constant public static final androidx.ui.graphics.VertexMode triangleFan;
+    enum_constant public static final androidx.ui.graphics.VertexMode triangleStrip;
+    enum_constant public static final androidx.ui.graphics.VertexMode triangles;
+  }
+
+  public final class Vertices {
+    ctor public Vertices(androidx.ui.graphics.VertexMode vertexMode, java.util.List<androidx.ui.geometry.Offset> positions, java.util.List<androidx.ui.geometry.Offset> textureCoordinates, java.util.List<androidx.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.ui.graphics.VertexMode getVertexMode();
+    property public final int[] colors;
+    property public final short[] indices;
+    property public final float[] positions;
+    property public final float[] textureCoordinates;
+  }
+
+}
+
+package androidx.ui.graphics.colorspace {
+
+  public enum Adaptation {
+    enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Bradford;
+    enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Ciecat02;
+    enum_constant public static final androidx.ui.graphics.colorspace.Adaptation VonKries;
+  }
+
+  public enum ColorModel {
+    method public final int getComponentCount();
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Cmyk;
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Lab;
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Rgb;
+    enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Xyz;
+  }
+
+  public abstract class ColorSpace {
+    ctor public ColorSpace(String name, androidx.ui.graphics.colorspace.ColorModel model);
+    method @Size(min=3) public final float[] fromXyz(float x, float y, float z);
+    method @Size(min=3) public abstract float[] fromXyz(@Size(min=3) float[] v);
+    method @IntRange(from=1, to=4) public final int getComponentCount();
+    method public abstract float getMaxValue(@IntRange(from=0, to=3) int component);
+    method public abstract float getMinValue(@IntRange(from=0, to=3) int component);
+    method public final androidx.ui.graphics.colorspace.ColorModel getModel();
+    method public final String getName();
+    method public boolean isSrgb();
+    method public abstract boolean isWideGamut();
+    method @Size(3) public final float[] toXyz(float r, float g, float b);
+    method @Size(min=3) public abstract float[] toXyz(@Size(min=3) float[] v);
+    property @IntRange(from=1, to=4) public final int componentCount;
+    property public boolean isSrgb;
+    property public abstract boolean isWideGamut;
+  }
+
+  public final class ColorSpaceKt {
+    method public static androidx.ui.graphics.colorspace.ColorSpace adapt(androidx.ui.graphics.colorspace.ColorSpace, androidx.ui.graphics.colorspace.WhitePoint whitePoint, androidx.ui.graphics.colorspace.Adaptation adaptation = androidx.ui.graphics.colorspace.Adaptation.Bradford);
+    method public static androidx.ui.graphics.colorspace.ColorSpace adapt(androidx.ui.graphics.colorspace.ColorSpace, androidx.ui.graphics.colorspace.WhitePoint whitePoint);
+    method public static androidx.ui.graphics.colorspace.Connector connect(androidx.ui.graphics.colorspace.ColorSpace, androidx.ui.graphics.colorspace.ColorSpace destination = ColorSpaces.Srgb, androidx.ui.graphics.colorspace.RenderIntent intent = androidx.ui.graphics.colorspace.RenderIntent.Perceptual);
+  }
+
+  public final class ColorSpaces {
+    method public androidx.ui.graphics.colorspace.Rgb getAces();
+    method public androidx.ui.graphics.colorspace.Rgb getAcescg();
+    method public androidx.ui.graphics.colorspace.Rgb getAdobeRgb();
+    method public androidx.ui.graphics.colorspace.Rgb getBt2020();
+    method public androidx.ui.graphics.colorspace.Rgb getBt709();
+    method public androidx.ui.graphics.colorspace.ColorSpace getCieLab();
+    method public androidx.ui.graphics.colorspace.ColorSpace getCieXyz();
+    method public androidx.ui.graphics.colorspace.Rgb getDciP3();
+    method public androidx.ui.graphics.colorspace.Rgb getDisplayP3();
+    method public androidx.ui.graphics.colorspace.Rgb getExtendedSrgb();
+    method public androidx.ui.graphics.colorspace.Rgb getLinearExtendedSrgb();
+    method public androidx.ui.graphics.colorspace.Rgb getLinearSrgb();
+    method public androidx.ui.graphics.colorspace.Rgb getNtsc1953();
+    method public androidx.ui.graphics.colorspace.Rgb getProPhotoRgb();
+    method public androidx.ui.graphics.colorspace.Rgb getSmpteC();
+    method public androidx.ui.graphics.colorspace.Rgb getSrgb();
+    method public androidx.ui.graphics.colorspace.ColorSpace? match(@Size(9) float[] toXYZD50, androidx.ui.graphics.colorspace.TransferParameters function);
+    property public final androidx.ui.graphics.colorspace.Rgb Aces;
+    property public final androidx.ui.graphics.colorspace.Rgb Acescg;
+    property public final androidx.ui.graphics.colorspace.Rgb AdobeRgb;
+    property public final androidx.ui.graphics.colorspace.Rgb Bt2020;
+    property public final androidx.ui.graphics.colorspace.Rgb Bt709;
+    property public final androidx.ui.graphics.colorspace.ColorSpace CieLab;
+    property public final androidx.ui.graphics.colorspace.ColorSpace CieXyz;
+    property public final androidx.ui.graphics.colorspace.Rgb DciP3;
+    property public final androidx.ui.graphics.colorspace.Rgb DisplayP3;
+    property public final androidx.ui.graphics.colorspace.Rgb ExtendedSrgb;
+    property public final androidx.ui.graphics.colorspace.Rgb LinearExtendedSrgb;
+    property public final androidx.ui.graphics.colorspace.Rgb LinearSrgb;
+    property public final androidx.ui.graphics.colorspace.Rgb Ntsc1953;
+    property public final androidx.ui.graphics.colorspace.Rgb ProPhotoRgb;
+    property public final androidx.ui.graphics.colorspace.Rgb SmpteC;
+    property public final androidx.ui.graphics.colorspace.Rgb Srgb;
+    field public static final androidx.ui.graphics.colorspace.ColorSpaces! INSTANCE;
+  }
+
+  public class Connector {
+    method public final androidx.ui.graphics.colorspace.ColorSpace getDestination();
+    method public final androidx.ui.graphics.colorspace.RenderIntent getRenderIntent();
+    method public final androidx.ui.graphics.colorspace.ColorSpace getSource();
+    method @Size(3) public final float[] transform(float r, float g, float b);
+    method @Size(min=3) public float[] transform(@Size(min=3) float[] v);
+  }
+
+  public final class Illuminant {
+    method public androidx.ui.graphics.colorspace.WhitePoint getA();
+    method public androidx.ui.graphics.colorspace.WhitePoint getB();
+    method public androidx.ui.graphics.colorspace.WhitePoint getC();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD50();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD55();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD60();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD65();
+    method public androidx.ui.graphics.colorspace.WhitePoint getD75();
+    method public androidx.ui.graphics.colorspace.WhitePoint getE();
+    property public final androidx.ui.graphics.colorspace.WhitePoint A;
+    property public final androidx.ui.graphics.colorspace.WhitePoint B;
+    property public final androidx.ui.graphics.colorspace.WhitePoint C;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D50;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D55;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D60;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D65;
+    property public final androidx.ui.graphics.colorspace.WhitePoint D75;
+    property public final androidx.ui.graphics.colorspace.WhitePoint E;
+    field public static final androidx.ui.graphics.colorspace.Illuminant! INSTANCE;
+  }
+
+  public enum RenderIntent {
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Absolute;
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Perceptual;
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Relative;
+    enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Saturation;
+  }
+
+  public final class Rgb extends androidx.ui.graphics.colorspace.ColorSpace {
+    ctor public Rgb(@Size(min=null) String name, @Size(null) 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(@Size(min=null) String name, @Size(min=null, max=null) float[] primaries, androidx.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(@Size(min=null) String name, @Size(null) float[] toXYZ, androidx.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(@Size(min=null) String name, @Size(min=null, max=null) float[] primaries, androidx.ui.graphics.colorspace.WhitePoint whitePoint, androidx.ui.graphics.colorspace.TransferParameters function);
+    ctor public Rgb(@Size(min=null) String name, @Size(null) float[] toXYZ, double gamma);
+    ctor public Rgb(@Size(min=null) String name, @Size(min=null, max=null) float[] primaries, androidx.ui.graphics.colorspace.WhitePoint whitePoint, double gamma);
+    method @Size(3) public float[] fromLinear(float r, float g, float b);
+    method @Size(min=3) public float[] fromLinear(@Size(min=3) float[] v);
+    method @Size(min=3) public float[] fromXyz(@Size(min=3) float[] v);
+    method public kotlin.jvm.functions.Function1<java.lang.Double,java.lang.Double> getEotf();
+    method @Size(9) public float[] getInverseTransform();
+    method @Size(min=9) public float[] getInverseTransform(@Size(min=9) 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 @Size(6) public float[] getPrimaries();
+    method @Size(min=6) public float[] getPrimaries(@Size(min=6) float[] primaries);
+    method public androidx.ui.graphics.colorspace.TransferParameters? getTransferParameters();
+    method @Size(9) public float[] getTransform();
+    method @Size(min=9) public float[] getTransform(@Size(min=9) float[] transform);
+    method public androidx.ui.graphics.colorspace.WhitePoint getWhitePoint();
+    method public boolean isWideGamut();
+    method @Size(3) public float[] toLinear(float r, float g, float b);
+    method @Size(min=3) public float[] toLinear(@Size(min=3) float[] v);
+    method @Size(min=3) public float[] toXyz(@Size(min=3) 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;
+  }
+
+  public final class TransferParameters {
+    ctor public TransferParameters(double gamma, double a, double b, double c, double d, double e, 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.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();
+  }
+
+  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.ui.graphics.colorspace.WhitePoint copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+}
+
+package androidx.ui.graphics.painter {
+
+  public final class ColorPainter extends androidx.ui.graphics.painter.Painter {
+    method public long component1();
+    method public androidx.ui.graphics.painter.ColorPainter copy-QEYXlZo(long color);
+    method public long getColor();
+    method public androidx.ui.unit.PxSize getIntrinsicSize();
+    method protected void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+  public final class ImagePainter extends androidx.ui.graphics.painter.Painter {
+    ctor public ImagePainter(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Rect? srcBounds);
+    method public androidx.ui.geometry.Rect? component2();
+    method public androidx.ui.graphics.painter.ImagePainter copy(androidx.ui.graphics.ImageAsset image, androidx.ui.geometry.Rect? srcBounds);
+    method public androidx.ui.unit.PxSize getIntrinsicSize();
+    method public androidx.ui.geometry.Rect? getSrcBounds();
+    method protected void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+  public final class ImagePainterKt {
+  }
+
+  public abstract class Painter {
+    ctor public Painter();
+    method protected boolean applyAlpha(float alpha);
+    method protected boolean applyColorFilter(androidx.ui.graphics.ColorFilter? colorFilter);
+    method protected boolean applyRtl(boolean rtl);
+    method public final void draw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds, float alpha = 1.0f, androidx.ui.graphics.ColorFilter? colorFilter = null, boolean rtl = false);
+    method public abstract androidx.ui.unit.PxSize getIntrinsicSize();
+    method protected abstract void onDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.PxSize bounds);
+    property public abstract androidx.ui.unit.PxSize intrinsicSize;
+  }
+
+}
+
+package androidx.ui.graphics.vector {
+
+  public final class PathBuilder {
+    ctor public PathBuilder();
+    method public androidx.ui.graphics.vector.PathBuilder arcTo(float horizontalEllipseRadius, float verticalEllipseRadius, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder arcToRelative(float a, float b, float theta, boolean isMoreThanHalf, boolean isPositiveArc, float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder close();
+    method public androidx.ui.graphics.vector.PathBuilder curveTo(float x1, float y1, float x2, float y2, float x3, float y3);
+    method public androidx.ui.graphics.vector.PathBuilder curveToRelative(float dx1, float dy1, float dx2, float dy2, float dx3, float dy3);
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> getNodes();
+    method public androidx.ui.graphics.vector.PathBuilder horizontalLineTo(float x);
+    method public androidx.ui.graphics.vector.PathBuilder horizontalLineToRelative(float x);
+    method public androidx.ui.graphics.vector.PathBuilder lineTo(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder lineToRelative(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder moveTo(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder moveToRelative(float x, float y);
+    method public androidx.ui.graphics.vector.PathBuilder quadTo(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder quadToRelative(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveCurveTo(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveCurveToRelative(float x1, float y1, float x2, float y2);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveQuadTo(float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder reflectiveQuadToRelative(float x1, float y1);
+    method public androidx.ui.graphics.vector.PathBuilder verticalLineTo(float y);
+    method public androidx.ui.graphics.vector.PathBuilder verticalLineToRelative(float y);
+  }
+
+  public abstract sealed class PathNode {
+    method public final boolean isCurve();
+    method public final boolean isQuad();
+  }
+
+  public static final class PathNode.ArcTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.Close extends androidx.ui.graphics.vector.PathNode {
+    field public static final androidx.ui.graphics.vector.PathNode.Close! INSTANCE;
+  }
+
+  public static final class PathNode.CurveTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.HorizontalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.HorizontalTo(float x);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.HorizontalTo copy(float x);
+    method public float getX();
+  }
+
+  public static final class PathNode.LineTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.LineTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.LineTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.MoveTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.MoveTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.MoveTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.QuadTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.ReflectiveCurveTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.ReflectiveQuadTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.ReflectiveQuadTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.ReflectiveQuadTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeArcTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.RelativeCurveTo extends androidx.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 public androidx.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();
+  }
+
+  public static final class PathNode.RelativeHorizontalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeHorizontalTo(float x);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.RelativeHorizontalTo copy(float x);
+    method public float getX();
+  }
+
+  public static final class PathNode.RelativeLineTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeLineTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.RelativeLineTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeMoveTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeMoveTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.RelativeMoveTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeQuadTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeQuadTo(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 public androidx.ui.graphics.vector.PathNode.RelativeQuadTo 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();
+  }
+
+  public static final class PathNode.RelativeReflectiveCurveTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveCurveTo(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 public androidx.ui.graphics.vector.PathNode.RelativeReflectiveCurveTo 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();
+  }
+
+  public static final class PathNode.RelativeReflectiveQuadTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeReflectiveQuadTo(float x, float y);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vector.PathNode.RelativeReflectiveQuadTo copy(float x, float y);
+    method public float getX();
+    method public float getY();
+  }
+
+  public static final class PathNode.RelativeVerticalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.RelativeVerticalTo(float y);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.RelativeVerticalTo copy(float y);
+    method public float getY();
+  }
+
+  public static final class PathNode.VerticalTo extends androidx.ui.graphics.vector.PathNode {
+    ctor public PathNode.VerticalTo(float y);
+    method public float component1();
+    method public androidx.ui.graphics.vector.PathNode.VerticalTo copy(float y);
+    method public float getY();
+  }
+
+  public final class PathNodeKt {
+  }
+
+  public final class PathParser {
+    ctor public PathParser();
+    method public androidx.ui.graphics.vector.PathParser addPathNodes(java.util.List<? extends androidx.ui.graphics.vector.PathNode> nodes);
+    method public void clear();
+    method public androidx.ui.graphics.vector.PathParser parsePathString(String pathData);
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> toNodes();
+    method public androidx.ui.graphics.Path toPath(androidx.ui.graphics.Path target = Path());
+  }
+
+  public final class PathParserKt {
+  }
+
+}
+
+package androidx.ui.graphics.vectormath {
+
+  public final class Matrix3 {
+    ctor public Matrix3(androidx.ui.graphics.vectormath.Vector3 x, androidx.ui.graphics.vectormath.Vector3 y, androidx.ui.graphics.vectormath.Vector3 z);
+    ctor public Matrix3();
+    ctor public Matrix3(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public androidx.ui.graphics.vectormath.Vector3 component1();
+    method public androidx.ui.graphics.vectormath.Vector3 component2();
+    method public androidx.ui.graphics.vectormath.Vector3 component3();
+    method public androidx.ui.graphics.vectormath.Matrix3 copy(androidx.ui.graphics.vectormath.Vector3 x, androidx.ui.graphics.vectormath.Vector3 y, androidx.ui.graphics.vectormath.Vector3 z);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 dec();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 div(float v);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(int column);
+    method public operator float get(int column, int row);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(androidx.ui.graphics.vectormath.MatrixColumn column);
+    method public operator float get(androidx.ui.graphics.vectormath.MatrixColumn column, int row);
+    method public inline java.util.List<java.lang.Float> getM3storage();
+    method public androidx.ui.graphics.vectormath.Vector3 getX();
+    method public androidx.ui.graphics.vectormath.Vector3 getY();
+    method public androidx.ui.graphics.vectormath.Vector3 getZ();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 inc();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 minus(float v);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 plus(float v);
+    method public operator void set(int column, androidx.ui.graphics.vectormath.Vector3 v);
+    method public operator void set(int column, int row, float v);
+    method public void setX(androidx.ui.graphics.vectormath.Vector3 p);
+    method public void setY(androidx.ui.graphics.vectormath.Vector3 p);
+    method public void setZ(androidx.ui.graphics.vectormath.Vector3 p);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 times(float v);
+    method public operator androidx.ui.graphics.vectormath.Matrix3 times(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public operator androidx.ui.graphics.vectormath.Vector3 times(androidx.ui.graphics.vectormath.Vector3 v);
+    method public float[] toFloatArray();
+    method public operator androidx.ui.graphics.vectormath.Matrix3 unaryMinus();
+    property public final inline java.util.List<java.lang.Float> m3storage;
+    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion! Companion;
+  }
+
+  public static final class Matrix3.Companion {
+    method public androidx.ui.graphics.vectormath.Matrix3 identity();
+    method public androidx.ui.graphics.vectormath.Matrix3 of(float... a);
+  }
+
+  public final class Matrix4 {
+    ctor public Matrix4(androidx.ui.graphics.vectormath.Vector4 x, androidx.ui.graphics.vectormath.Vector4 y, androidx.ui.graphics.vectormath.Vector4 z, androidx.ui.graphics.vectormath.Vector4 w);
+    ctor public Matrix4();
+    ctor public Matrix4(androidx.ui.graphics.vectormath.Vector3 right, androidx.ui.graphics.vectormath.Vector3 up, androidx.ui.graphics.vectormath.Vector3 forward, androidx.ui.graphics.vectormath.Vector3 position);
+    ctor public Matrix4(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public void assignColumns(androidx.ui.graphics.vectormath.Matrix4 other);
+    method public void assignFromStorage(java.util.List<java.lang.Float> storage);
+    method public androidx.ui.graphics.vectormath.Vector4 component1();
+    method public androidx.ui.graphics.vectormath.Vector4 component2();
+    method public androidx.ui.graphics.vectormath.Vector4 component3();
+    method public androidx.ui.graphics.vectormath.Vector4 component4();
+    method public androidx.ui.graphics.vectormath.Matrix4 copy(androidx.ui.graphics.vectormath.Vector4 x, androidx.ui.graphics.vectormath.Vector4 y, androidx.ui.graphics.vectormath.Vector4 z, androidx.ui.graphics.vectormath.Vector4 w);
+    method public float copyInverse(androidx.ui.graphics.vectormath.Matrix4 arg);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 dec();
+    method public operator androidx.ui.graphics.vectormath.Matrix4 div(float v);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(int column);
+    method public operator float get(int column, int row);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(androidx.ui.graphics.vectormath.MatrixColumn column);
+    method public operator float get(androidx.ui.graphics.vectormath.MatrixColumn column, int row);
+    method public float getDeterminant();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getForward();
+    method public inline java.util.List<java.lang.Float> getM4storage();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getPosition();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getRight();
+    method public androidx.ui.graphics.vectormath.Vector3 getRotation();
+    method public androidx.ui.graphics.vectormath.Vector4 getRow(int row);
+    method public inline androidx.ui.graphics.vectormath.Vector3 getScale();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getTranslation();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getUp();
+    method public inline androidx.ui.graphics.vectormath.Matrix3 getUpperLeft();
+    method public androidx.ui.graphics.vectormath.Vector4 getW();
+    method public androidx.ui.graphics.vectormath.Vector4 getX();
+    method public androidx.ui.graphics.vectormath.Vector4 getY();
+    method public androidx.ui.graphics.vectormath.Vector4 getZ();
+    method public operator androidx.ui.graphics.vectormath.Matrix4 inc();
+    method public float invert();
+    method public operator androidx.ui.graphics.vectormath.Matrix4 minus(float v);
+    method public androidx.ui.graphics.vectormath.Vector3 perspectiveTransform(androidx.ui.graphics.vectormath.Vector3 arg);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 plus(float v);
+    method public void rotateX(float radians);
+    method public void rotateY(float radians);
+    method public void rotateZ(float radians);
+    method public void scale(Object x, Float? y = null, Float? z = null);
+    method public operator void set(int column, androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator void set(int column, int row, float v);
+    method public inline void setForward(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setFrom(androidx.ui.graphics.vectormath.Matrix4 arg);
+    method public inline void setPosition(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setRight(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setTranslationRaw(float x, float y, float z);
+    method public inline void setUp(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setW(androidx.ui.graphics.vectormath.Vector4 p);
+    method public void setX(androidx.ui.graphics.vectormath.Vector4 p);
+    method public void setY(androidx.ui.graphics.vectormath.Vector4 p);
+    method public void setZ(androidx.ui.graphics.vectormath.Vector4 p);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 times(float v);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 times(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator void timesAssign(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public float[] toFloatArray();
+    method public void translate(Object x, float y = 0.0f, float z = 0.0f);
+    method public operator androidx.ui.graphics.vectormath.Matrix4 unaryMinus();
+    property public final float determinant;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 forward;
+    property public final inline java.util.List<java.lang.Float> m4storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 position;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 right;
+    property public final androidx.ui.graphics.vectormath.Vector3 rotation;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 scale;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 translation;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 up;
+    property public final inline androidx.ui.graphics.vectormath.Matrix3 upperLeft;
+    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion! Companion;
+  }
+
+  public static final class Matrix4.Companion {
+    method public androidx.ui.graphics.vectormath.Matrix4 diagonal3(androidx.ui.graphics.vectormath.Vector3 scale);
+    method public androidx.ui.graphics.vectormath.Matrix4 diagonal3Values(float x, float y, float z);
+    method public androidx.ui.graphics.vectormath.Matrix4 identity();
+    method public androidx.ui.graphics.vectormath.Matrix4 of(float... a);
+    method public androidx.ui.graphics.vectormath.Matrix4 rotationX(float radians);
+    method public androidx.ui.graphics.vectormath.Matrix4 rotationY(float radians);
+    method public androidx.ui.graphics.vectormath.Matrix4 rotationZ(float radians);
+    method public androidx.ui.graphics.vectormath.Matrix4 translation(androidx.ui.graphics.vectormath.Vector3 translation);
+    method public androidx.ui.graphics.vectormath.Matrix4 translationValues(float x, float y, float z);
+    method public androidx.ui.graphics.vectormath.Matrix4 zero();
+  }
+
+  public final class Matrix4Kt {
+    method public static Float? getAsScale(androidx.ui.graphics.vectormath.Matrix4);
+    method public static androidx.ui.geometry.Offset? getAsTranslation(androidx.ui.graphics.vectormath.Matrix4);
+    method public static androidx.ui.geometry.Rect inverseTransformRect(androidx.ui.graphics.vectormath.Matrix4 transform, androidx.ui.geometry.Rect rect);
+    method public static boolean isIdentity(androidx.ui.graphics.vectormath.Matrix4);
+    method public static boolean matrixEquals(androidx.ui.graphics.vectormath.Matrix4? a, androidx.ui.graphics.vectormath.Matrix4? b);
+    method public static androidx.ui.geometry.Offset transformPoint(androidx.ui.graphics.vectormath.Matrix4, androidx.ui.geometry.Offset point);
+    method public static androidx.ui.geometry.Rect transformRect(androidx.ui.graphics.vectormath.Matrix4, androidx.ui.geometry.Rect rect);
+  }
+
+  public enum MatrixColumn {
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn W;
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn X;
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Y;
+    enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Z;
+  }
+
+  public final class MatrixExtensionsKt {
+    method public static androidx.ui.graphics.vectormath.Matrix3 inverse(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 inverse(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 lookAt(androidx.ui.graphics.vectormath.Vector3 eye, androidx.ui.graphics.vectormath.Vector3 target, androidx.ui.graphics.vectormath.Vector3 up = androidx.ui.graphics.vectormath.Vector3(1.0));
+    method public static androidx.ui.graphics.vectormath.Matrix4 lookTowards(androidx.ui.graphics.vectormath.Vector3 eye, androidx.ui.graphics.vectormath.Vector3 forward, androidx.ui.graphics.vectormath.Vector3 up = androidx.ui.graphics.vectormath.Vector3(1.0));
+    method public static androidx.ui.graphics.vectormath.Matrix4 normal(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 ortho(float l, float r, float b, float t, float n, float f);
+    method public static androidx.ui.graphics.vectormath.Matrix4 perspective(float fov, float ratio, float near, float far);
+    method public static androidx.ui.graphics.vectormath.Matrix4 rotation(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 rotation(androidx.ui.graphics.vectormath.Vector3 d);
+    method public static androidx.ui.graphics.vectormath.Matrix4 rotation(androidx.ui.graphics.vectormath.Vector3 axis, float angle);
+    method public static androidx.ui.graphics.vectormath.Matrix4 scale(androidx.ui.graphics.vectormath.Vector3 s);
+    method public static androidx.ui.graphics.vectormath.Matrix4 scale(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 translation(androidx.ui.graphics.vectormath.Vector3 t);
+    method public static androidx.ui.graphics.vectormath.Matrix4 translation(androidx.ui.graphics.vectormath.Matrix4 m);
+    method public static androidx.ui.graphics.vectormath.Matrix3 transpose(androidx.ui.graphics.vectormath.Matrix3 m);
+    method public static androidx.ui.graphics.vectormath.Matrix4 transpose(androidx.ui.graphics.vectormath.Matrix4 m);
+  }
+
+  public final class ScalarKt {
+    method public static inline float degrees(float v);
+    method public static inline float radians(float v);
+    field public static final float FOUR_PI = 12.566371f;
+    field public static final float HALF_PI = 1.5707964f;
+    field public static final float INV_FOUR_PI = 0.07957747f;
+    field public static final float INV_PI = 0.31830987f;
+    field public static final float INV_TWO_PI = 0.15915494f;
+    field public static final float PI = 3.1415927f;
+    field public static final float TWO_PI = 6.2831855f;
+  }
+
+  public final class Vector2 {
+    ctor public Vector2(float x, float y);
+    ctor public Vector2();
+    ctor public Vector2(androidx.ui.graphics.vectormath.Vector2 v);
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.graphics.vectormath.Vector2 copy(float x, float y);
+    method public operator androidx.ui.graphics.vectormath.Vector2 dec();
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 div(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 div(androidx.ui.graphics.vectormath.Vector2 v);
+    method public operator float get(androidx.ui.graphics.vectormath.VectorComponent index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2);
+    method public operator float get(int index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(int index1, int index2);
+    method public inline float getG();
+    method public inline float getR();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getRg();
+    method public inline float getS();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getSt();
+    method public inline float getT();
+    method public inline java.util.List<java.lang.Float> getV2storage();
+    method public float getX();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getXy();
+    method public float getY();
+    method public operator androidx.ui.graphics.vectormath.Vector2 inc();
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 minus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 minus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 plus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 plus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public operator void set(int index, float v);
+    method public operator void set(int index1, int index2, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, float v);
+    method public inline void setG(float value);
+    method public inline void setR(float value);
+    method public inline void setRg(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setS(float value);
+    method public inline void setSt(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setT(float value);
+    method public void setX(float p);
+    method public inline void setXy(androidx.ui.graphics.vectormath.Vector2 value);
+    method public void setY(float p);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 times(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector2 times(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline androidx.ui.graphics.vectormath.Vector2 transform(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public operator androidx.ui.graphics.vectormath.Vector2 unaryMinus();
+    property public final inline float g;
+    property public final inline float r;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 rg;
+    property public final inline float s;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 st;
+    property public final inline float t;
+    property public final inline java.util.List<java.lang.Float> v2storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 xy;
+  }
+
+  public final class Vector3 {
+    ctor public Vector3(float x, float y, float z);
+    ctor public Vector3();
+    ctor public Vector3(androidx.ui.graphics.vectormath.Vector2 v, float z);
+    ctor public Vector3(androidx.ui.graphics.vectormath.Vector3 v);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public androidx.ui.graphics.vectormath.Vector3 copy(float x, float y, float z);
+    method public operator androidx.ui.graphics.vectormath.Vector3 dec();
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 div(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 div(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 div(androidx.ui.graphics.vectormath.Vector3 v);
+    method public operator float get(androidx.ui.graphics.vectormath.VectorComponent index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3);
+    method public operator float get(int index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(int index1, int index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(int index1, int index2, int index3);
+    method public inline float getB();
+    method public inline float getG();
+    method public inline float getP();
+    method public inline float getR();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getRg();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getRgb();
+    method public inline float getS();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getSt();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getStp();
+    method public inline float getT();
+    method public inline java.util.List<java.lang.Float> getV3storage();
+    method public float getX();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getXy();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getXyz();
+    method public float getY();
+    method public float getZ();
+    method public operator androidx.ui.graphics.vectormath.Vector3 inc();
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 minus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 minus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 minus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 plus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 plus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 plus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public operator void set(int index, float v);
+    method public operator void set(int index1, int index2, float v);
+    method public operator void set(int index1, int index2, int index3, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, float v);
+    method public inline void setB(float value);
+    method public inline void setG(float value);
+    method public inline void setP(float value);
+    method public inline void setR(float value);
+    method public inline void setRg(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setRgb(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setS(float value);
+    method public inline void setSt(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setStp(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setT(float value);
+    method public void setX(float p);
+    method public inline void setXy(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setXyz(androidx.ui.graphics.vectormath.Vector3 value);
+    method public void setY(float p);
+    method public void setZ(float p);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 times(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 times(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector3 times(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline androidx.ui.graphics.vectormath.Vector3 transform(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public operator androidx.ui.graphics.vectormath.Vector3 unaryMinus();
+    property public final inline float b;
+    property public final inline float g;
+    property public final inline float p;
+    property public final inline float r;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 rg;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 rgb;
+    property public final inline float s;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 st;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 stp;
+    property public final inline float t;
+    property public final inline java.util.List<java.lang.Float> v3storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 xy;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 xyz;
+  }
+
+  public final class Vector4 {
+    ctor public Vector4(float x, float y, float z, float w);
+    ctor public Vector4();
+    ctor public Vector4(androidx.ui.graphics.vectormath.Vector2 v, float z, float w);
+    ctor public Vector4(androidx.ui.graphics.vectormath.Vector3 v, float w);
+    ctor public Vector4(androidx.ui.graphics.vectormath.Vector4 v);
+    method public void assignFromStorage(java.util.List<java.lang.Float> storage);
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public androidx.ui.graphics.vectormath.Vector4 copy(float x, float y, float z, float w);
+    method public operator androidx.ui.graphics.vectormath.Vector4 dec();
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 div(androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator float get(androidx.ui.graphics.vectormath.VectorComponent index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, androidx.ui.graphics.vectormath.VectorComponent index4);
+    method public operator float get(int index);
+    method public operator androidx.ui.graphics.vectormath.Vector2 get(int index1, int index2);
+    method public operator androidx.ui.graphics.vectormath.Vector3 get(int index1, int index2, int index3);
+    method public operator androidx.ui.graphics.vectormath.Vector4 get(int index1, int index2, int index3, int index4);
+    method public inline float getA();
+    method public inline float getB();
+    method public inline float getG();
+    method public inline float getP();
+    method public inline float getQ();
+    method public inline float getR();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getRg();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getRgb();
+    method public inline androidx.ui.graphics.vectormath.Vector4 getRgba();
+    method public inline float getS();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getSt();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getStp();
+    method public inline androidx.ui.graphics.vectormath.Vector4 getStpq();
+    method public inline float getT();
+    method public inline java.util.List<java.lang.Float> getV4storage();
+    method public float getW();
+    method public float getX();
+    method public inline androidx.ui.graphics.vectormath.Vector2 getXy();
+    method public inline androidx.ui.graphics.vectormath.Vector3 getXyz();
+    method public inline androidx.ui.graphics.vectormath.Vector4 getXyzw();
+    method public float getY();
+    method public float getZ();
+    method public operator androidx.ui.graphics.vectormath.Vector4 inc();
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 minus(androidx.ui.graphics.vectormath.Vector4 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 plus(androidx.ui.graphics.vectormath.Vector4 v);
+    method public operator void set(int index, float v);
+    method public operator void set(int index1, int index2, float v);
+    method public operator void set(int index1, int index2, int index3, float v);
+    method public operator void set(int index1, int index2, int index3, int index4, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, float v);
+    method public operator void set(androidx.ui.graphics.vectormath.VectorComponent index1, androidx.ui.graphics.vectormath.VectorComponent index2, androidx.ui.graphics.vectormath.VectorComponent index3, androidx.ui.graphics.vectormath.VectorComponent index4, float v);
+    method public inline void setA(float value);
+    method public inline void setB(float value);
+    method public inline void setG(float value);
+    method public inline void setP(float value);
+    method public inline void setQ(float value);
+    method public inline void setR(float value);
+    method public inline void setRg(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setRgb(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setRgba(androidx.ui.graphics.vectormath.Vector4 value);
+    method public inline void setS(float value);
+    method public inline void setSt(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setStp(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setStpq(androidx.ui.graphics.vectormath.Vector4 value);
+    method public inline void setT(float value);
+    method public void setW(float p);
+    method public void setX(float p);
+    method public inline void setXy(androidx.ui.graphics.vectormath.Vector2 value);
+    method public inline void setXyz(androidx.ui.graphics.vectormath.Vector3 value);
+    method public inline void setXyzw(androidx.ui.graphics.vectormath.Vector4 value);
+    method public void setY(float p);
+    method public void setZ(float p);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(float v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector2 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector3 v);
+    method public inline operator androidx.ui.graphics.vectormath.Vector4 times(androidx.ui.graphics.vectormath.Vector4 v);
+    method public inline androidx.ui.graphics.vectormath.Vector4 transform(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public operator androidx.ui.graphics.vectormath.Vector4 unaryMinus();
+    property public final inline float a;
+    property public final inline float b;
+    property public final inline float g;
+    property public final inline float p;
+    property public final inline float q;
+    property public final inline float r;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 rg;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 rgb;
+    property public final inline androidx.ui.graphics.vectormath.Vector4 rgba;
+    property public final inline float s;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 st;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 stp;
+    property public final inline androidx.ui.graphics.vectormath.Vector4 stpq;
+    property public final inline float t;
+    property public final inline java.util.List<java.lang.Float> v4storage;
+    property public final inline androidx.ui.graphics.vectormath.Vector2 xy;
+    property public final inline androidx.ui.graphics.vectormath.Vector3 xyz;
+    property public final inline androidx.ui.graphics.vectormath.Vector4 xyzw;
+  }
+
+  public enum VectorComponent {
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent A;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent B;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent G;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent P;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent Q;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent R;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent S;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent T;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent W;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent X;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent Y;
+    enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent Z;
+  }
+
+  public final class VectorExtensionsKt {
+    method public static inline androidx.ui.graphics.vectormath.Vector2 abs(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 abs(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 abs(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 coerceIn(androidx.ui.graphics.vectormath.Vector2, float min, float max);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 coerceIn(androidx.ui.graphics.vectormath.Vector2, androidx.ui.graphics.vectormath.Vector2 min, androidx.ui.graphics.vectormath.Vector2 max);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 coerceIn(androidx.ui.graphics.vectormath.Vector3, float min, float max);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 coerceIn(androidx.ui.graphics.vectormath.Vector3, androidx.ui.graphics.vectormath.Vector3 min, androidx.ui.graphics.vectormath.Vector3 max);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 coerceIn(androidx.ui.graphics.vectormath.Vector4, float min, float max);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 coerceIn(androidx.ui.graphics.vectormath.Vector4, androidx.ui.graphics.vectormath.Vector4 min, androidx.ui.graphics.vectormath.Vector4 max);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 cross(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float distance(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float distance(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float distance(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 div(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 div(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 div(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline float dot(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float dot(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float dot(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline float length(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline float length(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline float length(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline float length2(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline float length2(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline float length2(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline float max(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 max(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float max(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 max(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float max(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 max(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline float min(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 min(androidx.ui.graphics.vectormath.Vector2 a, androidx.ui.graphics.vectormath.Vector2 b);
+    method public static inline float min(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 min(androidx.ui.graphics.vectormath.Vector3 a, androidx.ui.graphics.vectormath.Vector3 b);
+    method public static inline float min(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 min(androidx.ui.graphics.vectormath.Vector4 a, androidx.ui.graphics.vectormath.Vector4 b);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 minus(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 minus(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 minus(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static androidx.ui.graphics.vectormath.Vector2 normalize(androidx.ui.graphics.vectormath.Vector2 v);
+    method public static androidx.ui.graphics.vectormath.Vector3 normalize(androidx.ui.graphics.vectormath.Vector3 v);
+    method public static androidx.ui.graphics.vectormath.Vector4 normalize(androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 plus(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 plus(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 plus(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 reflect(androidx.ui.graphics.vectormath.Vector2 i, androidx.ui.graphics.vectormath.Vector2 n);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 reflect(androidx.ui.graphics.vectormath.Vector3 i, androidx.ui.graphics.vectormath.Vector3 n);
+    method public static androidx.ui.graphics.vectormath.Vector2 refract(androidx.ui.graphics.vectormath.Vector2 i, androidx.ui.graphics.vectormath.Vector2 n, float eta);
+    method public static androidx.ui.graphics.vectormath.Vector3 refract(androidx.ui.graphics.vectormath.Vector3 i, androidx.ui.graphics.vectormath.Vector3 n, float eta);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector2 times(float, androidx.ui.graphics.vectormath.Vector2 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector3 times(float, androidx.ui.graphics.vectormath.Vector3 v);
+    method public static inline operator androidx.ui.graphics.vectormath.Vector4 times(float, androidx.ui.graphics.vectormath.Vector4 v);
+    method public static inline androidx.ui.graphics.vectormath.Vector2 transform(androidx.ui.graphics.vectormath.Vector2 v, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public static inline androidx.ui.graphics.vectormath.Vector3 transform(androidx.ui.graphics.vectormath.Vector3 v, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public static inline androidx.ui.graphics.vectormath.Vector4 transform(androidx.ui.graphics.vectormath.Vector4 v, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> block);
+    method public static inline infix androidx.ui.graphics.vectormath.Vector3 x(androidx.ui.graphics.vectormath.Vector3, androidx.ui.graphics.vectormath.Vector3 v);
+  }
+
+}
+
diff --git a/ui/ui-graphics/api/restricted_current.txt b/ui/ui-graphics/api/restricted_current.txt
index 1f3ff55..a4896944 100644
--- a/ui/ui-graphics/api/restricted_current.txt
+++ b/ui/ui-graphics/api/restricted_current.txt
@@ -95,13 +95,6 @@
     enum_constant public static final androidx.ui.graphics.BlendMode xor;
   }
 
-  public enum BlurStyle {
-    enum_constant public static final androidx.ui.graphics.BlurStyle inner;
-    enum_constant public static final androidx.ui.graphics.BlurStyle normal;
-    enum_constant public static final androidx.ui.graphics.BlurStyle outer;
-    enum_constant public static final androidx.ui.graphics.BlurStyle solid;
-  }
-
   public interface Brush {
     method public void applyTo(androidx.ui.graphics.Paint p);
   }
@@ -278,21 +271,6 @@
     method public androidx.ui.graphics.LinearGradient copy-OCut9AY(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float startX, float startY, float endX, float endY, androidx.ui.graphics.TileMode tileMode);
   }
 
-  public final class MaskFilter {
-    ctor public MaskFilter(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public androidx.ui.graphics.BlurStyle component1();
-    method public float component2();
-    method public androidx.ui.graphics.MaskFilter copy(androidx.ui.graphics.BlurStyle style, float sigma);
-    method public float getSigma();
-    method public androidx.ui.graphics.BlurStyle getStyle();
-    field public static final androidx.ui.graphics.MaskFilter.Companion! Companion;
-    field public static final int TYPE_BLUR = 1; // 0x1
-    field public static final int TYPE_NONE = 0; // 0x0
-  }
-
-  public static final class MaskFilter.Companion {
-  }
-
   public abstract sealed class Outline {
   }
 
@@ -330,7 +308,6 @@
     method public long getColor();
     method public androidx.ui.graphics.ColorFilter? getColorFilter();
     method public androidx.ui.graphics.FilterQuality getFilterQuality();
-    method public androidx.ui.graphics.MaskFilter getMaskFilter();
     method public android.graphics.Shader? getShader();
     method public androidx.ui.graphics.StrokeCap getStrokeCap();
     method public androidx.ui.graphics.StrokeJoin getStrokeJoin();
@@ -344,7 +321,6 @@
     method public void setColor-QEYXlZo(long color);
     method public void setColorFilter(androidx.ui.graphics.ColorFilter? value);
     method public void setFilterQuality(androidx.ui.graphics.FilterQuality value);
-    method public void setMaskFilter(androidx.ui.graphics.MaskFilter value);
     method public void setShader-DcPGf4I(android.graphics.Shader? value);
     method public void setStrokeCap(androidx.ui.graphics.StrokeCap value);
     method public void setStrokeJoin(androidx.ui.graphics.StrokeJoin value);
@@ -357,7 +333,6 @@
     property public final androidx.ui.graphics.ColorFilter? colorFilter;
     property public final androidx.ui.graphics.FilterQuality filterQuality;
     property public final boolean isAntiAlias;
-    property public final androidx.ui.graphics.MaskFilter maskFilter;
     property public final android.graphics.Shader? shader;
     property public final androidx.ui.graphics.StrokeCap strokeCap;
     property public final androidx.ui.graphics.StrokeJoin strokeJoin;
@@ -458,6 +433,10 @@
     method public androidx.ui.graphics.RadialGradient copy(java.util.List<androidx.ui.graphics.Color> colors, java.util.List<java.lang.Float>? stops, float centerX, float centerY, float radius, androidx.ui.graphics.TileMode tileMode);
   }
 
+  public final class RectangleShapeKt {
+    method public static androidx.ui.graphics.Shape getRectangleShape();
+  }
+
   public final inline class Shader {
     ctor public Shader();
     method public static android.graphics.Shader! constructor-impl(android.graphics.Shader nativeShader);
diff --git a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/shape/RectangleShapeTest.kt b/ui/ui-graphics/src/androidTest/java/androidx/ui/graphics/RectangleShapeTest.kt
similarity index 85%
rename from ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/shape/RectangleShapeTest.kt
rename to ui/ui-graphics/src/androidTest/java/androidx/ui/graphics/RectangleShapeTest.kt
index f4415a2..d5909f7 100644
--- a/ui/ui-foundation/src/androidTest/java/androidx/ui/foundation/shape/RectangleShapeTest.kt
+++ b/ui/ui-graphics/src/androidTest/java/androidx/ui/graphics/RectangleShapeTest.kt
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-package androidx.ui.foundation.shape
+package androidx.ui.graphics
 
 import androidx.test.filters.SmallTest
-import androidx.ui.graphics.Outline
-import androidx.ui.graphics.Shape
 import androidx.ui.unit.Density
 import androidx.ui.unit.PxSize
 import androidx.ui.unit.px
 import androidx.ui.unit.toRect
-import com.google.common.truth.Truth.assertThat
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -40,7 +38,7 @@
         val rectangular = RectangleShape
 
         val outline = rectangular.toOutline() as Outline.Rectangle
-        assertThat(outline.rect).isEqualTo(size.toRect())
+        assertEquals(outline.rect, size.toRect())
     }
 
     private fun Shape.toOutline() = createOutline(size, density)
diff --git a/ui/ui-graphics/src/main/java/androidx/ui/graphics/BlurStyle.kt b/ui/ui-graphics/src/main/java/androidx/ui/graphics/BlurStyle.kt
deleted file mode 100644
index 86dbe78..0000000
--- a/ui/ui-graphics/src/main/java/androidx/ui/graphics/BlurStyle.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-
-package androidx.ui.graphics
-
-// Styles to use for blurs in [MaskFilter] objects.
-// These enum values must be kept in sync with SkBlurStyle.
-enum class BlurStyle {
-    // These mirror SkBlurStyle and must be kept in sync.
-
-    // Fuzzy inside and outside. This is useful for painting shadows that are
-    // offset from the shape that ostensibly is casting the shadow.
-    normal,
-
-    // Solid inside, fuzzy outside. This corresponds to drawing the shape, and
-    // additionally drawing the blur. This can make objects appear brighter,
-    // maybe even as if they were fluorescent.
-    solid,
-
-    // Nothing inside, fuzzy outside. This is useful for painting shadows for
-    // partially transparent shapes, when they are painted separately but without
-    // an offset, so that the shadow doesn't paint below the shape.
-    outer,
-
-    // Fuzzy inside, nothing outside. This can make shapes appear to be lit from
-    // within.
-    inner
-}
\ No newline at end of file
diff --git a/ui/ui-graphics/src/main/java/androidx/ui/graphics/MaskFilter.kt b/ui/ui-graphics/src/main/java/androidx/ui/graphics/MaskFilter.kt
deleted file mode 100644
index 0d89fd5..0000000
--- a/ui/ui-graphics/src/main/java/androidx/ui/graphics/MaskFilter.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-
-package androidx.ui.graphics
-
-// A mask filter to apply to shapes as they are painted. A mask filter is a
-// function that takes a bitmap of color pixels, and returns another bitmap of
-// color pixels.
-//
-// Instances of this class are used with [Paint.maskFilter] on [Paint] objects.
-// TODO(njawad): add support for framework's EmbossMaskFilter
-data class MaskFilter(val style: BlurStyle, val sigma: Float) {
-    // Creates a mask filter that takes the shape being drawn and blurs it.
-    //
-    // This is commonly used to approximate shadows.
-    //
-    // The `style` argument controls the kind of effect to draw; see [BlurStyle].
-    //
-    // The `sigma` argument controls the size of the effect. It is the standard
-    // deviation of the Gaussian blur to apply. The value must be greater than
-    // zero. The sigma corresponds to very roughly half the radius of the effect
-    // in pixels.
-    //
-    // A blur is an expensive operation and should therefore be used sparingly.
-    //
-    // The arguments must not be null.
-    //
-    // See also:
-    //
-    //  * [Canvas.drawShadow], which is a more efficient way to draw shadows.
-
-    // The type of MaskFilter class to create for Skia.
-    // These constants must be kept in sync with MaskFilterType in paint.cc.
-    companion object {
-        const val TYPE_NONE = 0 // null
-        const val TYPE_BLUR = 1 // SkBlurMaskFilter
-    }
-
-    //  @override
-    //  int get hashCode => hashValues(_style, _sigma);
-
-    //  @override
-    //  String toString() => 'MaskFilter.blur($_style, ${_sigma.toStringAsFixed(1)})';
-}
diff --git a/ui/ui-graphics/src/main/java/androidx/ui/graphics/Paint.kt b/ui/ui-graphics/src/main/java/androidx/ui/graphics/Paint.kt
index 6896a32..32390cd 100644
--- a/ui/ui-graphics/src/main/java/androidx/ui/graphics/Paint.kt
+++ b/ui/ui-graphics/src/main/java/androidx/ui/graphics/Paint.kt
@@ -16,7 +16,6 @@
 
 package androidx.ui.graphics
 
-import android.graphics.BlurMaskFilter
 import android.graphics.PorterDuffColorFilter
 
 /**
@@ -28,8 +27,6 @@
 
     private var internalPaint = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG)
     private var porterDuffMode = android.graphics.PorterDuff.Mode.SRC_OVER
-    private var blurStyle = android.graphics.BlurMaskFilter.Blur.NORMAL
-    private var blurRadius = 0.0f
     private var internalShader: Shader? = null
     private var internalColorFilter: ColorFilter? = null
 
@@ -214,37 +211,8 @@
             internalPaint.strokeMiter = value
         }
 
-    // A mask filter (for example, a blur) to apply to a shape after it has been
-    // drawn but before it has been composited into the image.
-    //
-    // See [MaskFilter] for details.
-    var maskFilter: MaskFilter
-        get() {
-            val style = when (blurStyle) {
-                android.graphics.BlurMaskFilter.Blur.NORMAL -> BlurStyle.normal
-                android.graphics.BlurMaskFilter.Blur.SOLID -> BlurStyle.solid
-                android.graphics.BlurMaskFilter.Blur.OUTER -> BlurStyle.outer
-                android.graphics.BlurMaskFilter.Blur.INNER -> BlurStyle.inner
-            }
-            // sigma is equivalent to roughly half the radius: sigma = radius / 2
-            return MaskFilter(style, blurRadius / 2.0f)
-        }
-        set(value) {
-            val blur = when (value.style) {
-                BlurStyle.inner -> android.graphics.BlurMaskFilter.Blur.INNER
-                BlurStyle.normal -> android.graphics.BlurMaskFilter.Blur.NORMAL
-                BlurStyle.outer -> android.graphics.BlurMaskFilter.Blur.OUTER
-                BlurStyle.solid -> android.graphics.BlurMaskFilter.Blur.SOLID
-            }
-
-            // radius is equivalent to roughly twice the sigma: radius = sigma * 2
-            // TODO(njawad): Add support for framework EmbossMaskFilter?)
-            internalPaint.maskFilter = BlurMaskFilter((value.sigma * 2), blur)
-        }
-
     // Controls the performance vs quality trade-off to use when applying
-    // filters, such as [maskFilter], or when drawing images, as with
-    // [Canvas.drawImageRect] or [Canvas.drawImageNine].
+    // when drawing images, as with [Canvas.drawImageRect]
     //
     // Defaults to [FilterQuality.none].
     // TODO(ianh): verify that the image drawing methods actually respect this
diff --git a/ui/ui-graphics/src/main/java/androidx/ui/graphics/RectangleShape.kt b/ui/ui-graphics/src/main/java/androidx/ui/graphics/RectangleShape.kt
new file mode 100644
index 0000000..85e05ee
--- /dev/null
+++ b/ui/ui-graphics/src/main/java/androidx/ui/graphics/RectangleShape.kt
@@ -0,0 +1,29 @@
+/*
+ * 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.ui.graphics
+
+import androidx.ui.unit.Density
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.toRect
+
+/**
+ * A shape describing the rectangle.
+ */
+val RectangleShape: Shape = object : Shape {
+    override fun createOutline(size: PxSize, density: Density) =
+        Outline.Rectangle(size.toRect())
+}
diff --git a/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/UnnecessaryLambdaCreationDetector.kt b/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/UnnecessaryLambdaCreationDetector.kt
index fe77776..fe3ee89 100644
--- a/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/UnnecessaryLambdaCreationDetector.kt
+++ b/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/UnnecessaryLambdaCreationDetector.kt
@@ -129,11 +129,6 @@
             // understand this better, so we just check to see if the name looks like it is a node.
             if (parentExpression.isComponentNodeInvocation) return
 
-            val receiver = expression.receiver as UReferenceExpression
-
-            val isComposable = (receiver.resolveToUElement()!!
-                .sourcePsi as KtCallableDeclaration).isComposable
-
             // Find the index of the corresponding parameter in the source declaration, that
             // matches this lambda expression's invocation
             val parameterIndex = parentExpression.valueArguments.indexOf(node)
@@ -141,12 +136,17 @@
             // If we cannot resolve the parent expression as a KtCallableDeclaration, it might be a
             // Java method / exist in bytecode or some other format, so just ignore it as we won't
             // be able to see @Composable there anyway.
-            val parentDeclaration = parentExpression.resolveToUElement()!!
-                .sourcePsi as? KtCallableDeclaration ?: return
+            val parentDeclaration = parentExpression.resolveToUElement()
+                ?.sourcePsi as? KtCallableDeclaration ?: return
 
             val expectedComposable =
                 parentDeclaration.valueParameters[parameterIndex]!!.isComposable
 
+            val receiver = (expression.receiver as? UReferenceExpression)
+                ?.resolveToUElement()?.sourcePsi as? KtCallableDeclaration ?: return
+
+            val isComposable = receiver.isComposable
+
             if (isComposable != expectedComposable) return
 
             context.report(
diff --git a/ui/ui-layout/api/0.1.0-dev10.txt b/ui/ui-layout/api/0.1.0-dev10.txt
index 25b74f48..cc750a2 100644
--- a/ui/ui-layout/api/0.1.0-dev10.txt
+++ b/ui/ui-layout/api/0.1.0-dev10.txt
@@ -424,14 +424,6 @@
     method public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
   }
 
-  public final class LayoutDirectionModifier {
-    method @Deprecated public androidx.ui.core.LayoutModifier getLtr();
-    method @Deprecated public androidx.ui.core.LayoutModifier getRtl();
-    property @Deprecated public final androidx.ui.core.LayoutModifier Ltr;
-    property @Deprecated public final androidx.ui.core.LayoutModifier Rtl;
-    field public static final androidx.ui.layout.LayoutDirectionModifier! INSTANCE;
-  }
-
   public final class LayoutDirectionsKt {
     method public static androidx.ui.core.Modifier getLtr(androidx.ui.core.Modifier);
     method public static androidx.ui.core.Modifier getRtl(androidx.ui.core.Modifier);
diff --git a/ui/ui-layout/api/0.1.0-dev11.txt b/ui/ui-layout/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..cc750a2
--- /dev/null
+++ b/ui/ui-layout/api/0.1.0-dev11.txt
@@ -0,0 +1,855 @@
+// Signature format: 3.0
+package androidx.ui.layout {
+
+  public final class AlignmentLineKt {
+    method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.unit.Dp before = 0.dp, androidx.ui.unit.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void CenterAlignmentLine(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public interface Arrangement {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion! Companion;
+  }
+
+  public static final class Arrangement.Bottom implements androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Bottom! INSTANCE;
+  }
+
+  public static final class Arrangement.Center implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Center! INSTANCE;
+  }
+
+  public static final class Arrangement.End implements androidx.ui.layout.Arrangement.Horizontal {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.End! INSTANCE;
+  }
+
+  public static interface Arrangement.Horizontal extends androidx.ui.layout.Arrangement {
+  }
+
+  public static final class Arrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.SpaceAround! INSTANCE;
+  }
+
+  public static final class Arrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.SpaceBetween! INSTANCE;
+  }
+
+  public static final class Arrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.SpaceEvenly! INSTANCE;
+  }
+
+  public static final class Arrangement.Start implements androidx.ui.layout.Arrangement.Horizontal {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Start! INSTANCE;
+  }
+
+  public static final class Arrangement.Top implements androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Top! INSTANCE;
+  }
+
+  public static interface Arrangement.Vertical extends androidx.ui.layout.Arrangement {
+  }
+
+  @Deprecated public enum ColumnAlign {
+    enum_constant @Deprecated public static final androidx.ui.layout.ColumnAlign Center;
+    enum_constant @Deprecated public static final androidx.ui.layout.ColumnAlign End;
+    enum_constant @Deprecated public static final androidx.ui.layout.ColumnAlign Start;
+  }
+
+  public final class ColumnKt {
+    method public static void Column(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.Arrangement.Vertical verticalArrangement = Arrangement.Top, androidx.ui.core.Alignment.Horizontal horizontalGravity = Alignment.Start, kotlin.jvm.functions.Function1<? super androidx.ui.layout.ColumnScope,kotlin.Unit> children);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class ColumnScope {
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.VerticalAlignmentLine alignmentLine);
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,androidx.ui.unit.IntPx> alignmentLineBlock);
+    method public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
+    method @Deprecated public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.layout.ColumnAlign align);
+    method public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+    field public static final androidx.ui.layout.ColumnScope! INSTANCE;
+  }
+
+  public final class ConstraintLayoutKt {
+    method public static void ConstraintLayout(androidx.ui.layout.ConstraintSet constraintSet, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class ConstraintSet {
+    ctor public ConstraintSet(internal kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstraintSetBuilderScope,kotlin.Unit> description);
+    method public androidx.ui.layout.ConstraintSet copy(kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstraintSetBuilderScope,kotlin.Unit> description);
+  }
+
+  public final class ConstraintSetBuilderScope {
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createRightBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createTopBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalChain createVerticalChain(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible getMaxWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getMaxWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible getMinWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getMinWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference getParent();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getSpread();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible getWrap();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getWrapFixed();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible max(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension max(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible min(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension min(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension percent(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference tag(Object tag);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible value(androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension valueFixed(androidx.ui.unit.Dp dp);
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible maxWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension maxWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible minWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension minWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference parent;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension spread;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible wrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension wrapFixed;
+  }
+
+  public static final class ConstraintSetBuilderScope.ChainStyle {
+    field public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion! Companion;
+  }
+
+  public static final class ConstraintSetBuilderScope.ChainStyle.Companion {
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Packed(float bias);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getPacked();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getSpread();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getSpreadInside();
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Packed;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Spread;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle SpreadInside;
+  }
+
+  public static final class ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor other);
+    method public androidx.constraintlayout.core.state.State getState();
+    method public Object getTag();
+  }
+
+  public final class ConstraintSetBuilderScope.ConstrainedLayoutReference {
+    method public void center();
+    method public void centerHorizontally();
+    method public void centerVertically();
+    method public infix void constrainHorizontallyTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public infix void constrainVerticallyTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor getBaseline();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getBottom();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getHeight();
+    method public float getHorizontalBias();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getLeft();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getRight();
+    method public Object getTag();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getTop();
+    method public float getVerticalBias();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getWidth();
+    method public void setBaseline(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor p);
+    method public void setBottom(androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor p);
+    method public void setHeight(androidx.ui.layout.ConstraintSetBuilderScope.Dimension value);
+    method public void setHorizontalBias(float value);
+    method public void setRight(androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor p);
+    method public void setVerticalBias(float value);
+    method public void setWidth(androidx.ui.layout.ConstraintSetBuilderScope.Dimension value);
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor baseline;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor bottom;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension height;
+    property public final float horizontalBias;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor left;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor right;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor top;
+    property public final float verticalBias;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension width;
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension {
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension.Coercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension.MaxCoercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension.MinCoercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  }
+
+  public abstract static sealed class ConstraintSetBuilderScope.HorizontalAnchor {
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor other);
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+    property public Object tag;
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalChain {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getLeft();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getRight();
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor left;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor right;
+  }
+
+  public abstract static sealed class ConstraintSetBuilderScope.VerticalAnchor {
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor other);
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+    property public Object tag;
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalChain {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getBottom();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getTop();
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor bottom;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor top;
+  }
+
+  public final class ContainerKt {
+    method @Deprecated public static void Container(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.InnerPadding padding = androidx.ui.layout.InnerPadding(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class CrossAxisAlignment {
+    field public static final androidx.ui.layout.CrossAxisAlignment.Companion! Companion;
+  }
+
+  public static final class CrossAxisAlignment.Companion {
+    method public androidx.ui.layout.CrossAxisAlignment AlignmentLine(androidx.ui.core.AlignmentLine alignmentLine);
+    method public androidx.ui.layout.CrossAxisAlignment getCenter();
+    method public androidx.ui.layout.CrossAxisAlignment getEnd();
+    method public androidx.ui.layout.CrossAxisAlignment getStart();
+    property public final androidx.ui.layout.CrossAxisAlignment Center;
+    property public final androidx.ui.layout.CrossAxisAlignment End;
+    property public final androidx.ui.layout.CrossAxisAlignment Start;
+  }
+
+  public final class DpConstraints {
+    ctor public DpConstraints(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    ctor public DpConstraints();
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.DpConstraints copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.Dp getMinWidth();
+    field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
+  }
+
+  public static final class DpConstraints.Companion {
+    method public androidx.ui.layout.DpConstraints fixed(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public androidx.ui.layout.DpConstraints fixedHeight(androidx.ui.unit.Dp height);
+    method public androidx.ui.layout.DpConstraints fixedWidth(androidx.ui.unit.Dp width);
+  }
+
+  public final class DpConstraintsKt {
+    method public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.Density, androidx.ui.layout.DpConstraints dpConstraints);
+    method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints);
+    method public static androidx.ui.layout.DpConstraints enforce(androidx.ui.layout.DpConstraints, androidx.ui.layout.DpConstraints otherConstraints);
+    method public static boolean getHasBoundedHeight(androidx.ui.layout.DpConstraints);
+    method public static boolean getHasBoundedWidth(androidx.ui.layout.DpConstraints);
+    method public static boolean getHasFixedHeight(androidx.ui.layout.DpConstraints);
+    method public static boolean getHasFixedWidth(androidx.ui.layout.DpConstraints);
+    method public static boolean getSatisfiable(androidx.ui.layout.DpConstraints);
+    method public static boolean isZero(androidx.ui.layout.DpConstraints);
+    method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp horizontal = 0.dp, androidx.ui.unit.Dp vertical = 0.dp);
+  }
+
+  @Deprecated public final class EdgeInsets {
+    ctor @Deprecated public EdgeInsets(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    ctor @Deprecated public EdgeInsets();
+    ctor @Deprecated public EdgeInsets(androidx.ui.unit.Dp all);
+    method @Deprecated public androidx.ui.unit.Dp component1();
+    method @Deprecated public androidx.ui.unit.Dp component2();
+    method @Deprecated public androidx.ui.unit.Dp component3();
+    method @Deprecated public androidx.ui.unit.Dp component4();
+    method @Deprecated public androidx.ui.layout.EdgeInsets copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method @Deprecated public androidx.ui.unit.Dp getBottom();
+    method @Deprecated public androidx.ui.unit.Dp getLeft();
+    method @Deprecated public androidx.ui.unit.Dp getRight();
+    method @Deprecated public androidx.ui.unit.Dp getTop();
+  }
+
+  public enum FlowCrossAxisAlignment {
+    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Center;
+    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment End;
+    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Start;
+  }
+
+  public final class FlowKt {
+    method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class InnerPadding {
+    ctor public InnerPadding(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    ctor public InnerPadding();
+    ctor public InnerPadding(androidx.ui.unit.Dp all);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.InnerPadding copy(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getEnd();
+    method public androidx.ui.unit.Dp getStart();
+    method public androidx.ui.unit.Dp getTop();
+  }
+
+  public final class IntrinsicKt {
+    method @Deprecated public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static void MaxIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static void MinIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static androidx.ui.core.Modifier preferredHeight(androidx.ui.core.Modifier, androidx.ui.layout.IntrinsicSize intrinsicSize);
+    method public static androidx.ui.core.Modifier preferredWidth(androidx.ui.core.Modifier, androidx.ui.layout.IntrinsicSize intrinsicSize);
+  }
+
+  public enum IntrinsicSize {
+    enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
+    enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
+  }
+
+  public final class LayoutAlign {
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottom();
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottomCenter();
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottomEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottomStart();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenter();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterHorizontally();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterStart();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterVertically();
+    method @Deprecated public androidx.ui.core.LayoutModifier getEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getStart();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTop();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTopCenter();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTopEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTopStart();
+    property @Deprecated public final androidx.ui.core.LayoutModifier Bottom;
+    property @Deprecated public final androidx.ui.core.LayoutModifier BottomCenter;
+    property @Deprecated public final androidx.ui.core.LayoutModifier BottomEnd;
+    property @Deprecated public final androidx.ui.core.LayoutModifier BottomStart;
+    property @Deprecated public final androidx.ui.core.LayoutModifier Center;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterEnd;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterHorizontally;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterStart;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterVertically;
+    property @Deprecated public final androidx.ui.core.LayoutModifier End;
+    property @Deprecated public final androidx.ui.core.LayoutModifier Start;
+    property @Deprecated public final androidx.ui.core.LayoutModifier Top;
+    property @Deprecated public final androidx.ui.core.LayoutModifier TopCenter;
+    property @Deprecated public final androidx.ui.core.LayoutModifier TopEnd;
+    property @Deprecated public final androidx.ui.core.LayoutModifier TopStart;
+    field public static final androidx.ui.layout.LayoutAlign! INSTANCE;
+  }
+
+  public final class LayoutAspectRatio implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutAspectRatio(@FloatRange(from=null, fromInclusive=null) float aspectRatio);
+    method public float component1();
+    method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
+    method public float getAspectRatio();
+    method public int maxIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutAspectRatioKt {
+    method public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
+  }
+
+  public final class LayoutDirectionsKt {
+    method public static androidx.ui.core.Modifier getLtr(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier getRtl(androidx.ui.core.Modifier);
+  }
+
+  public final class LayoutGravity {
+    field public static final androidx.ui.layout.LayoutGravity! INSTANCE;
+  }
+
+  public final class LayoutHeight implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight(androidx.ui.unit.Dp height);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutHeight copy(androidx.ui.unit.Dp height);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutHeight.Constrain implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight.Constrain(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  @Deprecated public static final class LayoutHeight.Fill implements androidx.ui.core.LayoutModifier {
+    method @Deprecated public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.LayoutHeight.Fill! INSTANCE;
+  }
+
+  public static final class LayoutHeight.Max implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight.Max(androidx.ui.unit.Dp maxHeight);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutHeight.Min implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight.Min(androidx.ui.unit.Dp minHeight);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.unit.Dp minHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public final class LayoutOffset implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutOffset(androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutOffset copy(androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+    method public androidx.ui.unit.Dp getX();
+    method public androidx.ui.unit.Dp getY();
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutOffsetKt {
+    method public static androidx.ui.core.Modifier offset(androidx.ui.core.Modifier, androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+  }
+
+  public final class LayoutPadding implements androidx.ui.core.LayoutModifier2 {
+    ctor @Deprecated public LayoutPadding(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    ctor @Deprecated public LayoutPadding();
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.LayoutPadding copy(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getEnd();
+    method public androidx.ui.unit.Dp getStart();
+    method public androidx.ui.unit.Dp getTop();
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutPaddingAbsolute implements androidx.ui.core.LayoutModifier2 {
+    ctor @Deprecated public LayoutPaddingAbsolute(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    ctor @Deprecated public LayoutPaddingAbsolute();
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.LayoutPaddingAbsolute copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getLeft();
+    method public androidx.ui.unit.Dp getRight();
+    method public androidx.ui.unit.Dp getTop();
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutPaddingKt {
+    method @Deprecated public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.unit.Dp all);
+    method public static androidx.ui.core.Modifier absolutePadding(androidx.ui.core.Modifier, androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+    method public static androidx.ui.core.Modifier padding(androidx.ui.core.Modifier, androidx.ui.unit.Dp start = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp end = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+    method public static androidx.ui.core.Modifier padding(androidx.ui.core.Modifier, androidx.ui.unit.Dp all);
+  }
+
+  @kotlin.DslMarker public @interface LayoutScopeMarker {
+  }
+
+  public final class LayoutSize implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    ctor @Deprecated public LayoutSize(androidx.ui.unit.Dp size);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutSize copy(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getHeight();
+    method public androidx.ui.unit.Dp getWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutSize.Constrain implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    ctor @Deprecated public LayoutSize.Constrain(androidx.ui.unit.Dp minSize, androidx.ui.unit.Dp maxSize);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  @Deprecated public static final class LayoutSize.Fill implements androidx.ui.core.LayoutModifier {
+    method @Deprecated public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.LayoutSize.Fill! INSTANCE;
+  }
+
+  public static final class LayoutSize.Max implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize.Max(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    ctor @Deprecated public LayoutSize.Max(androidx.ui.unit.Dp maxSize);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutSize.Min implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize.Min(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+    ctor @Deprecated public LayoutSize.Min(androidx.ui.unit.Dp minSize);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public final class LayoutSizeKt {
+    method public static androidx.ui.core.Modifier fillMaxHeight(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier fillMaxSize(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier fillMaxWidth(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier height(androidx.ui.core.Modifier, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier heightIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier preferredHeight(androidx.ui.core.Modifier, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier preferredHeightIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier preferredSize(androidx.ui.core.Modifier, androidx.ui.unit.Dp size);
+    method public static androidx.ui.core.Modifier preferredSize(androidx.ui.core.Modifier, androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier preferredSizeIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier preferredSizeIn(androidx.ui.core.Modifier, androidx.ui.layout.DpConstraints constraints);
+    method public static androidx.ui.core.Modifier preferredWidth(androidx.ui.core.Modifier, androidx.ui.unit.Dp width);
+    method public static androidx.ui.core.Modifier preferredWidthIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier size(androidx.ui.core.Modifier, androidx.ui.unit.Dp size);
+    method public static androidx.ui.core.Modifier size(androidx.ui.core.Modifier, androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier sizeIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier sizeIn(androidx.ui.core.Modifier, androidx.ui.layout.DpConstraints constraints);
+    method public static androidx.ui.core.Modifier width(androidx.ui.core.Modifier, androidx.ui.unit.Dp width);
+    method public static androidx.ui.core.Modifier widthIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified);
+    method @Deprecated public static androidx.ui.core.Modifier wrapContentHeight(androidx.ui.core.Modifier, androidx.ui.core.Alignment align = Alignment.Center);
+    method public static androidx.ui.core.Modifier wrapContentHeight(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align = Alignment.CenterVertically);
+    method public static androidx.ui.core.Modifier wrapContentSize(androidx.ui.core.Modifier, androidx.ui.core.Alignment align = Alignment.Center);
+    method @Deprecated public static androidx.ui.core.Modifier wrapContentWidth(androidx.ui.core.Modifier, androidx.ui.core.Alignment align = Alignment.Center);
+    method public static androidx.ui.core.Modifier wrapContentWidth(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align = Alignment.CenterHorizontally);
+  }
+
+  public final class LayoutWidth implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth(androidx.ui.unit.Dp width);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutWidth copy(androidx.ui.unit.Dp width);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutWidth.Constrain implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  @Deprecated public static final class LayoutWidth.Fill implements androidx.ui.core.LayoutModifier {
+    method @Deprecated public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.LayoutWidth.Fill! INSTANCE;
+  }
+
+  public static final class LayoutWidth.Max implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth.Max(androidx.ui.unit.Dp maxWidth);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.unit.Dp maxWidth);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutWidth.Min implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth.Min(androidx.ui.unit.Dp minWidth);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.unit.Dp minWidth);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public enum MainAxisAlignment {
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment Center;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment End;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceAround;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceBetween;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceEvenly;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment Start;
+  }
+
+  @Deprecated public enum RowAlign {
+    enum_constant @Deprecated public static final androidx.ui.layout.RowAlign Bottom;
+    enum_constant @Deprecated public static final androidx.ui.layout.RowAlign Center;
+    enum_constant @Deprecated public static final androidx.ui.layout.RowAlign Top;
+  }
+
+  public final class RowColumnImplKt {
+  }
+
+  public final class RowKt {
+    method public static void Row(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.Arrangement.Horizontal horizontalArrangement = Arrangement.Start, androidx.ui.core.Alignment.Vertical verticalGravity = Alignment.Top, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> children);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class RowScope {
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,androidx.ui.unit.IntPx> alignmentLineBlock);
+    method public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
+    method @Deprecated public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.layout.RowAlign align);
+    method public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+    field public static final androidx.ui.layout.RowScope! INSTANCE;
+  }
+
+  public enum SizeMode {
+    enum_constant public static final androidx.ui.layout.SizeMode Expand;
+    enum_constant public static final androidx.ui.layout.SizeMode Wrap;
+  }
+
+  public final class SpacerKt {
+    method public static void Spacer(androidx.ui.core.Modifier modifier);
+  }
+
+  public final class StackKt {
+    method public static void Stack(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.layout.StackScope,kotlin.Unit> children);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class StackScope {
+    ctor public StackScope();
+    method public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment align);
+    method @Deprecated public androidx.ui.core.Modifier matchParent(androidx.ui.core.Modifier);
+    method public androidx.ui.core.Modifier matchParentSize(androidx.ui.core.Modifier);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class TableChildren {
+    method public void tableDecoration(boolean overlay, kotlin.jvm.functions.Function1<? super androidx.ui.layout.TableDecorationChildren,kotlin.Unit> decoration);
+    method public void tableRow(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public abstract class TableColumnWidth {
+    method public int maxIntrinsicWidth-17UHc7E(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density, int availableHeight);
+    method public int minIntrinsicWidth-17UHc7E(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density, int availableHeight);
+    method public abstract int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.Fixed extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Fixed(androidx.ui.unit.Dp width);
+    method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.unit.Dp width);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.Flex extends androidx.ui.layout.TableColumnWidth {
+    ctor public TableColumnWidth.Flex(@FloatRange(from=null) float flex);
+    method public androidx.ui.layout.TableColumnWidth.Flex copy(float flex);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.Fraction extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Fraction(@FloatRange(from=null, to=null) float fraction);
+    method public androidx.ui.layout.TableColumnWidth.Fraction copy(float fraction);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public abstract static class TableColumnWidth.Inflexible extends androidx.ui.layout.TableColumnWidth {
+    ctor public TableColumnWidth.Inflexible();
+    method public final androidx.ui.layout.TableColumnWidth flexible(float flex);
+  }
+
+  public static final class TableColumnWidth.Max extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Max(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public androidx.ui.layout.TableColumnWidth.Max copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.MaxIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+    field public static final androidx.ui.layout.TableColumnWidth.MaxIntrinsic! INSTANCE;
+  }
+
+  public static final class TableColumnWidth.Min extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Min(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public androidx.ui.layout.TableColumnWidth.Min copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.MinIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+    field public static final androidx.ui.layout.TableColumnWidth.MinIntrinsic! INSTANCE;
+  }
+
+  public static final class TableColumnWidth.Wrap extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+    field public static final androidx.ui.layout.TableColumnWidth.Wrap! INSTANCE;
+  }
+
+  public final class TableDecorationChildren {
+    method public java.util.List<androidx.ui.unit.IntPx> component1();
+    method public java.util.List<androidx.ui.unit.IntPx> component2();
+    method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.unit.IntPx> verticalOffsets, java.util.List<androidx.ui.unit.IntPx> horizontalOffsets);
+    method public java.util.List<androidx.ui.unit.IntPx> getHorizontalOffsets();
+    method public java.util.List<androidx.ui.unit.IntPx> getVerticalOffsets();
+  }
+
+  public final class TableKt {
+    method public static void Table(int columns, kotlin.jvm.functions.Function1<? super java.lang.Integer,androidx.ui.core.Alignment> alignment = { Alignment.TopStart }, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends androidx.ui.layout.TableColumnWidth> columnWidth = { TableColumnWidth.<init>(1.0) }, kotlin.jvm.functions.Function1<? super androidx.ui.layout.TableChildren,kotlin.Unit> children);
+  }
+
+  public final class TableMeasurable {
+    method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> component1();
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component2();
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component3();
+    method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> maxIntrinsicWidth);
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMaxIntrinsicWidth();
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMinIntrinsicWidth();
+    method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> getPreferredWidth();
+  }
+
+}
+
diff --git a/ui/ui-layout/api/current.txt b/ui/ui-layout/api/current.txt
index 25b74f48..cc750a2 100644
--- a/ui/ui-layout/api/current.txt
+++ b/ui/ui-layout/api/current.txt
@@ -424,14 +424,6 @@
     method public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
   }
 
-  public final class LayoutDirectionModifier {
-    method @Deprecated public androidx.ui.core.LayoutModifier getLtr();
-    method @Deprecated public androidx.ui.core.LayoutModifier getRtl();
-    property @Deprecated public final androidx.ui.core.LayoutModifier Ltr;
-    property @Deprecated public final androidx.ui.core.LayoutModifier Rtl;
-    field public static final androidx.ui.layout.LayoutDirectionModifier! INSTANCE;
-  }
-
   public final class LayoutDirectionsKt {
     method public static androidx.ui.core.Modifier getLtr(androidx.ui.core.Modifier);
     method public static androidx.ui.core.Modifier getRtl(androidx.ui.core.Modifier);
diff --git a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev10.txt
index 25b74f48..cc750a2 100644
--- a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev10.txt
@@ -424,14 +424,6 @@
     method public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
   }
 
-  public final class LayoutDirectionModifier {
-    method @Deprecated public androidx.ui.core.LayoutModifier getLtr();
-    method @Deprecated public androidx.ui.core.LayoutModifier getRtl();
-    property @Deprecated public final androidx.ui.core.LayoutModifier Ltr;
-    property @Deprecated public final androidx.ui.core.LayoutModifier Rtl;
-    field public static final androidx.ui.layout.LayoutDirectionModifier! INSTANCE;
-  }
-
   public final class LayoutDirectionsKt {
     method public static androidx.ui.core.Modifier getLtr(androidx.ui.core.Modifier);
     method public static androidx.ui.core.Modifier getRtl(androidx.ui.core.Modifier);
diff --git a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..cc750a2
--- /dev/null
+++ b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,855 @@
+// Signature format: 3.0
+package androidx.ui.layout {
+
+  public final class AlignmentLineKt {
+    method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.unit.Dp before = 0.dp, androidx.ui.unit.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void CenterAlignmentLine(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public interface Arrangement {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion! Companion;
+  }
+
+  public static final class Arrangement.Bottom implements androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Bottom! INSTANCE;
+  }
+
+  public static final class Arrangement.Center implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Center! INSTANCE;
+  }
+
+  public static final class Arrangement.End implements androidx.ui.layout.Arrangement.Horizontal {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.End! INSTANCE;
+  }
+
+  public static interface Arrangement.Horizontal extends androidx.ui.layout.Arrangement {
+  }
+
+  public static final class Arrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.SpaceAround! INSTANCE;
+  }
+
+  public static final class Arrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.SpaceBetween! INSTANCE;
+  }
+
+  public static final class Arrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.SpaceEvenly! INSTANCE;
+  }
+
+  public static final class Arrangement.Start implements androidx.ui.layout.Arrangement.Horizontal {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Start! INSTANCE;
+  }
+
+  public static final class Arrangement.Top implements androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Top! INSTANCE;
+  }
+
+  public static interface Arrangement.Vertical extends androidx.ui.layout.Arrangement {
+  }
+
+  @Deprecated public enum ColumnAlign {
+    enum_constant @Deprecated public static final androidx.ui.layout.ColumnAlign Center;
+    enum_constant @Deprecated public static final androidx.ui.layout.ColumnAlign End;
+    enum_constant @Deprecated public static final androidx.ui.layout.ColumnAlign Start;
+  }
+
+  public final class ColumnKt {
+    method public static void Column(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.Arrangement.Vertical verticalArrangement = Arrangement.Top, androidx.ui.core.Alignment.Horizontal horizontalGravity = Alignment.Start, kotlin.jvm.functions.Function1<? super androidx.ui.layout.ColumnScope,kotlin.Unit> children);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class ColumnScope {
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.VerticalAlignmentLine alignmentLine);
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,androidx.ui.unit.IntPx> alignmentLineBlock);
+    method public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
+    method @Deprecated public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.layout.ColumnAlign align);
+    method public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+    field public static final androidx.ui.layout.ColumnScope! INSTANCE;
+  }
+
+  public final class ConstraintLayoutKt {
+    method public static void ConstraintLayout(androidx.ui.layout.ConstraintSet constraintSet, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class ConstraintSet {
+    ctor public ConstraintSet(internal kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstraintSetBuilderScope,kotlin.Unit> description);
+    method public androidx.ui.layout.ConstraintSet copy(kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstraintSetBuilderScope,kotlin.Unit> description);
+  }
+
+  public final class ConstraintSetBuilderScope {
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createRightBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createTopBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalChain createVerticalChain(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible getMaxWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getMaxWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible getMinWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getMinWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference getParent();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getSpread();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible getWrap();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getWrapFixed();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible max(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension max(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible min(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension min(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension percent(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference tag(Object tag);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible value(androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension valueFixed(androidx.ui.unit.Dp dp);
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible maxWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension maxWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible minWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension minWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference parent;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension spread;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible wrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension wrapFixed;
+  }
+
+  public static final class ConstraintSetBuilderScope.ChainStyle {
+    field public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion! Companion;
+  }
+
+  public static final class ConstraintSetBuilderScope.ChainStyle.Companion {
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Packed(float bias);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getPacked();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getSpread();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getSpreadInside();
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Packed;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Spread;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle SpreadInside;
+  }
+
+  public static final class ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor other);
+    method public androidx.constraintlayout.core.state.State getState();
+    method public Object getTag();
+  }
+
+  public final class ConstraintSetBuilderScope.ConstrainedLayoutReference {
+    method public void center();
+    method public void centerHorizontally();
+    method public void centerVertically();
+    method public infix void constrainHorizontallyTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public infix void constrainVerticallyTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor getBaseline();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getBottom();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getHeight();
+    method public float getHorizontalBias();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getLeft();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getRight();
+    method public Object getTag();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getTop();
+    method public float getVerticalBias();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getWidth();
+    method public void setBaseline(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor p);
+    method public void setBottom(androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor p);
+    method public void setHeight(androidx.ui.layout.ConstraintSetBuilderScope.Dimension value);
+    method public void setHorizontalBias(float value);
+    method public void setRight(androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor p);
+    method public void setVerticalBias(float value);
+    method public void setWidth(androidx.ui.layout.ConstraintSetBuilderScope.Dimension value);
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor baseline;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor bottom;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension height;
+    property public final float horizontalBias;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor left;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor right;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor top;
+    property public final float verticalBias;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension width;
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension {
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension.Coercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension.MaxCoercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension.MinCoercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  }
+
+  public abstract static sealed class ConstraintSetBuilderScope.HorizontalAnchor {
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor other);
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+    property public Object tag;
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalChain {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getLeft();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getRight();
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor left;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor right;
+  }
+
+  public abstract static sealed class ConstraintSetBuilderScope.VerticalAnchor {
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor other);
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+    property public Object tag;
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalChain {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getBottom();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getTop();
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor bottom;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor top;
+  }
+
+  public final class ContainerKt {
+    method @Deprecated public static void Container(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.InnerPadding padding = androidx.ui.layout.InnerPadding(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class CrossAxisAlignment {
+    field public static final androidx.ui.layout.CrossAxisAlignment.Companion! Companion;
+  }
+
+  public static final class CrossAxisAlignment.Companion {
+    method public androidx.ui.layout.CrossAxisAlignment AlignmentLine(androidx.ui.core.AlignmentLine alignmentLine);
+    method public androidx.ui.layout.CrossAxisAlignment getCenter();
+    method public androidx.ui.layout.CrossAxisAlignment getEnd();
+    method public androidx.ui.layout.CrossAxisAlignment getStart();
+    property public final androidx.ui.layout.CrossAxisAlignment Center;
+    property public final androidx.ui.layout.CrossAxisAlignment End;
+    property public final androidx.ui.layout.CrossAxisAlignment Start;
+  }
+
+  public final class DpConstraints {
+    ctor public DpConstraints(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    ctor public DpConstraints();
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.DpConstraints copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.Dp getMinWidth();
+    field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
+  }
+
+  public static final class DpConstraints.Companion {
+    method public androidx.ui.layout.DpConstraints fixed(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public androidx.ui.layout.DpConstraints fixedHeight(androidx.ui.unit.Dp height);
+    method public androidx.ui.layout.DpConstraints fixedWidth(androidx.ui.unit.Dp width);
+  }
+
+  public final class DpConstraintsKt {
+    method public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.Density, androidx.ui.layout.DpConstraints dpConstraints);
+    method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints);
+    method public static androidx.ui.layout.DpConstraints enforce(androidx.ui.layout.DpConstraints, androidx.ui.layout.DpConstraints otherConstraints);
+    method public static boolean getHasBoundedHeight(androidx.ui.layout.DpConstraints);
+    method public static boolean getHasBoundedWidth(androidx.ui.layout.DpConstraints);
+    method public static boolean getHasFixedHeight(androidx.ui.layout.DpConstraints);
+    method public static boolean getHasFixedWidth(androidx.ui.layout.DpConstraints);
+    method public static boolean getSatisfiable(androidx.ui.layout.DpConstraints);
+    method public static boolean isZero(androidx.ui.layout.DpConstraints);
+    method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp horizontal = 0.dp, androidx.ui.unit.Dp vertical = 0.dp);
+  }
+
+  @Deprecated public final class EdgeInsets {
+    ctor @Deprecated public EdgeInsets(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    ctor @Deprecated public EdgeInsets();
+    ctor @Deprecated public EdgeInsets(androidx.ui.unit.Dp all);
+    method @Deprecated public androidx.ui.unit.Dp component1();
+    method @Deprecated public androidx.ui.unit.Dp component2();
+    method @Deprecated public androidx.ui.unit.Dp component3();
+    method @Deprecated public androidx.ui.unit.Dp component4();
+    method @Deprecated public androidx.ui.layout.EdgeInsets copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method @Deprecated public androidx.ui.unit.Dp getBottom();
+    method @Deprecated public androidx.ui.unit.Dp getLeft();
+    method @Deprecated public androidx.ui.unit.Dp getRight();
+    method @Deprecated public androidx.ui.unit.Dp getTop();
+  }
+
+  public enum FlowCrossAxisAlignment {
+    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Center;
+    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment End;
+    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Start;
+  }
+
+  public final class FlowKt {
+    method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class InnerPadding {
+    ctor public InnerPadding(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    ctor public InnerPadding();
+    ctor public InnerPadding(androidx.ui.unit.Dp all);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.InnerPadding copy(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getEnd();
+    method public androidx.ui.unit.Dp getStart();
+    method public androidx.ui.unit.Dp getTop();
+  }
+
+  public final class IntrinsicKt {
+    method @Deprecated public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static void MaxIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static void MinIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static androidx.ui.core.Modifier preferredHeight(androidx.ui.core.Modifier, androidx.ui.layout.IntrinsicSize intrinsicSize);
+    method public static androidx.ui.core.Modifier preferredWidth(androidx.ui.core.Modifier, androidx.ui.layout.IntrinsicSize intrinsicSize);
+  }
+
+  public enum IntrinsicSize {
+    enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
+    enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
+  }
+
+  public final class LayoutAlign {
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottom();
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottomCenter();
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottomEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottomStart();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenter();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterHorizontally();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterStart();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterVertically();
+    method @Deprecated public androidx.ui.core.LayoutModifier getEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getStart();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTop();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTopCenter();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTopEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTopStart();
+    property @Deprecated public final androidx.ui.core.LayoutModifier Bottom;
+    property @Deprecated public final androidx.ui.core.LayoutModifier BottomCenter;
+    property @Deprecated public final androidx.ui.core.LayoutModifier BottomEnd;
+    property @Deprecated public final androidx.ui.core.LayoutModifier BottomStart;
+    property @Deprecated public final androidx.ui.core.LayoutModifier Center;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterEnd;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterHorizontally;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterStart;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterVertically;
+    property @Deprecated public final androidx.ui.core.LayoutModifier End;
+    property @Deprecated public final androidx.ui.core.LayoutModifier Start;
+    property @Deprecated public final androidx.ui.core.LayoutModifier Top;
+    property @Deprecated public final androidx.ui.core.LayoutModifier TopCenter;
+    property @Deprecated public final androidx.ui.core.LayoutModifier TopEnd;
+    property @Deprecated public final androidx.ui.core.LayoutModifier TopStart;
+    field public static final androidx.ui.layout.LayoutAlign! INSTANCE;
+  }
+
+  public final class LayoutAspectRatio implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutAspectRatio(@FloatRange(from=null, fromInclusive=null) float aspectRatio);
+    method public float component1();
+    method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
+    method public float getAspectRatio();
+    method public int maxIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutAspectRatioKt {
+    method public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
+  }
+
+  public final class LayoutDirectionsKt {
+    method public static androidx.ui.core.Modifier getLtr(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier getRtl(androidx.ui.core.Modifier);
+  }
+
+  public final class LayoutGravity {
+    field public static final androidx.ui.layout.LayoutGravity! INSTANCE;
+  }
+
+  public final class LayoutHeight implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight(androidx.ui.unit.Dp height);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutHeight copy(androidx.ui.unit.Dp height);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutHeight.Constrain implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight.Constrain(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  @Deprecated public static final class LayoutHeight.Fill implements androidx.ui.core.LayoutModifier {
+    method @Deprecated public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.LayoutHeight.Fill! INSTANCE;
+  }
+
+  public static final class LayoutHeight.Max implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight.Max(androidx.ui.unit.Dp maxHeight);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutHeight.Min implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight.Min(androidx.ui.unit.Dp minHeight);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.unit.Dp minHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public final class LayoutOffset implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutOffset(androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutOffset copy(androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+    method public androidx.ui.unit.Dp getX();
+    method public androidx.ui.unit.Dp getY();
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutOffsetKt {
+    method public static androidx.ui.core.Modifier offset(androidx.ui.core.Modifier, androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+  }
+
+  public final class LayoutPadding implements androidx.ui.core.LayoutModifier2 {
+    ctor @Deprecated public LayoutPadding(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    ctor @Deprecated public LayoutPadding();
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.LayoutPadding copy(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getEnd();
+    method public androidx.ui.unit.Dp getStart();
+    method public androidx.ui.unit.Dp getTop();
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutPaddingAbsolute implements androidx.ui.core.LayoutModifier2 {
+    ctor @Deprecated public LayoutPaddingAbsolute(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    ctor @Deprecated public LayoutPaddingAbsolute();
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.LayoutPaddingAbsolute copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getLeft();
+    method public androidx.ui.unit.Dp getRight();
+    method public androidx.ui.unit.Dp getTop();
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutPaddingKt {
+    method @Deprecated public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.unit.Dp all);
+    method public static androidx.ui.core.Modifier absolutePadding(androidx.ui.core.Modifier, androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+    method public static androidx.ui.core.Modifier padding(androidx.ui.core.Modifier, androidx.ui.unit.Dp start = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp end = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+    method public static androidx.ui.core.Modifier padding(androidx.ui.core.Modifier, androidx.ui.unit.Dp all);
+  }
+
+  @kotlin.DslMarker public @interface LayoutScopeMarker {
+  }
+
+  public final class LayoutSize implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    ctor @Deprecated public LayoutSize(androidx.ui.unit.Dp size);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutSize copy(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getHeight();
+    method public androidx.ui.unit.Dp getWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutSize.Constrain implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    ctor @Deprecated public LayoutSize.Constrain(androidx.ui.unit.Dp minSize, androidx.ui.unit.Dp maxSize);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  @Deprecated public static final class LayoutSize.Fill implements androidx.ui.core.LayoutModifier {
+    method @Deprecated public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.LayoutSize.Fill! INSTANCE;
+  }
+
+  public static final class LayoutSize.Max implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize.Max(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    ctor @Deprecated public LayoutSize.Max(androidx.ui.unit.Dp maxSize);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutSize.Min implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize.Min(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+    ctor @Deprecated public LayoutSize.Min(androidx.ui.unit.Dp minSize);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public final class LayoutSizeKt {
+    method public static androidx.ui.core.Modifier fillMaxHeight(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier fillMaxSize(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier fillMaxWidth(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier height(androidx.ui.core.Modifier, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier heightIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier preferredHeight(androidx.ui.core.Modifier, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier preferredHeightIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier preferredSize(androidx.ui.core.Modifier, androidx.ui.unit.Dp size);
+    method public static androidx.ui.core.Modifier preferredSize(androidx.ui.core.Modifier, androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier preferredSizeIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier preferredSizeIn(androidx.ui.core.Modifier, androidx.ui.layout.DpConstraints constraints);
+    method public static androidx.ui.core.Modifier preferredWidth(androidx.ui.core.Modifier, androidx.ui.unit.Dp width);
+    method public static androidx.ui.core.Modifier preferredWidthIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier size(androidx.ui.core.Modifier, androidx.ui.unit.Dp size);
+    method public static androidx.ui.core.Modifier size(androidx.ui.core.Modifier, androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier sizeIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier sizeIn(androidx.ui.core.Modifier, androidx.ui.layout.DpConstraints constraints);
+    method public static androidx.ui.core.Modifier width(androidx.ui.core.Modifier, androidx.ui.unit.Dp width);
+    method public static androidx.ui.core.Modifier widthIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified);
+    method @Deprecated public static androidx.ui.core.Modifier wrapContentHeight(androidx.ui.core.Modifier, androidx.ui.core.Alignment align = Alignment.Center);
+    method public static androidx.ui.core.Modifier wrapContentHeight(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align = Alignment.CenterVertically);
+    method public static androidx.ui.core.Modifier wrapContentSize(androidx.ui.core.Modifier, androidx.ui.core.Alignment align = Alignment.Center);
+    method @Deprecated public static androidx.ui.core.Modifier wrapContentWidth(androidx.ui.core.Modifier, androidx.ui.core.Alignment align = Alignment.Center);
+    method public static androidx.ui.core.Modifier wrapContentWidth(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align = Alignment.CenterHorizontally);
+  }
+
+  public final class LayoutWidth implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth(androidx.ui.unit.Dp width);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutWidth copy(androidx.ui.unit.Dp width);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutWidth.Constrain implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  @Deprecated public static final class LayoutWidth.Fill implements androidx.ui.core.LayoutModifier {
+    method @Deprecated public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.LayoutWidth.Fill! INSTANCE;
+  }
+
+  public static final class LayoutWidth.Max implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth.Max(androidx.ui.unit.Dp maxWidth);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.unit.Dp maxWidth);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutWidth.Min implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth.Min(androidx.ui.unit.Dp minWidth);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.unit.Dp minWidth);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public enum MainAxisAlignment {
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment Center;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment End;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceAround;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceBetween;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceEvenly;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment Start;
+  }
+
+  @Deprecated public enum RowAlign {
+    enum_constant @Deprecated public static final androidx.ui.layout.RowAlign Bottom;
+    enum_constant @Deprecated public static final androidx.ui.layout.RowAlign Center;
+    enum_constant @Deprecated public static final androidx.ui.layout.RowAlign Top;
+  }
+
+  public final class RowColumnImplKt {
+  }
+
+  public final class RowKt {
+    method public static void Row(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.Arrangement.Horizontal horizontalArrangement = Arrangement.Start, androidx.ui.core.Alignment.Vertical verticalGravity = Alignment.Top, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> children);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class RowScope {
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,androidx.ui.unit.IntPx> alignmentLineBlock);
+    method public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
+    method @Deprecated public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.layout.RowAlign align);
+    method public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+    field public static final androidx.ui.layout.RowScope! INSTANCE;
+  }
+
+  public enum SizeMode {
+    enum_constant public static final androidx.ui.layout.SizeMode Expand;
+    enum_constant public static final androidx.ui.layout.SizeMode Wrap;
+  }
+
+  public final class SpacerKt {
+    method public static void Spacer(androidx.ui.core.Modifier modifier);
+  }
+
+  public final class StackKt {
+    method public static void Stack(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.layout.StackScope,kotlin.Unit> children);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class StackScope {
+    ctor public StackScope();
+    method public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment align);
+    method @Deprecated public androidx.ui.core.Modifier matchParent(androidx.ui.core.Modifier);
+    method public androidx.ui.core.Modifier matchParentSize(androidx.ui.core.Modifier);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class TableChildren {
+    method public void tableDecoration(boolean overlay, kotlin.jvm.functions.Function1<? super androidx.ui.layout.TableDecorationChildren,kotlin.Unit> decoration);
+    method public void tableRow(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public abstract class TableColumnWidth {
+    method public int maxIntrinsicWidth-17UHc7E(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density, int availableHeight);
+    method public int minIntrinsicWidth-17UHc7E(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density, int availableHeight);
+    method public abstract int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.Fixed extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Fixed(androidx.ui.unit.Dp width);
+    method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.unit.Dp width);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.Flex extends androidx.ui.layout.TableColumnWidth {
+    ctor public TableColumnWidth.Flex(@FloatRange(from=null) float flex);
+    method public androidx.ui.layout.TableColumnWidth.Flex copy(float flex);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.Fraction extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Fraction(@FloatRange(from=null, to=null) float fraction);
+    method public androidx.ui.layout.TableColumnWidth.Fraction copy(float fraction);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public abstract static class TableColumnWidth.Inflexible extends androidx.ui.layout.TableColumnWidth {
+    ctor public TableColumnWidth.Inflexible();
+    method public final androidx.ui.layout.TableColumnWidth flexible(float flex);
+  }
+
+  public static final class TableColumnWidth.Max extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Max(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public androidx.ui.layout.TableColumnWidth.Max copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.MaxIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+    field public static final androidx.ui.layout.TableColumnWidth.MaxIntrinsic! INSTANCE;
+  }
+
+  public static final class TableColumnWidth.Min extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Min(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public androidx.ui.layout.TableColumnWidth.Min copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.MinIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+    field public static final androidx.ui.layout.TableColumnWidth.MinIntrinsic! INSTANCE;
+  }
+
+  public static final class TableColumnWidth.Wrap extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+    field public static final androidx.ui.layout.TableColumnWidth.Wrap! INSTANCE;
+  }
+
+  public final class TableDecorationChildren {
+    method public java.util.List<androidx.ui.unit.IntPx> component1();
+    method public java.util.List<androidx.ui.unit.IntPx> component2();
+    method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.unit.IntPx> verticalOffsets, java.util.List<androidx.ui.unit.IntPx> horizontalOffsets);
+    method public java.util.List<androidx.ui.unit.IntPx> getHorizontalOffsets();
+    method public java.util.List<androidx.ui.unit.IntPx> getVerticalOffsets();
+  }
+
+  public final class TableKt {
+    method public static void Table(int columns, kotlin.jvm.functions.Function1<? super java.lang.Integer,androidx.ui.core.Alignment> alignment = { Alignment.TopStart }, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends androidx.ui.layout.TableColumnWidth> columnWidth = { TableColumnWidth.<init>(1.0) }, kotlin.jvm.functions.Function1<? super androidx.ui.layout.TableChildren,kotlin.Unit> children);
+  }
+
+  public final class TableMeasurable {
+    method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> component1();
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component2();
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component3();
+    method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> maxIntrinsicWidth);
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMaxIntrinsicWidth();
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMinIntrinsicWidth();
+    method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> getPreferredWidth();
+  }
+
+}
+
diff --git a/ui/ui-layout/api/public_plus_experimental_current.txt b/ui/ui-layout/api/public_plus_experimental_current.txt
index 25b74f48..cc750a2 100644
--- a/ui/ui-layout/api/public_plus_experimental_current.txt
+++ b/ui/ui-layout/api/public_plus_experimental_current.txt
@@ -424,14 +424,6 @@
     method public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
   }
 
-  public final class LayoutDirectionModifier {
-    method @Deprecated public androidx.ui.core.LayoutModifier getLtr();
-    method @Deprecated public androidx.ui.core.LayoutModifier getRtl();
-    property @Deprecated public final androidx.ui.core.LayoutModifier Ltr;
-    property @Deprecated public final androidx.ui.core.LayoutModifier Rtl;
-    field public static final androidx.ui.layout.LayoutDirectionModifier! INSTANCE;
-  }
-
   public final class LayoutDirectionsKt {
     method public static androidx.ui.core.Modifier getLtr(androidx.ui.core.Modifier);
     method public static androidx.ui.core.Modifier getRtl(androidx.ui.core.Modifier);
diff --git a/ui/ui-layout/api/res-0.1.0-dev11.txt b/ui/ui-layout/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-layout/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-layout/api/restricted_0.1.0-dev10.txt b/ui/ui-layout/api/restricted_0.1.0-dev10.txt
index 25b74f48..cc750a2 100644
--- a/ui/ui-layout/api/restricted_0.1.0-dev10.txt
+++ b/ui/ui-layout/api/restricted_0.1.0-dev10.txt
@@ -424,14 +424,6 @@
     method public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
   }
 
-  public final class LayoutDirectionModifier {
-    method @Deprecated public androidx.ui.core.LayoutModifier getLtr();
-    method @Deprecated public androidx.ui.core.LayoutModifier getRtl();
-    property @Deprecated public final androidx.ui.core.LayoutModifier Ltr;
-    property @Deprecated public final androidx.ui.core.LayoutModifier Rtl;
-    field public static final androidx.ui.layout.LayoutDirectionModifier! INSTANCE;
-  }
-
   public final class LayoutDirectionsKt {
     method public static androidx.ui.core.Modifier getLtr(androidx.ui.core.Modifier);
     method public static androidx.ui.core.Modifier getRtl(androidx.ui.core.Modifier);
diff --git a/ui/ui-layout/api/restricted_0.1.0-dev11.txt b/ui/ui-layout/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..cc750a2
--- /dev/null
+++ b/ui/ui-layout/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,855 @@
+// Signature format: 3.0
+package androidx.ui.layout {
+
+  public final class AlignmentLineKt {
+    method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.unit.Dp before = 0.dp, androidx.ui.unit.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void CenterAlignmentLine(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public interface Arrangement {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion! Companion;
+  }
+
+  public static final class Arrangement.Bottom implements androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Bottom! INSTANCE;
+  }
+
+  public static final class Arrangement.Center implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Center! INSTANCE;
+  }
+
+  public static final class Arrangement.End implements androidx.ui.layout.Arrangement.Horizontal {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.End! INSTANCE;
+  }
+
+  public static interface Arrangement.Horizontal extends androidx.ui.layout.Arrangement {
+  }
+
+  public static final class Arrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.SpaceAround! INSTANCE;
+  }
+
+  public static final class Arrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.SpaceBetween! INSTANCE;
+  }
+
+  public static final class Arrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.SpaceEvenly! INSTANCE;
+  }
+
+  public static final class Arrangement.Start implements androidx.ui.layout.Arrangement.Horizontal {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Start! INSTANCE;
+  }
+
+  public static final class Arrangement.Top implements androidx.ui.layout.Arrangement.Vertical {
+    method public java.util.List<androidx.ui.unit.IntPx> arrange-SVHdN54(int totalSize, java.util.List<androidx.ui.unit.IntPx> size, androidx.ui.core.LayoutDirection layoutDirection);
+    field public static final androidx.ui.layout.Arrangement.Top! INSTANCE;
+  }
+
+  public static interface Arrangement.Vertical extends androidx.ui.layout.Arrangement {
+  }
+
+  @Deprecated public enum ColumnAlign {
+    enum_constant @Deprecated public static final androidx.ui.layout.ColumnAlign Center;
+    enum_constant @Deprecated public static final androidx.ui.layout.ColumnAlign End;
+    enum_constant @Deprecated public static final androidx.ui.layout.ColumnAlign Start;
+  }
+
+  public final class ColumnKt {
+    method public static void Column(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.Arrangement.Vertical verticalArrangement = Arrangement.Top, androidx.ui.core.Alignment.Horizontal horizontalGravity = Alignment.Start, kotlin.jvm.functions.Function1<? super androidx.ui.layout.ColumnScope,kotlin.Unit> children);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class ColumnScope {
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.VerticalAlignmentLine alignmentLine);
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,androidx.ui.unit.IntPx> alignmentLineBlock);
+    method public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
+    method @Deprecated public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.layout.ColumnAlign align);
+    method public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+    field public static final androidx.ui.layout.ColumnScope! INSTANCE;
+  }
+
+  public final class ConstraintLayoutKt {
+    method public static void ConstraintLayout(androidx.ui.layout.ConstraintSet constraintSet, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class ConstraintSet {
+    ctor public ConstraintSet(internal kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstraintSetBuilderScope,kotlin.Unit> description);
+    method public androidx.ui.layout.ConstraintSet copy(kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstraintSetBuilderScope,kotlin.Unit> description);
+  }
+
+  public final class ConstraintSetBuilderScope {
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.unit.Dp offset);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createRightBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createTopBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalChain createVerticalChain(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible getMaxWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getMaxWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible getMinWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getMinWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference getParent();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getSpread();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible getWrap();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getWrapFixed();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible max(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension max(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible min(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension min(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible, androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension percent(float percent);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference tag(Object tag);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible value(androidx.ui.unit.Dp dp);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension valueFixed(androidx.ui.unit.Dp dp);
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible maxWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension maxWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible minWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension minWrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference parent;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension spread;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible wrap;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension wrapFixed;
+  }
+
+  public static final class ConstraintSetBuilderScope.ChainStyle {
+    field public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion! Companion;
+  }
+
+  public static final class ConstraintSetBuilderScope.ChainStyle.Companion {
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Packed(float bias);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getPacked();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getSpread();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getSpreadInside();
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Packed;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Spread;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle SpreadInside;
+  }
+
+  public static final class ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor other);
+    method public androidx.constraintlayout.core.state.State getState();
+    method public Object getTag();
+  }
+
+  public final class ConstraintSetBuilderScope.ConstrainedLayoutReference {
+    method public void center();
+    method public void centerHorizontally();
+    method public void centerVertically();
+    method public infix void constrainHorizontallyTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public infix void constrainVerticallyTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor getBaseline();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getBottom();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getHeight();
+    method public float getHorizontalBias();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getLeft();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getRight();
+    method public Object getTag();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getTop();
+    method public float getVerticalBias();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getWidth();
+    method public void setBaseline(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor p);
+    method public void setBottom(androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor p);
+    method public void setHeight(androidx.ui.layout.ConstraintSetBuilderScope.Dimension value);
+    method public void setHorizontalBias(float value);
+    method public void setRight(androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor p);
+    method public void setVerticalBias(float value);
+    method public void setWidth(androidx.ui.layout.ConstraintSetBuilderScope.Dimension value);
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor baseline;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor bottom;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension height;
+    property public final float horizontalBias;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor left;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor right;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor top;
+    property public final float verticalBias;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension width;
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension {
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension.Coercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension.MaxCoercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  }
+
+  public static interface ConstraintSetBuilderScope.Dimension.MinCoercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  }
+
+  public abstract static sealed class ConstraintSetBuilderScope.HorizontalAnchor {
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor other);
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+    property public Object tag;
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+  }
+
+  public static final class ConstraintSetBuilderScope.HorizontalChain {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getLeft();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getRight();
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor left;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor right;
+  }
+
+  public abstract static sealed class ConstraintSetBuilderScope.VerticalAnchor {
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor other);
+    method public int getIndex$lintWithKotlin();
+    method public androidx.ui.unit.Dp getMargin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+    method public void setMargin(androidx.ui.unit.Dp value);
+    property public final androidx.ui.unit.Dp margin;
+    property public Object tag;
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+    method public int getIndex$lintWithKotlin();
+    method public androidx.constraintlayout.core.state.State getState$lintWithKotlin();
+    method public Object getTag$lintWithKotlin();
+  }
+
+  public static final class ConstraintSetBuilderScope.VerticalChain {
+    method public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getBottom();
+    method public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getTop();
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor bottom;
+    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor top;
+  }
+
+  public final class ContainerKt {
+    method @Deprecated public static void Container(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.InnerPadding padding = androidx.ui.layout.InnerPadding(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class CrossAxisAlignment {
+    field public static final androidx.ui.layout.CrossAxisAlignment.Companion! Companion;
+  }
+
+  public static final class CrossAxisAlignment.Companion {
+    method public androidx.ui.layout.CrossAxisAlignment AlignmentLine(androidx.ui.core.AlignmentLine alignmentLine);
+    method public androidx.ui.layout.CrossAxisAlignment getCenter();
+    method public androidx.ui.layout.CrossAxisAlignment getEnd();
+    method public androidx.ui.layout.CrossAxisAlignment getStart();
+    property public final androidx.ui.layout.CrossAxisAlignment Center;
+    property public final androidx.ui.layout.CrossAxisAlignment End;
+    property public final androidx.ui.layout.CrossAxisAlignment Start;
+  }
+
+  public final class DpConstraints {
+    ctor public DpConstraints(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    ctor public DpConstraints();
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.DpConstraints copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.Dp getMinWidth();
+    field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
+  }
+
+  public static final class DpConstraints.Companion {
+    method public androidx.ui.layout.DpConstraints fixed(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public androidx.ui.layout.DpConstraints fixedHeight(androidx.ui.unit.Dp height);
+    method public androidx.ui.layout.DpConstraints fixedWidth(androidx.ui.unit.Dp width);
+  }
+
+  public final class DpConstraintsKt {
+    method public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.Density, androidx.ui.layout.DpConstraints dpConstraints);
+    method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints);
+    method public static androidx.ui.layout.DpConstraints enforce(androidx.ui.layout.DpConstraints, androidx.ui.layout.DpConstraints otherConstraints);
+    method public static boolean getHasBoundedHeight(androidx.ui.layout.DpConstraints);
+    method public static boolean getHasBoundedWidth(androidx.ui.layout.DpConstraints);
+    method public static boolean getHasFixedHeight(androidx.ui.layout.DpConstraints);
+    method public static boolean getHasFixedWidth(androidx.ui.layout.DpConstraints);
+    method public static boolean getSatisfiable(androidx.ui.layout.DpConstraints);
+    method public static boolean isZero(androidx.ui.layout.DpConstraints);
+    method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp horizontal = 0.dp, androidx.ui.unit.Dp vertical = 0.dp);
+  }
+
+  @Deprecated public final class EdgeInsets {
+    ctor @Deprecated public EdgeInsets(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    ctor @Deprecated public EdgeInsets();
+    ctor @Deprecated public EdgeInsets(androidx.ui.unit.Dp all);
+    method @Deprecated public androidx.ui.unit.Dp component1();
+    method @Deprecated public androidx.ui.unit.Dp component2();
+    method @Deprecated public androidx.ui.unit.Dp component3();
+    method @Deprecated public androidx.ui.unit.Dp component4();
+    method @Deprecated public androidx.ui.layout.EdgeInsets copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method @Deprecated public androidx.ui.unit.Dp getBottom();
+    method @Deprecated public androidx.ui.unit.Dp getLeft();
+    method @Deprecated public androidx.ui.unit.Dp getRight();
+    method @Deprecated public androidx.ui.unit.Dp getTop();
+  }
+
+  public enum FlowCrossAxisAlignment {
+    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Center;
+    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment End;
+    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Start;
+  }
+
+  public final class FlowKt {
+    method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class InnerPadding {
+    ctor public InnerPadding(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    ctor public InnerPadding();
+    ctor public InnerPadding(androidx.ui.unit.Dp all);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.InnerPadding copy(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getEnd();
+    method public androidx.ui.unit.Dp getStart();
+    method public androidx.ui.unit.Dp getTop();
+  }
+
+  public final class IntrinsicKt {
+    method @Deprecated public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static void MaxIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static void MinIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static androidx.ui.core.Modifier preferredHeight(androidx.ui.core.Modifier, androidx.ui.layout.IntrinsicSize intrinsicSize);
+    method public static androidx.ui.core.Modifier preferredWidth(androidx.ui.core.Modifier, androidx.ui.layout.IntrinsicSize intrinsicSize);
+  }
+
+  public enum IntrinsicSize {
+    enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
+    enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
+  }
+
+  public final class LayoutAlign {
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottom();
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottomCenter();
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottomEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getBottomStart();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenter();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterHorizontally();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterStart();
+    method @Deprecated public androidx.ui.core.LayoutModifier getCenterVertically();
+    method @Deprecated public androidx.ui.core.LayoutModifier getEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getStart();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTop();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTopCenter();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTopEnd();
+    method @Deprecated public androidx.ui.core.LayoutModifier getTopStart();
+    property @Deprecated public final androidx.ui.core.LayoutModifier Bottom;
+    property @Deprecated public final androidx.ui.core.LayoutModifier BottomCenter;
+    property @Deprecated public final androidx.ui.core.LayoutModifier BottomEnd;
+    property @Deprecated public final androidx.ui.core.LayoutModifier BottomStart;
+    property @Deprecated public final androidx.ui.core.LayoutModifier Center;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterEnd;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterHorizontally;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterStart;
+    property @Deprecated public final androidx.ui.core.LayoutModifier CenterVertically;
+    property @Deprecated public final androidx.ui.core.LayoutModifier End;
+    property @Deprecated public final androidx.ui.core.LayoutModifier Start;
+    property @Deprecated public final androidx.ui.core.LayoutModifier Top;
+    property @Deprecated public final androidx.ui.core.LayoutModifier TopCenter;
+    property @Deprecated public final androidx.ui.core.LayoutModifier TopEnd;
+    property @Deprecated public final androidx.ui.core.LayoutModifier TopStart;
+    field public static final androidx.ui.layout.LayoutAlign! INSTANCE;
+  }
+
+  public final class LayoutAspectRatio implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutAspectRatio(@FloatRange(from=null, fromInclusive=null) float aspectRatio);
+    method public float component1();
+    method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
+    method public float getAspectRatio();
+    method public int maxIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutAspectRatioKt {
+    method public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
+  }
+
+  public final class LayoutDirectionsKt {
+    method public static androidx.ui.core.Modifier getLtr(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier getRtl(androidx.ui.core.Modifier);
+  }
+
+  public final class LayoutGravity {
+    field public static final androidx.ui.layout.LayoutGravity! INSTANCE;
+  }
+
+  public final class LayoutHeight implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight(androidx.ui.unit.Dp height);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutHeight copy(androidx.ui.unit.Dp height);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutHeight.Constrain implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight.Constrain(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  @Deprecated public static final class LayoutHeight.Fill implements androidx.ui.core.LayoutModifier {
+    method @Deprecated public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.LayoutHeight.Fill! INSTANCE;
+  }
+
+  public static final class LayoutHeight.Max implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight.Max(androidx.ui.unit.Dp maxHeight);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutHeight.Min implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutHeight.Min(androidx.ui.unit.Dp minHeight);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.unit.Dp minHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public final class LayoutOffset implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutOffset(androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutOffset copy(androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+    method public androidx.ui.unit.Dp getX();
+    method public androidx.ui.unit.Dp getY();
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutOffsetKt {
+    method public static androidx.ui.core.Modifier offset(androidx.ui.core.Modifier, androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+  }
+
+  public final class LayoutPadding implements androidx.ui.core.LayoutModifier2 {
+    ctor @Deprecated public LayoutPadding(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    ctor @Deprecated public LayoutPadding();
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.LayoutPadding copy(androidx.ui.unit.Dp start, androidx.ui.unit.Dp top, androidx.ui.unit.Dp end, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getEnd();
+    method public androidx.ui.unit.Dp getStart();
+    method public androidx.ui.unit.Dp getTop();
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutPaddingAbsolute implements androidx.ui.core.LayoutModifier2 {
+    ctor @Deprecated public LayoutPaddingAbsolute(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    ctor @Deprecated public LayoutPaddingAbsolute();
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.LayoutPaddingAbsolute copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getLeft();
+    method public androidx.ui.unit.Dp getRight();
+    method public androidx.ui.unit.Dp getTop();
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class LayoutPaddingKt {
+    method @Deprecated public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.unit.Dp all);
+    method public static androidx.ui.core.Modifier absolutePadding(androidx.ui.core.Modifier, androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+    method public static androidx.ui.core.Modifier padding(androidx.ui.core.Modifier, androidx.ui.unit.Dp start = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp end = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+    method public static androidx.ui.core.Modifier padding(androidx.ui.core.Modifier, androidx.ui.unit.Dp all);
+  }
+
+  @kotlin.DslMarker public @interface LayoutScopeMarker {
+  }
+
+  public final class LayoutSize implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    ctor @Deprecated public LayoutSize(androidx.ui.unit.Dp size);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutSize copy(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getHeight();
+    method public androidx.ui.unit.Dp getWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutSize.Constrain implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    ctor @Deprecated public LayoutSize.Constrain(androidx.ui.unit.Dp minSize, androidx.ui.unit.Dp maxSize);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  @Deprecated public static final class LayoutSize.Fill implements androidx.ui.core.LayoutModifier {
+    method @Deprecated public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.LayoutSize.Fill! INSTANCE;
+  }
+
+  public static final class LayoutSize.Max implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize.Max(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    ctor @Deprecated public LayoutSize.Max(androidx.ui.unit.Dp maxSize);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxHeight();
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutSize.Min implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutSize.Min(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+    ctor @Deprecated public LayoutSize.Min(androidx.ui.unit.Dp minSize);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMinHeight();
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public final class LayoutSizeKt {
+    method public static androidx.ui.core.Modifier fillMaxHeight(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier fillMaxSize(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier fillMaxWidth(androidx.ui.core.Modifier);
+    method public static androidx.ui.core.Modifier height(androidx.ui.core.Modifier, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier heightIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier preferredHeight(androidx.ui.core.Modifier, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier preferredHeightIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier preferredSize(androidx.ui.core.Modifier, androidx.ui.unit.Dp size);
+    method public static androidx.ui.core.Modifier preferredSize(androidx.ui.core.Modifier, androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier preferredSizeIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier preferredSizeIn(androidx.ui.core.Modifier, androidx.ui.layout.DpConstraints constraints);
+    method public static androidx.ui.core.Modifier preferredWidth(androidx.ui.core.Modifier, androidx.ui.unit.Dp width);
+    method public static androidx.ui.core.Modifier preferredWidthIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier size(androidx.ui.core.Modifier, androidx.ui.unit.Dp size);
+    method public static androidx.ui.core.Modifier size(androidx.ui.core.Modifier, androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public static androidx.ui.core.Modifier sizeIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp minHeight = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified, androidx.ui.unit.Dp maxHeight = Dp.Unspecified);
+    method public static androidx.ui.core.Modifier sizeIn(androidx.ui.core.Modifier, androidx.ui.layout.DpConstraints constraints);
+    method public static androidx.ui.core.Modifier width(androidx.ui.core.Modifier, androidx.ui.unit.Dp width);
+    method public static androidx.ui.core.Modifier widthIn(androidx.ui.core.Modifier, androidx.ui.unit.Dp minWidth = Dp.Unspecified, androidx.ui.unit.Dp maxWidth = Dp.Unspecified);
+    method @Deprecated public static androidx.ui.core.Modifier wrapContentHeight(androidx.ui.core.Modifier, androidx.ui.core.Alignment align = Alignment.Center);
+    method public static androidx.ui.core.Modifier wrapContentHeight(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align = Alignment.CenterVertically);
+    method public static androidx.ui.core.Modifier wrapContentSize(androidx.ui.core.Modifier, androidx.ui.core.Alignment align = Alignment.Center);
+    method @Deprecated public static androidx.ui.core.Modifier wrapContentWidth(androidx.ui.core.Modifier, androidx.ui.core.Alignment align = Alignment.Center);
+    method public static androidx.ui.core.Modifier wrapContentWidth(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align = Alignment.CenterHorizontally);
+  }
+
+  public final class LayoutWidth implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth(androidx.ui.unit.Dp width);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutWidth copy(androidx.ui.unit.Dp width);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutWidth.Constrain implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  @Deprecated public static final class LayoutWidth.Fill implements androidx.ui.core.LayoutModifier {
+    method @Deprecated public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    field @Deprecated public static final androidx.ui.layout.LayoutWidth.Fill! INSTANCE;
+  }
+
+  public static final class LayoutWidth.Max implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth.Max(androidx.ui.unit.Dp maxWidth);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.unit.Dp maxWidth);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMaxWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public static final class LayoutWidth.Min implements androidx.ui.core.LayoutModifier {
+    ctor @Deprecated public LayoutWidth.Min(androidx.ui.unit.Dp minWidth);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.unit.Dp minWidth);
+    method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
+    method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
+    method public androidx.ui.unit.Dp getMinWidth();
+    method public androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+    method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
+  }
+
+  public enum MainAxisAlignment {
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment Center;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment End;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceAround;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceBetween;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceEvenly;
+    enum_constant public static final androidx.ui.layout.MainAxisAlignment Start;
+  }
+
+  @Deprecated public enum RowAlign {
+    enum_constant @Deprecated public static final androidx.ui.layout.RowAlign Bottom;
+    enum_constant @Deprecated public static final androidx.ui.layout.RowAlign Center;
+    enum_constant @Deprecated public static final androidx.ui.layout.RowAlign Top;
+  }
+
+  public final class RowColumnImplKt {
+  }
+
+  public final class RowKt {
+    method public static void Row(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.Arrangement.Horizontal horizontalArrangement = Arrangement.Start, androidx.ui.core.Alignment.Vertical verticalGravity = Alignment.Top, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> children);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class RowScope {
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
+    method public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,androidx.ui.unit.IntPx> alignmentLineBlock);
+    method public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
+    method @Deprecated public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.layout.RowAlign align);
+    method public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
+    field public static final androidx.ui.layout.RowScope! INSTANCE;
+  }
+
+  public enum SizeMode {
+    enum_constant public static final androidx.ui.layout.SizeMode Expand;
+    enum_constant public static final androidx.ui.layout.SizeMode Wrap;
+  }
+
+  public final class SpacerKt {
+    method public static void Spacer(androidx.ui.core.Modifier modifier);
+  }
+
+  public final class StackKt {
+    method public static void Stack(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.layout.StackScope,kotlin.Unit> children);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class StackScope {
+    ctor public StackScope();
+    method public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment align);
+    method @Deprecated public androidx.ui.core.Modifier matchParent(androidx.ui.core.Modifier);
+    method public androidx.ui.core.Modifier matchParentSize(androidx.ui.core.Modifier);
+  }
+
+  @androidx.ui.layout.LayoutScopeMarker public final class TableChildren {
+    method public void tableDecoration(boolean overlay, kotlin.jvm.functions.Function1<? super androidx.ui.layout.TableDecorationChildren,kotlin.Unit> decoration);
+    method public void tableRow(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public abstract class TableColumnWidth {
+    method public int maxIntrinsicWidth-17UHc7E(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density, int availableHeight);
+    method public int minIntrinsicWidth-17UHc7E(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density, int availableHeight);
+    method public abstract int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.Fixed extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Fixed(androidx.ui.unit.Dp width);
+    method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.unit.Dp width);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.Flex extends androidx.ui.layout.TableColumnWidth {
+    ctor public TableColumnWidth.Flex(@FloatRange(from=null) float flex);
+    method public androidx.ui.layout.TableColumnWidth.Flex copy(float flex);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.Fraction extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Fraction(@FloatRange(from=null, to=null) float fraction);
+    method public androidx.ui.layout.TableColumnWidth.Fraction copy(float fraction);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public abstract static class TableColumnWidth.Inflexible extends androidx.ui.layout.TableColumnWidth {
+    ctor public TableColumnWidth.Inflexible();
+    method public final androidx.ui.layout.TableColumnWidth flexible(float flex);
+  }
+
+  public static final class TableColumnWidth.Max extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Max(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public androidx.ui.layout.TableColumnWidth.Max copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.MaxIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+    field public static final androidx.ui.layout.TableColumnWidth.MaxIntrinsic! INSTANCE;
+  }
+
+  public static final class TableColumnWidth.Min extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    ctor public TableColumnWidth.Min(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public androidx.ui.layout.TableColumnWidth.Min copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+  }
+
+  public static final class TableColumnWidth.MinIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+    field public static final androidx.ui.layout.TableColumnWidth.MinIntrinsic! INSTANCE;
+  }
+
+  public static final class TableColumnWidth.Wrap extends androidx.ui.layout.TableColumnWidth.Inflexible {
+    method public int preferredWidth-IoUeifE(java.util.List<androidx.ui.layout.TableMeasurable> cells, int containerWidth, androidx.ui.unit.Density density);
+    field public static final androidx.ui.layout.TableColumnWidth.Wrap! INSTANCE;
+  }
+
+  public final class TableDecorationChildren {
+    method public java.util.List<androidx.ui.unit.IntPx> component1();
+    method public java.util.List<androidx.ui.unit.IntPx> component2();
+    method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.unit.IntPx> verticalOffsets, java.util.List<androidx.ui.unit.IntPx> horizontalOffsets);
+    method public java.util.List<androidx.ui.unit.IntPx> getHorizontalOffsets();
+    method public java.util.List<androidx.ui.unit.IntPx> getVerticalOffsets();
+  }
+
+  public final class TableKt {
+    method public static void Table(int columns, kotlin.jvm.functions.Function1<? super java.lang.Integer,androidx.ui.core.Alignment> alignment = { Alignment.TopStart }, kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends androidx.ui.layout.TableColumnWidth> columnWidth = { TableColumnWidth.<init>(1.0) }, kotlin.jvm.functions.Function1<? super androidx.ui.layout.TableChildren,kotlin.Unit> children);
+  }
+
+  public final class TableMeasurable {
+    method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> component1();
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component2();
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component3();
+    method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> maxIntrinsicWidth);
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMaxIntrinsicWidth();
+    method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMinIntrinsicWidth();
+    method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> getPreferredWidth();
+  }
+
+}
+
diff --git a/ui/ui-layout/api/restricted_current.txt b/ui/ui-layout/api/restricted_current.txt
index 25b74f48..cc750a2 100644
--- a/ui/ui-layout/api/restricted_current.txt
+++ b/ui/ui-layout/api/restricted_current.txt
@@ -424,14 +424,6 @@
     method public static androidx.ui.core.Modifier aspectRatio(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float ratio);
   }
 
-  public final class LayoutDirectionModifier {
-    method @Deprecated public androidx.ui.core.LayoutModifier getLtr();
-    method @Deprecated public androidx.ui.core.LayoutModifier getRtl();
-    property @Deprecated public final androidx.ui.core.LayoutModifier Ltr;
-    property @Deprecated public final androidx.ui.core.LayoutModifier Rtl;
-    field public static final androidx.ui.layout.LayoutDirectionModifier! INSTANCE;
-  }
-
   public final class LayoutDirectionsKt {
     method public static androidx.ui.core.Modifier getLtr(androidx.ui.core.Modifier);
     method public static androidx.ui.core.Modifier getRtl(androidx.ui.core.Modifier);
diff --git a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemo.kt b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemo.kt
index e8b2651e..595980f 100644
--- a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemo.kt
+++ b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemo.kt
@@ -18,21 +18,37 @@
 
 import androidx.compose.Composable
 import androidx.ui.core.Modifier
-import androidx.ui.foundation.Box
 import androidx.ui.foundation.drawBackground
-import androidx.ui.foundation.drawBorder
 import androidx.ui.graphics.Color
-import androidx.ui.layout.size
+import androidx.ui.layout.Stack
+import androidx.ui.layout.fillMaxSize
+import androidx.ui.layout.ltr
+import androidx.ui.layout.padding
+import androidx.ui.layout.preferredSize
+import androidx.ui.layout.rtl
 import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
 
 @Composable
 fun ComplexLayoutDemo() {
-    Box(
-        Modifier
-            .drawBackground(Color.Blue)
-            .size(100.dp, 100.dp)
-            .drawBorder(1.dp, Color.LightGray)
-            .size(50.dp, 50.dp),
-        backgroundColor = Color.Red
-    )
+    Stack(Modifier.rtl
+        .drawBackground(Color.Magenta)
+        .padding(start = 10.dp)
+        .ltr
+        .padding(start = 10.dp)
+        .preferredSize(150.dp)
+        .rtl
+        .drawBackground(Color.Gray)
+        .padding(start = 10.dp)
+        .ltr
+        .padding(start = 10.dp)
+        .drawBackground(Color.Blue)
+        .rtl
+    ) {
+        Stack(Modifier
+            .padding(start = 10.dp)
+            .ltr
+            .padding(start = 10.dp)
+            .fillMaxSize().drawBackground(Color.Green)) {}
+    }
 }
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt
index 744bb4c..0705b47 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt
@@ -162,13 +162,13 @@
                     minIntrinsicHeightMeasureBlock = { _, _, _ -> 0.ipx },
                     maxIntrinsicWidthMeasureBlock = { _, _, _ -> 0.ipx },
                     maxIntrinsicHeightMeasureBlock = { _, _, _ -> 0.ipx }
-                ) { measurables, _, _ ->
+                ) { measurables, _, layoutDirection ->
                     val measurable = measurables.first()
                     test(
-                        { h -> measurable.minIntrinsicWidth(h) },
-                        { w -> measurable.minIntrinsicHeight(w) },
-                        { h -> measurable.maxIntrinsicWidth(h) },
-                        { w -> measurable.maxIntrinsicHeight(w) }
+                        { h -> measurable.minIntrinsicWidth(h, layoutDirection) },
+                        { w -> measurable.minIntrinsicHeight(w, layoutDirection) },
+                        { h -> measurable.maxIntrinsicWidth(h, layoutDirection) },
+                        { w -> measurable.maxIntrinsicHeight(w, layoutDirection) }
                     )
                     layoutLatch.countDown()
                     layout(0.ipx, 0.ipx) {}
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt
index 9da7064..d396102 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Column.kt
@@ -22,6 +22,8 @@
 import androidx.ui.core.Measured
 import androidx.ui.core.Modifier
 import androidx.ui.core.VerticalAlignmentLine
+import androidx.ui.layout.ColumnScope.alignWithSiblings
+import androidx.ui.layout.RowScope.alignWithSiblings
 import androidx.ui.unit.IntPx
 
 /**
@@ -106,7 +108,16 @@
 
     /**
      * Position the element horizontally such that its [alignmentLine] aligns with sibling elements
-     * also configured to [alignWithSiblings] with the same [alignmentLine].
+     * also configured to [alignWithSiblings]. [alignWithSiblings] is a form of [gravity],
+     * so both modifiers will not work together if specified for the same layout.
+     * Within a [Column], all components with [alignWithSiblings] will align horizontally using
+     * the specified [VerticalAlignmentLine]s or values provided using the other
+     * [alignWithSiblings] overload, forming a sibling group.
+     * At least one element of the sibling group will be placed as it had [Alignment.Start] gravity
+     * 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
+     * [alignWithSiblings] modifier specified the element will be positioned
+     * as if it had [Alignment.Start] gravity.
      *
      * Example usage:
      * @sample androidx.ui.layout.samples.SimpleRelativeToSiblingsInColumn
@@ -132,7 +143,16 @@
     /**
      * Position the element horizontally such that the alignment line for the content as
      * determined by [alignmentLineBlock] aligns with sibling elements also configured to
-     * [alignWithSiblings] with an [alignmentLineBlock].
+     * [alignWithSiblings]. [alignWithSiblings] is a form of [gravity], so both modifiers
+     * will not work together if specified for the same layout.
+     * Within a [Column], all components with [alignWithSiblings] will align horizontally using
+     * the specified [VerticalAlignmentLine]s or values obtained from [alignmentLineBlock],
+     * forming a sibling group.
+     * At least one element of the sibling group will be placed as it had [Alignment.Start] gravity
+     * 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
+     * [alignWithSiblings] modifier specified the element will be positioned
+     * as if it had [Alignment.Start] gravity.
      *
      * Example usage:
      * @sample androidx.ui.layout.samples.SimpleRelativeToSiblings
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt
index 6dbbd61..0721c0f 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt
@@ -40,10 +40,10 @@
 import androidx.ui.core.Constraints
 import androidx.ui.text.FirstBaseline
 import androidx.ui.core.Measurable
+import androidx.ui.core.MeasureScope
 import androidx.ui.core.Modifier
 import androidx.ui.core.MultiMeasureLayout
 import androidx.ui.core.Placeable
-import androidx.ui.core.Placeable.PlacementScope.place
 import androidx.ui.core.hasFixedHeight
 import androidx.ui.core.hasFixedWidth
 import androidx.ui.core.tag
@@ -73,7 +73,7 @@
             this
         )
         layout(layoutSize.width, layoutSize.height) {
-            measurer.performLayout()
+            with(measurer) { performLayout() }
         }
     }
 }
@@ -728,6 +728,7 @@
     private val root = ConstraintWidgetContainer(0, 0).also { it.measurer = this }
     private val placeables = mutableMapOf<Measurable, Placeable>()
     private lateinit var density: Density
+    private lateinit var measureScope: MeasureScope
     private val state = object : State() {
         lateinit var rootIncomingConstraints: Constraints
 
@@ -791,7 +792,9 @@
             if (DEBUG) {
                 Log.d("CCL", "Measuring ${measurable.tag} with $constraints")
             }
-            val placeable = measurable.measure(constraints).also { placeables[measurable] = it }
+            val placeable = with(measureScope) {
+                measurable.measure(constraints).also { placeables[measurable] = it }
+            }
             if (DEBUG) {
                 Log.d("CCL", "${measurable.tag} is size ${placeable.width} ${placeable.height}")
             }
@@ -824,7 +827,9 @@
                 if (DEBUG) {
                     Log.d("CCL", "Remeasuring coerced ${measurable.tag} with $constraints")
                 }
-                measurable.measure(constraints).also { placeables[measurable] = it }
+                with(measureScope) {
+                    measurable.measure(constraints).also { placeables[measurable] = it }
+                }
             }
         }
 
@@ -874,9 +879,10 @@
         constraints: Constraints,
         constraintSet: ConstraintSet,
         measurables: List<Measurable>,
-        density: Density
+        measureScope: MeasureScope
     ): IntPxSize {
-        this.density = density
+        this.density = measureScope
+        this.measureScope = measureScope
         state.reset()
         // Add tags.
         measurables.forEach { measurable ->
@@ -930,9 +936,11 @@
                                 "to confirm size ${child.width} ${child.height}"
                     )
                 }
-                measurable.measure(
-                    Constraints.fixed(child.width.ipx, child.height.ipx)
-                ).also { placeables[measurable] = it }
+                with(measureScope) {
+                    measurable.measure(
+                        Constraints.fixed(child.width.ipx, child.height.ipx)
+                    ).also { placeables[measurable] = it }
+                }
             }
         }
         if (DEBUG) {
@@ -942,7 +950,7 @@
         return IntPxSize(root.width.ipx, root.height.ipx)
     }
 
-    fun performLayout() {
+    fun Placeable.PlacementScope.performLayout() {
         for (child in root.children) {
             val measurable = child.companionWidget
             if (measurable !is Measurable) continue
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
index bd7e9ad..508d5aa 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
@@ -19,6 +19,7 @@
 import androidx.compose.Composable
 import androidx.ui.core.Constraints
 import androidx.ui.core.IntrinsicMeasurable
+import androidx.ui.core.IntrinsicMeasureScope
 import androidx.ui.core.Layout
 import androidx.ui.core.LayoutDirection
 import androidx.ui.core.LayoutModifier2
@@ -26,7 +27,6 @@
 import androidx.ui.core.MeasureScope
 import androidx.ui.core.Modifier
 import androidx.ui.core.enforce
-import androidx.ui.unit.Density
 import androidx.ui.unit.IntPx
 import androidx.ui.unit.IntPxPosition
 import androidx.ui.unit.ipx
@@ -77,69 +77,77 @@
 private object PreferredMinIntrinsicWidthModifier : PreferredIntrinsicSizeModifier {
     override fun calculateContentConstraints(
         measurable: Measurable,
-        constraints: Constraints
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
     ): Constraints {
-        val width = measurable.minIntrinsicWidth(constraints.maxHeight)
+        val width = measurable.minIntrinsicWidth(constraints.maxHeight, layoutDirection)
         return Constraints.fixedWidth(width)
     }
 
-    override fun Density.maxIntrinsicWidth(
+    override fun IntrinsicMeasureScope.maxIntrinsicWidth(
         measurable: IntrinsicMeasurable,
         height: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.minIntrinsicWidth(height)
+    ) = measurable.minIntrinsicWidth(height, layoutDirection)
 }
 
 private object PreferredMinIntrinsicHeightModifier : PreferredIntrinsicSizeModifier {
     override fun calculateContentConstraints(
         measurable: Measurable,
-        constraints: Constraints
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
     ): Constraints {
-        val height = measurable.minIntrinsicHeight(constraints.maxWidth)
+        val height = measurable.minIntrinsicHeight(constraints.maxWidth, layoutDirection)
         return Constraints.fixedHeight(height)
     }
 
-    override fun Density.maxIntrinsicHeight(
+    override fun IntrinsicMeasureScope.maxIntrinsicHeight(
         measurable: IntrinsicMeasurable,
         width: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.minIntrinsicHeight(width)
+    ) = measurable.minIntrinsicHeight(width, layoutDirection)
 }
 
 private object PreferredMaxIntrinsicWidthModifier : PreferredIntrinsicSizeModifier {
     override fun calculateContentConstraints(
         measurable: Measurable,
-        constraints: Constraints
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
     ): Constraints {
-        val width = measurable.maxIntrinsicWidth(constraints.maxHeight)
+        val width = measurable.maxIntrinsicWidth(constraints.maxHeight, layoutDirection)
         return Constraints.fixedWidth(width)
     }
 
-    override fun Density.minIntrinsicWidth(
+    override fun IntrinsicMeasureScope.minIntrinsicWidth(
         measurable: IntrinsicMeasurable,
         height: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.maxIntrinsicWidth(height)
+    ) = measurable.maxIntrinsicWidth(height, layoutDirection)
 }
 
 private object PreferredMaxIntrinsicHeightModifier : PreferredIntrinsicSizeModifier {
     override fun calculateContentConstraints(
         measurable: Measurable,
-        constraints: Constraints
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
     ): Constraints {
-        val height = measurable.maxIntrinsicHeight(constraints.maxWidth)
+        val height = measurable.maxIntrinsicHeight(constraints.maxWidth, layoutDirection)
         return Constraints.fixedHeight(height)
     }
 
-    override fun Density.minIntrinsicHeight(
+    override fun IntrinsicMeasureScope.minIntrinsicHeight(
         measurable: IntrinsicMeasurable,
         width: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.maxIntrinsicHeight(width)
+    ) = measurable.maxIntrinsicHeight(width, layoutDirection)
 }
 
 private interface PreferredIntrinsicSizeModifier : LayoutModifier2 {
-    fun calculateContentConstraints(measurable: Measurable, constraints: Constraints): Constraints
+    fun calculateContentConstraints(
+        measurable: Measurable,
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
+    ): Constraints
 
     override fun MeasureScope.measure(
         measurable: Measurable,
@@ -147,36 +155,40 @@
         layoutDirection: LayoutDirection
     ): MeasureScope.MeasureResult {
         val placeable = measurable.measure(
-            calculateContentConstraints(measurable, constraints).enforce(constraints)
+            calculateContentConstraints(
+                measurable,
+                constraints,
+                layoutDirection
+            ).enforce(constraints)
         )
         return layout(placeable.width, placeable.height) {
             placeable.place(IntPxPosition.Origin)
         }
     }
 
-    override fun Density.minIntrinsicWidth(
+    override fun IntrinsicMeasureScope.minIntrinsicWidth(
         measurable: IntrinsicMeasurable,
         height: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.minIntrinsicWidth(height)
+    ) = measurable.minIntrinsicWidth(height, layoutDirection)
 
-    override fun Density.minIntrinsicHeight(
+    override fun IntrinsicMeasureScope.minIntrinsicHeight(
         measurable: IntrinsicMeasurable,
         width: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.minIntrinsicHeight(width)
+    ) = measurable.minIntrinsicHeight(width, layoutDirection)
 
-    override fun Density.maxIntrinsicWidth(
+    override fun IntrinsicMeasureScope.maxIntrinsicWidth(
         measurable: IntrinsicMeasurable,
         height: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.maxIntrinsicWidth(height)
+    ) = measurable.maxIntrinsicWidth(height, layoutDirection)
 
-    override fun Density.maxIntrinsicHeight(
+    override fun IntrinsicMeasureScope.maxIntrinsicHeight(
         measurable: IntrinsicMeasurable,
         width: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.maxIntrinsicHeight(width)
+    ) = measurable.maxIntrinsicHeight(width, layoutDirection)
 }
 
 /**
@@ -203,7 +215,7 @@
         }
     ) { measurables, constraints, _ ->
         val measurable = measurables.firstOrNull()
-        val width = measurable?.minIntrinsicWidth(constraints.maxHeight) ?: 0.ipx
+        val width = measurable?.minIntrinsicWidth(constraints.maxHeight, layoutDirection) ?: 0.ipx
         val placeable = measurable?.measure(
             Constraints.fixedWidth(width).enforce(constraints)
         )
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt
index f1389e5..2277d1d 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt
@@ -95,7 +95,7 @@
         height: IntPx,
         layoutDirection: LayoutDirection
     ): IntPx {
-        return if (height == IntPx.Infinity) measurable.minIntrinsicWidth(height)
+        return if (height == IntPx.Infinity) measurable.minIntrinsicWidth(height, layoutDirection)
         else height * aspectRatio
     }
 
@@ -104,7 +104,7 @@
         height: IntPx,
         layoutDirection: LayoutDirection
     ): IntPx {
-        return if (height == IntPx.Infinity) measurable.maxIntrinsicWidth(height)
+        return if (height == IntPx.Infinity) measurable.maxIntrinsicWidth(height, layoutDirection)
         else height * aspectRatio
     }
 
@@ -113,7 +113,7 @@
         width: IntPx,
         layoutDirection: LayoutDirection
     ): IntPx {
-        return if (width == IntPx.Infinity) measurable.minIntrinsicHeight(width)
+        return if (width == IntPx.Infinity) measurable.minIntrinsicHeight(width, layoutDirection)
         else width / aspectRatio
     }
 
@@ -122,7 +122,7 @@
         width: IntPx,
         layoutDirection: LayoutDirection
     ): IntPx {
-        return if (width == IntPx.Infinity) measurable.maxIntrinsicHeight(width)
+        return if (width == IntPx.Infinity) measurable.maxIntrinsicHeight(width, layoutDirection)
         else width / aspectRatio
     }
 }
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutDirections.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutDirections.kt
index 3cd5c98..17d206d 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutDirections.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutDirections.kt
@@ -14,53 +14,68 @@
  * limitations under the License.
  */
 
-@file:Suppress("Deprecation")
-
 package androidx.ui.layout
 
+import androidx.ui.core.Constraints
+import androidx.ui.core.IntrinsicMeasurable
+import androidx.ui.core.IntrinsicMeasureScope
 import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier
+import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.Measurable
+import androidx.ui.core.MeasureScope
 import androidx.ui.core.Modifier
-import androidx.ui.unit.Density
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.ipx
 
 /**
- * Changes the [LayoutDirection] of the content to [LayoutDirection.Ltr].
+ * [Modifier] that changes the [LayoutDirection] of the wrapped layout to [LayoutDirection.Ltr].
  */
-val Modifier.ltr: Modifier get() = this + LayoutDirectionModifier.Ltr
+val Modifier.ltr: Modifier get() = this + LtrModifier
 
 /**
- * Changes the [LayoutDirection] of the content to [LayoutDirection.Rtl].
+ * [Modifier] that changes the [LayoutDirection] of the wrapped layout to [LayoutDirection.Rtl].
  */
-val Modifier.rtl: Modifier get() = this + LayoutDirectionModifier.Rtl
+val Modifier.rtl: Modifier get() = this + RtlModifier
 
-/**
- * A layout modifier that changes the layout direction of the corresponding layout node.
- */
-object LayoutDirectionModifier {
-    @Deprecated(
-        "Use Modifier.ltr",
-        replaceWith = ReplaceWith(
-            "Modifier.ltr",
-            "androidx.ui.core.Modifier",
-            "androidx.ui.layout.ltr"
-        )
-    )
-    val Ltr: LayoutModifier = LayoutDirectionModifierImpl(LayoutDirection.Ltr)
+private val LtrModifier = LayoutDirectionModifier(LayoutDirection.Ltr)
 
-    @Deprecated(
-        "Use Modifier.rtl",
-        replaceWith = ReplaceWith(
-            "Modifier.rtl",
-            "androidx.ui.core.Modifier",
-            "androidx.ui.layout.ltr"
-        )
-    )
-    val Rtl: LayoutModifier = LayoutDirectionModifierImpl(LayoutDirection.Rtl)
-}
+private val RtlModifier = LayoutDirectionModifier(LayoutDirection.Rtl)
 
-private data class LayoutDirectionModifierImpl(
-    val newLayoutDirection: LayoutDirection
-) : LayoutModifier {
-    override fun Density.modifyLayoutDirection(layoutDirection: LayoutDirection) =
-        newLayoutDirection
+private data class LayoutDirectionModifier(
+    val prescribedLayoutDirection: LayoutDirection
+) : LayoutModifier2 {
+    override fun MeasureScope.measure(
+        measurable: Measurable,
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
+    ): MeasureScope.MeasureResult {
+        val placeable = measurable.measure(constraints, prescribedLayoutDirection)
+        return layout(placeable.width, placeable.height) {
+            placeable.place(0.ipx, 0.ipx)
+        }
+    }
+
+    override fun IntrinsicMeasureScope.minIntrinsicWidth(
+        measurable: IntrinsicMeasurable,
+        height: IntPx,
+        layoutDirection: LayoutDirection
+    ) = measurable.minIntrinsicWidth(height, prescribedLayoutDirection)
+
+    override fun IntrinsicMeasureScope.minIntrinsicHeight(
+        measurable: IntrinsicMeasurable,
+        width: IntPx,
+        layoutDirection: LayoutDirection
+    ) = measurable.minIntrinsicHeight(width, prescribedLayoutDirection)
+
+    override fun IntrinsicMeasureScope.maxIntrinsicWidth(
+        measurable: IntrinsicMeasurable,
+        height: IntPx,
+        layoutDirection: LayoutDirection
+    ) = measurable.maxIntrinsicWidth(height, prescribedLayoutDirection)
+
+    override fun IntrinsicMeasureScope.maxIntrinsicHeight(
+        measurable: IntrinsicMeasurable,
+        width: IntPx,
+        layoutDirection: LayoutDirection
+    ) = measurable.maxIntrinsicHeight(width, prescribedLayoutDirection)
 }
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutPadding.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutPadding.kt
index 7260250..5a8b763 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutPadding.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutPadding.kt
@@ -159,12 +159,7 @@
         val height = (placeable.height + vertical)
             .coerceIn(constraints.minHeight, constraints.maxHeight)
         return layout(width, height) {
-            // TODO (b/153317665) use place() instead when bug is fixed
-            if (layoutDirection == LayoutDirection.Ltr) {
-                placeable.placeAbsolute(start.toIntPx(), top.toIntPx())
-            } else {
-                placeable.placeAbsolute(width - placeable.width - start.toIntPx(), top.toIntPx())
-            }
+            placeable.place(start.toIntPx(), top.toIntPx())
         }
     }
 }
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutSize.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutSize.kt
index 914524a..9fec23b 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutSize.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutSize.kt
@@ -378,7 +378,7 @@
         measurable: Measurable,
         height: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.minIntrinsicWidth(height).let {
+    ) = measurable.minIntrinsicWidth(height, layoutDirection).let {
         val constraints = Constraints(targetConstraints)
         it.coerceIn(constraints.minWidth, constraints.maxWidth)
     }
@@ -387,7 +387,7 @@
         measurable: Measurable,
         height: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.maxIntrinsicWidth(height).let {
+    ) = measurable.maxIntrinsicWidth(height, layoutDirection).let {
         val constraints = Constraints(targetConstraints)
         it.coerceIn(constraints.minWidth, constraints.maxWidth)
     }
@@ -396,7 +396,7 @@
         measurable: Measurable,
         width: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.minIntrinsicHeight(width).let {
+    ) = measurable.minIntrinsicHeight(width, layoutDirection).let {
         val constraints = Constraints(targetConstraints)
         it.coerceIn(constraints.minHeight, constraints.maxHeight)
     }
@@ -405,7 +405,7 @@
         measurable: Measurable,
         width: IntPx,
         layoutDirection: LayoutDirection
-    ) = measurable.maxIntrinsicHeight(width).let {
+    ) = measurable.maxIntrinsicHeight(width, layoutDirection).let {
         val constraints = Constraints(targetConstraints)
         it.coerceIn(constraints.minHeight, constraints.maxHeight)
     }
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt
index 0ad27f2..b5ab86c 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Row.kt
@@ -106,7 +106,18 @@
 
     /**
      * Position the element vertically such that its [alignmentLine] aligns with sibling elements
-     * also configured to [alignWithSiblings] with the same [alignmentLine].
+     * also configured to [alignWithSiblings]. [alignWithSiblings] is a form of [gravity],
+     * so both modifiers will not work together if specified for the same layout.
+     * [alignWithSiblings] can be used to align two layouts by baseline inside a [Row],
+     * using `alignWithSiblings(FirstBaseline)`.
+     * Within a [Row], all components with [alignWithSiblings] will align vertically using
+     * the specified [HorizontalAlignmentLine]s or values provided using the other
+     * [alignWithSiblings] overload, forming a sibling group.
+     * At least one element of the sibling group will be placed as it had [Alignment.Top] gravity
+     * in [Row], 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 [Row] has the
+     * [alignWithSiblings] modifier specified the element will be positioned
+     * as if it had [Alignment.Top] gravity.
      *
      * Example usage:
      * @sample androidx.ui.layout.samples.SimpleRelativeToSiblingsInRow
@@ -130,7 +141,16 @@
     /**
      * Position the element vertically such that the alignment line for the content as
      * determined by [alignmentLineBlock] aligns with sibling elements also configured to
-     * [alignWithSiblings] with an [alignmentLineBlock].
+     * [alignWithSiblings]. [alignWithSiblings] is a form of [gravity], so both modifiers
+     * will not work together if specified for the same layout.
+     * Within a [Row], all components with [alignWithSiblings] will align vertically using
+     * the specified [HorizontalAlignmentLine]s or values obtained from [alignmentLineBlock],
+     * forming a sibling group.
+     * At least one element of the sibling group will be placed as it had [Alignment.Top] gravity
+     * in [Row], 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 [Row] has the
+     * [alignWithSiblings] modifier specified the element will be positioned
+     * as if it had [Alignment.Top] gravity.
      *
      * Example usage:
      * @sample androidx.ui.layout.samples.SimpleRelativeToSiblings
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Table.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Table.kt
index 3a65f09..b4dbd49 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Table.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Table.kt
@@ -25,6 +25,7 @@
 import androidx.ui.core.Constraints
 import androidx.ui.core.IntrinsicMeasurable
 import androidx.ui.core.IntrinsicMeasureBlock
+import androidx.ui.core.IntrinsicMeasureScope
 import androidx.ui.core.Layout
 import androidx.ui.core.ParentData
 import androidx.ui.core.Placeable
@@ -689,7 +690,7 @@
         }
     }
 
-private fun Density.intrinsicWidth(
+private fun IntrinsicMeasureScope.intrinsicWidth(
     columns: Int,
     columnWidth: (columnIndex: Int) -> TableColumnWidth,
     children: List<IntrinsicMeasurable>,
@@ -732,7 +733,7 @@
     return flexibleSpace * totalFlex + inflexibleSpace
 }
 
-private fun Density.intrinsicHeight(
+private fun IntrinsicMeasureScope.intrinsicHeight(
     columns: Int,
     columnWidth: (columnIndex: Int) -> TableColumnWidth,
     children: List<IntrinsicMeasurable>,
diff --git a/ui/ui-livedata/api/0.1.0-dev11.txt b/ui/ui-livedata/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..fe1bdb1
--- /dev/null
+++ b/ui/ui-livedata/api/0.1.0-dev11.txt
@@ -0,0 +1,10 @@
+// Signature format: 3.0
+package androidx.ui.livedata {
+
+  public final class LiveDataAdapterKt {
+    method public static inline <T> androidx.compose.State<T> observeAsState(androidx.lifecycle.LiveData<T>);
+    method public static <R, T extends R> androidx.compose.State<R> observeAsState(androidx.lifecycle.LiveData<T>, R? initial);
+  }
+
+}
+
diff --git a/ui/ui-livedata/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-livedata/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..fe1bdb1
--- /dev/null
+++ b/ui/ui-livedata/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,10 @@
+// Signature format: 3.0
+package androidx.ui.livedata {
+
+  public final class LiveDataAdapterKt {
+    method public static inline <T> androidx.compose.State<T> observeAsState(androidx.lifecycle.LiveData<T>);
+    method public static <R, T extends R> androidx.compose.State<R> observeAsState(androidx.lifecycle.LiveData<T>, R? initial);
+  }
+
+}
+
diff --git a/ui/ui-livedata/api/res-0.1.0-dev11.txt b/ui/ui-livedata/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-livedata/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-livedata/api/restricted_0.1.0-dev11.txt b/ui/ui-livedata/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..fe1bdb1
--- /dev/null
+++ b/ui/ui-livedata/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,10 @@
+// Signature format: 3.0
+package androidx.ui.livedata {
+
+  public final class LiveDataAdapterKt {
+    method public static inline <T> androidx.compose.State<T> observeAsState(androidx.lifecycle.LiveData<T>);
+    method public static <R, T extends R> androidx.compose.State<R> observeAsState(androidx.lifecycle.LiveData<T>, R? initial);
+  }
+
+}
+
diff --git a/ui/ui-material/api/0.1.0-dev10.txt b/ui/ui-material/api/0.1.0-dev10.txt
index 6a5eace..752b42a 100644
--- a/ui/ui-material/api/0.1.0-dev10.txt
+++ b/ui/ui-material/api/0.1.0-dev10.txt
@@ -126,8 +126,8 @@
   }
 
   public final class FloatingActionButtonKt {
-    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
-    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
+    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
   }
 
   public final class IconButtonKt {
diff --git a/ui/ui-material/api/0.1.0-dev11.txt b/ui/ui-material/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..752b42a
--- /dev/null
+++ b/ui/ui-material/api/0.1.0-dev11.txt
@@ -0,0 +1,352 @@
+// Signature format: 3.0
+package androidx.ui.material {
+
+  public enum AlertDialogButtonLayout {
+    enum_constant public static final androidx.ui.material.AlertDialogButtonLayout SideBySide;
+    enum_constant public static final androidx.ui.material.AlertDialogButtonLayout Stacked;
+  }
+
+  public final class AlertDialogKt {
+    method public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onCloseRequest, kotlin.jvm.functions.Function0<kotlin.Unit>? title = null, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton = null, androidx.ui.material.AlertDialogButtonLayout buttonLayout = androidx.ui.material.AlertDialogButtonLayout.SideBySide, androidx.ui.graphics.Shape shape = medium);
+    method public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onCloseRequest, kotlin.jvm.functions.Function0<kotlin.Unit>? title = null, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, androidx.ui.graphics.Shape shape = medium);
+  }
+
+  public final class AppBarKt {
+    method public static void BottomAppBar-GqrRtJg(androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.material.BottomAppBar.FabConfiguration? fabConfiguration = null, androidx.ui.graphics.Shape? cutoutShape = null, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> content);
+    method public static void TopAppBar-FikZsjU(kotlin.jvm.functions.Function0<kotlin.Unit> title, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? navigationIcon = null, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> actions = {}, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = androidx.ui.material.AppBarKt.TopAppBarElevation);
+    method public static void TopAppBar-oP-1cd0(androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = androidx.ui.material.AppBarKt.TopAppBarElevation, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> content);
+  }
+
+  public final class BottomAppBar {
+    field public static final androidx.ui.material.BottomAppBar! INSTANCE;
+  }
+
+  public static final class BottomAppBar.FabConfiguration {
+    ctor public BottomAppBar.FabConfiguration(internal androidx.ui.unit.IntPxSize fabSize, internal androidx.ui.unit.PxPosition fabTopLeftPosition, internal androidx.ui.material.BottomAppBar.FabDockedPosition fabDockedPosition);
+    method public androidx.ui.material.BottomAppBar.FabConfiguration copy(androidx.ui.unit.IntPxSize fabSize, androidx.ui.unit.PxPosition fabTopLeftPosition, androidx.ui.material.BottomAppBar.FabDockedPosition fabDockedPosition);
+  }
+
+  public enum BottomAppBar.FabDockedPosition {
+    enum_constant public static final androidx.ui.material.BottomAppBar.FabDockedPosition Center;
+    enum_constant public static final androidx.ui.material.BottomAppBar.FabDockedPosition End;
+  }
+
+  public final class BottomNavigationKt {
+    method public static void BottomNavigation-oP-1cd0(androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = androidx.ui.material.BottomNavigationKt.BottomNavigationElevation, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> content);
+    method public static void BottomNavigationItem-dOPBtLY(kotlin.jvm.functions.Function0<kotlin.Unit> icon, kotlin.jvm.functions.Function0<kotlin.Unit> text = emptyContent(), boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, androidx.ui.core.Modifier modifier = Modifier, boolean alwaysShowLabels = true, long activeColor = contentColor(), long inactiveColor = EmphasisAmbient.current.medium.emphasize(activeColor));
+  }
+
+  public final class Button {
+    method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
+    property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
+    field public static final androidx.ui.material.Button! INSTANCE;
+  }
+
+  public final class ButtonKt {
+    method public static void Button-MQxsNoc(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, androidx.ui.unit.Dp elevation = 2.dp, androidx.ui.graphics.Shape shape = small, androidx.ui.foundation.Border? border = null, long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.layout.InnerPadding padding = Button.DefaultInnerPadding, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+    method public static inline void OutlinedButton-MQxsNoc(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, androidx.ui.unit.Dp elevation = 0.dp, androidx.ui.graphics.Shape shape = small, androidx.ui.foundation.Border? border = Border(1.dp, MaterialTheme.colors.onSurface.copy(OutlinedStrokeOpacity)), long backgroundColor = MaterialTheme.colors.surface, long contentColor = MaterialTheme.colors.primary, androidx.ui.layout.InnerPadding padding = Button.DefaultInnerPadding, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+    method public static inline void TextButton-MQxsNoc(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, androidx.ui.unit.Dp elevation = 0.dp, androidx.ui.graphics.Shape shape = small, androidx.ui.foundation.Border? border = null, long backgroundColor = Color.Transparent, long contentColor = MaterialTheme.colors.primary, androidx.ui.layout.InnerPadding padding = TextButton.DefaultInnerPadding, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+  }
+
+  public final class CardKt {
+    method public static void Card-r7cpYJI(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = medium, long color = MaterialTheme.colors.surface, long contentColor = contentColorFor(color), androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp elevation = 1.dp, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class CheckboxKt {
+    method public static void Checkbox-D4zOgQA(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.secondary);
+    method public static void TriStateCheckbox--Buf9SY(androidx.ui.foundation.selection.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.secondary);
+  }
+
+  public final class ColorKt {
+    method public static long contentColorFor-QEYXlZo(long color);
+    method public static long contentColorFor-ZITCLTE(androidx.ui.material.ColorPalette, long color);
+    method public static androidx.ui.material.ColorPalette darkColorPalette-bz757pg(long primary = Color(4290479868), long primaryVariant = Color(4281794739), long secondary = Color(4278442694), long background = Color(4279374354), long surface = Color(4279374354), long error = Color(4291782265), long onPrimary = Color.Black, long onSecondary = Color.Black, long onBackground = Color.White, long onSurface = Color.White, long onError = Color.Black);
+    method public static androidx.ui.material.ColorPalette lightColorPalette-eO6A0Mk(long primary = Color(4284612846), long primaryVariant = Color(4281794739), long secondary = Color(4278442694), long secondaryVariant = Color(4278290310), long background = Color.White, long surface = Color.White, long error = Color(4289724448), long onPrimary = Color.White, long onSecondary = Color.Black, long onBackground = Color.Black, long onSurface = Color.Black, long onError = Color.White);
+  }
+
+  public interface ColorPalette {
+    method public long getBackground();
+    method public long getError();
+    method public long getOnBackground();
+    method public long getOnError();
+    method public long getOnPrimary();
+    method public long getOnSecondary();
+    method public long getOnSurface();
+    method public long getPrimary();
+    method public long getPrimaryVariant();
+    method public long getSecondary();
+    method public long getSecondaryVariant();
+    method public long getSurface();
+    method public boolean isLight();
+    property public abstract long background;
+    property public abstract long error;
+    property public abstract boolean isLight;
+    property public abstract long onBackground;
+    property public abstract long onError;
+    property public abstract long onPrimary;
+    property public abstract long onSecondary;
+    property public abstract long onSurface;
+    property public abstract long primary;
+    property public abstract long primaryVariant;
+    property public abstract long secondary;
+    property public abstract long secondaryVariant;
+    property public abstract long surface;
+  }
+
+  public final class DividerKt {
+    method public static void Divider-5sN9_mQ(androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.surface, androidx.ui.unit.Dp thickness = 1.dp, androidx.ui.unit.Dp startIndent = 0.dp);
+  }
+
+  public final class DrawerKt {
+    method public static void BottomDrawerLayout(androidx.ui.material.DrawerState drawerState, kotlin.jvm.functions.Function1<? super androidx.ui.material.DrawerState,kotlin.Unit> onStateChange, boolean gesturesEnabled = true, kotlin.jvm.functions.Function0<kotlin.Unit> drawerContent, kotlin.jvm.functions.Function0<kotlin.Unit> bodyContent);
+    method public static void ModalDrawerLayout(androidx.ui.material.DrawerState drawerState, kotlin.jvm.functions.Function1<? super androidx.ui.material.DrawerState,kotlin.Unit> onStateChange, boolean gesturesEnabled = true, kotlin.jvm.functions.Function0<kotlin.Unit> drawerContent, kotlin.jvm.functions.Function0<kotlin.Unit> bodyContent);
+  }
+
+  public enum DrawerState {
+    enum_constant public static final androidx.ui.material.DrawerState Closed;
+    enum_constant public static final androidx.ui.material.DrawerState Opened;
+  }
+
+  public interface Emphasis {
+    method public long emphasize-QEYXlZo(long color);
+  }
+
+  public final class EmphasisKt {
+    method public static void ProvideEmphasis(androidx.ui.material.Emphasis emphasis, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static androidx.compose.Ambient<androidx.ui.material.EmphasisLevels> getEmphasisAmbient();
+  }
+
+  public interface EmphasisLevels {
+    method public androidx.ui.material.Emphasis getDisabled();
+    method public androidx.ui.material.Emphasis getHigh();
+    method public androidx.ui.material.Emphasis getMedium();
+    property public abstract androidx.ui.material.Emphasis disabled;
+    property public abstract androidx.ui.material.Emphasis high;
+    property public abstract androidx.ui.material.Emphasis medium;
+  }
+
+  public final class FloatingActionButtonKt {
+    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
+    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+  }
+
+  public final class IconButtonKt {
+    method public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+    method public static void IconToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+  }
+
+  public final class ListItemKt {
+    method public static void ListItem(String text, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick = null, androidx.ui.graphics.ImageAsset? icon = null, String? secondaryText = null, boolean singleLineSecondaryText = true, String? overlineText = null, String? metaText = null);
+    method public static void ListItem(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick = null, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? secondaryText = null, boolean singleLineSecondaryText = true, kotlin.jvm.functions.Function0<kotlin.Unit>? overlineText = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailing = null, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+  }
+
+  public final class MaterialTheme {
+    method public androidx.ui.material.ColorPalette getColors();
+    method public androidx.ui.material.Shapes getShapes();
+    method public androidx.ui.material.Typography getTypography();
+    property public final androidx.ui.material.ColorPalette colors;
+    property public final androidx.ui.material.Shapes shapes;
+    property public final androidx.ui.material.Typography typography;
+    field public static final androidx.ui.material.MaterialTheme! INSTANCE;
+  }
+
+  public final class MaterialThemeKt {
+    method public static void MaterialTheme(androidx.ui.material.ColorPalette colors = MaterialTheme.colors, androidx.ui.material.Typography typography = MaterialTheme.typography, androidx.ui.material.Shapes shapes = MaterialTheme.shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class ProgressIndicatorKt {
+    method public static void CircularProgressIndicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+    method public static void CircularProgressIndicator-kB8eKMs(@FloatRange(from=0.0, to=1.0) float progress, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+    method public static void LinearProgressIndicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+    method public static void LinearProgressIndicator-kB8eKMs(@FloatRange(from=0.0, to=1.0) float progress, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+  }
+
+  public final class RadioButtonKt {
+    method public static void RadioButton-Mt5Voig(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onSelect, long color = MaterialTheme.colors.secondary);
+    method public static void RadioGroup(kotlin.jvm.functions.Function1<? super androidx.ui.material.RadioGroupScope,kotlin.Unit> content);
+    method public static void RadioGroup-lgrJWgo(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+  }
+
+  public final class RadioGroupScope {
+    method public void RadioGroupItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public void RadioGroupTextItem-7CoRhzM(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+  }
+
+  public final class Scaffold {
+    field public static final androidx.ui.material.Scaffold! INSTANCE;
+  }
+
+  public enum Scaffold.FabPosition {
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition Center;
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition CenterDocked;
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition End;
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition EndDocked;
+  }
+
+  public final class ScaffoldKt {
+    method public static void Scaffold(androidx.ui.material.ScaffoldState scaffoldState = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function0<kotlin.Unit>? topAppBar = null, kotlin.jvm.functions.Function1<? super androidx.ui.material.BottomAppBar.FabConfiguration,kotlin.Unit>? bottomAppBar = null, kotlin.jvm.functions.Function0<kotlin.Unit>? floatingActionButton = null, androidx.ui.material.Scaffold.FabPosition floatingActionButtonPosition = androidx.ui.material.Scaffold.FabPosition.End, kotlin.jvm.functions.Function0<kotlin.Unit>? drawerContent = null, kotlin.jvm.functions.Function1<? super androidx.ui.core.Modifier,kotlin.Unit> bodyContent);
+  }
+
+  public final class ScaffoldState {
+    ctor public ScaffoldState(androidx.ui.material.DrawerState drawerState, boolean isDrawerGesturesEnabled);
+    ctor public ScaffoldState();
+    method public androidx.ui.material.DrawerState getDrawerState();
+    method public boolean isDrawerGesturesEnabled();
+    method public void setDrawerGesturesEnabled(boolean p);
+    method public void setDrawerState(androidx.ui.material.DrawerState p);
+  }
+
+  public final class Shapes {
+    ctor public Shapes(androidx.ui.foundation.shape.corner.CornerBasedShape small, androidx.ui.foundation.shape.corner.CornerBasedShape medium, androidx.ui.foundation.shape.corner.CornerBasedShape large);
+    ctor public Shapes();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape component1();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape component2();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape component3();
+    method public androidx.ui.material.Shapes copy(androidx.ui.foundation.shape.corner.CornerBasedShape small, androidx.ui.foundation.shape.corner.CornerBasedShape medium, androidx.ui.foundation.shape.corner.CornerBasedShape large);
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape getLarge();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape getMedium();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape getSmall();
+  }
+
+  public final class ShapesKt {
+  }
+
+  public final class SliderKt {
+    method public static void Slider-NGIokMc(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange = 0.0 .. 1.0, @IntRange(from=0) int steps = 0, kotlin.jvm.functions.Function0<kotlin.Unit> onValueChangeEnd = {}, long color = MaterialTheme.colors.primary);
+  }
+
+  public final class SnackbarKt {
+    method public static void Snackbar(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit>? action = null, androidx.ui.core.Modifier modifier = Modifier, boolean actionOnNewLine = false, androidx.ui.graphics.Shape shape = small, androidx.ui.unit.Dp elevation = 6.dp);
+    method public static long snackbarPrimaryColorFor(androidx.ui.material.ColorPalette colors);
+  }
+
+  public final class SurfaceKt {
+    method public static void Surface-r7cpYJI(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long color = MaterialTheme.colors.surface, long contentColor = contentColorFor(color), androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp elevation = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static long getPrimarySurface(androidx.ui.material.ColorPalette);
+  }
+
+  public final class SwitchKt {
+    method public static void Switch-V29Pvv8(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, boolean enabled = true, long color = MaterialTheme.colors.secondaryVariant);
+  }
+
+  public final class TabKt {
+    method public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static void Tab-5SZ958c(kotlin.jvm.functions.Function0<kotlin.Unit> text = emptyContent(), kotlin.jvm.functions.Function0<kotlin.Unit> icon = emptyContent(), boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, androidx.ui.core.Modifier modifier = Modifier, long activeColor = contentColor(), long inactiveColor = EmphasisAmbient.current.medium.emphasize(activeColor));
+    method public static <T> void TabRow-nOWMzd0(java.util.List<? extends T> items, int selectedIndex, androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), boolean scrollable = false, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.material.TabRow.TabPosition>,kotlin.Unit> indicatorContainer = { tabPositions -> TabRow.IndicatorContainer(tabPositions, selectedIndex, { 
+    TabRow.Indicator()
+}) }, kotlin.jvm.functions.Function0<kotlin.Unit> divider = { Divider(1.dp, contentColor().copy(DividerOpacity)) }, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> tab);
+  }
+
+  public final class TabRow {
+    method public void Indicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = contentColor());
+    method public void IndicatorContainer(java.util.List<androidx.ui.material.TabRow.TabPosition> tabPositions, int selectedIndex, kotlin.jvm.functions.Function0<kotlin.Unit> indicator);
+    field public static final androidx.ui.material.TabRow! INSTANCE;
+  }
+
+  public static final class TabRow.TabPosition {
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.material.TabRow.TabPosition copy-rRMsBxU(int left, int width);
+    method public int getLeft();
+    method public int getRight();
+    method public int getWidth();
+    property public final int right;
+  }
+
+  public final class TextButton {
+    method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
+    property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
+    field public static final androidx.ui.material.TextButton! INSTANCE;
+  }
+
+  public final class TextFieldKt {
+    method public static void FilledTextField-A1xS8DE(androidx.ui.foundation.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> placeholder = emptyContent(), kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+    method public static void FilledTextField-SHpsG1Y(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> placeholder = emptyContent(), kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+  }
+
+  public final class Typography {
+    ctor public Typography(androidx.ui.text.font.FontFamily defaultFontFamily, androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
+    method public androidx.ui.text.TextStyle component1();
+    method public androidx.ui.text.TextStyle component10();
+    method public androidx.ui.text.TextStyle component11();
+    method public androidx.ui.text.TextStyle component12();
+    method public androidx.ui.text.TextStyle component13();
+    method public androidx.ui.text.TextStyle component2();
+    method public androidx.ui.text.TextStyle component3();
+    method public androidx.ui.text.TextStyle component4();
+    method public androidx.ui.text.TextStyle component5();
+    method public androidx.ui.text.TextStyle component6();
+    method public androidx.ui.text.TextStyle component7();
+    method public androidx.ui.text.TextStyle component8();
+    method public androidx.ui.text.TextStyle component9();
+    method public androidx.ui.material.Typography copy(androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
+    method public androidx.ui.text.TextStyle getBody1();
+    method public androidx.ui.text.TextStyle getBody2();
+    method public androidx.ui.text.TextStyle getButton();
+    method public androidx.ui.text.TextStyle getCaption();
+    method public androidx.ui.text.TextStyle getH1();
+    method public androidx.ui.text.TextStyle getH2();
+    method public androidx.ui.text.TextStyle getH3();
+    method public androidx.ui.text.TextStyle getH4();
+    method public androidx.ui.text.TextStyle getH5();
+    method public androidx.ui.text.TextStyle getH6();
+    method public androidx.ui.text.TextStyle getOverline();
+    method public androidx.ui.text.TextStyle getSubtitle1();
+    method public androidx.ui.text.TextStyle getSubtitle2();
+  }
+
+  public final class TypographyKt {
+  }
+
+}
+
+package androidx.ui.material.internal {
+
+  public final class StateDraggableKt {
+  }
+
+}
+
+package androidx.ui.material.ripple {
+
+  public final class DefaultRippleEffectFactory implements androidx.ui.material.ripple.RippleEffectFactory {
+    method public androidx.ui.material.ripple.RippleEffect create(androidx.ui.unit.IntPxSize size, androidx.ui.unit.PxPosition startPosition, androidx.ui.unit.Density density, androidx.ui.unit.Dp? radius, boolean clipped, androidx.animation.AnimationClockObservable clock, kotlin.jvm.functions.Function1<? super androidx.ui.material.ripple.RippleEffect,kotlin.Unit> onAnimationFinished);
+    field public static final androidx.ui.material.ripple.DefaultRippleEffectFactory! INSTANCE;
+  }
+
+  public final class DefaultRippleEffectKt {
+  }
+
+  public interface RippleEffect {
+    method public default void dispose();
+    method public void draw-_wst67s(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.IntPxSize size, long color);
+    method public void finish(boolean canceled);
+  }
+
+  public interface RippleEffectFactory {
+    method public androidx.ui.material.ripple.RippleEffect create(androidx.ui.unit.IntPxSize size, androidx.ui.unit.PxPosition startPosition, androidx.ui.unit.Density density, androidx.ui.unit.Dp? radius, boolean clipped, androidx.animation.AnimationClockObservable clock, kotlin.jvm.functions.Function1<? super androidx.ui.material.ripple.RippleEffect,kotlin.Unit> onAnimationFinished);
+  }
+
+  public final class RippleKt {
+    method public static androidx.ui.core.Modifier ripple-8aGIaPY(androidx.ui.core.Modifier, boolean bounded = true, androidx.ui.unit.Dp? radius = null, long color = Color.Unset, boolean enabled = true, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+  }
+
+  public final class RippleTheme {
+    ctor public RippleTheme(androidx.ui.material.ripple.RippleEffectFactory factory, kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> defaultColor, kotlin.jvm.functions.Function0<java.lang.Float> opacity);
+    method public androidx.ui.material.ripple.RippleEffectFactory component1();
+    method public kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> component2();
+    method public kotlin.jvm.functions.Function0<java.lang.Float> component3();
+    method public androidx.ui.material.ripple.RippleTheme copy(androidx.ui.material.ripple.RippleEffectFactory factory, kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> defaultColor, kotlin.jvm.functions.Function0<java.lang.Float> opacity);
+    method public kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> getDefaultColor();
+    method public androidx.ui.material.ripple.RippleEffectFactory getFactory();
+    method public kotlin.jvm.functions.Function0<java.lang.Float> getOpacity();
+  }
+
+  public final class RippleThemeKt {
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.material.ripple.RippleTheme> getRippleThemeAmbient();
+  }
+
+}
+
diff --git a/ui/ui-material/api/current.txt b/ui/ui-material/api/current.txt
index 6a5eace..752b42a 100644
--- a/ui/ui-material/api/current.txt
+++ b/ui/ui-material/api/current.txt
@@ -126,8 +126,8 @@
   }
 
   public final class FloatingActionButtonKt {
-    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
-    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
+    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
   }
 
   public final class IconButtonKt {
diff --git a/ui/ui-material/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-material/api/public_plus_experimental_0.1.0-dev10.txt
index 6a5eace..752b42a 100644
--- a/ui/ui-material/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/ui/ui-material/api/public_plus_experimental_0.1.0-dev10.txt
@@ -126,8 +126,8 @@
   }
 
   public final class FloatingActionButtonKt {
-    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
-    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
+    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
   }
 
   public final class IconButtonKt {
diff --git a/ui/ui-material/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-material/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..752b42a
--- /dev/null
+++ b/ui/ui-material/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,352 @@
+// Signature format: 3.0
+package androidx.ui.material {
+
+  public enum AlertDialogButtonLayout {
+    enum_constant public static final androidx.ui.material.AlertDialogButtonLayout SideBySide;
+    enum_constant public static final androidx.ui.material.AlertDialogButtonLayout Stacked;
+  }
+
+  public final class AlertDialogKt {
+    method public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onCloseRequest, kotlin.jvm.functions.Function0<kotlin.Unit>? title = null, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton = null, androidx.ui.material.AlertDialogButtonLayout buttonLayout = androidx.ui.material.AlertDialogButtonLayout.SideBySide, androidx.ui.graphics.Shape shape = medium);
+    method public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onCloseRequest, kotlin.jvm.functions.Function0<kotlin.Unit>? title = null, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, androidx.ui.graphics.Shape shape = medium);
+  }
+
+  public final class AppBarKt {
+    method public static void BottomAppBar-GqrRtJg(androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.material.BottomAppBar.FabConfiguration? fabConfiguration = null, androidx.ui.graphics.Shape? cutoutShape = null, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> content);
+    method public static void TopAppBar-FikZsjU(kotlin.jvm.functions.Function0<kotlin.Unit> title, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? navigationIcon = null, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> actions = {}, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = androidx.ui.material.AppBarKt.TopAppBarElevation);
+    method public static void TopAppBar-oP-1cd0(androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = androidx.ui.material.AppBarKt.TopAppBarElevation, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> content);
+  }
+
+  public final class BottomAppBar {
+    field public static final androidx.ui.material.BottomAppBar! INSTANCE;
+  }
+
+  public static final class BottomAppBar.FabConfiguration {
+    ctor public BottomAppBar.FabConfiguration(internal androidx.ui.unit.IntPxSize fabSize, internal androidx.ui.unit.PxPosition fabTopLeftPosition, internal androidx.ui.material.BottomAppBar.FabDockedPosition fabDockedPosition);
+    method public androidx.ui.material.BottomAppBar.FabConfiguration copy(androidx.ui.unit.IntPxSize fabSize, androidx.ui.unit.PxPosition fabTopLeftPosition, androidx.ui.material.BottomAppBar.FabDockedPosition fabDockedPosition);
+  }
+
+  public enum BottomAppBar.FabDockedPosition {
+    enum_constant public static final androidx.ui.material.BottomAppBar.FabDockedPosition Center;
+    enum_constant public static final androidx.ui.material.BottomAppBar.FabDockedPosition End;
+  }
+
+  public final class BottomNavigationKt {
+    method public static void BottomNavigation-oP-1cd0(androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = androidx.ui.material.BottomNavigationKt.BottomNavigationElevation, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> content);
+    method public static void BottomNavigationItem-dOPBtLY(kotlin.jvm.functions.Function0<kotlin.Unit> icon, kotlin.jvm.functions.Function0<kotlin.Unit> text = emptyContent(), boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, androidx.ui.core.Modifier modifier = Modifier, boolean alwaysShowLabels = true, long activeColor = contentColor(), long inactiveColor = EmphasisAmbient.current.medium.emphasize(activeColor));
+  }
+
+  public final class Button {
+    method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
+    property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
+    field public static final androidx.ui.material.Button! INSTANCE;
+  }
+
+  public final class ButtonKt {
+    method public static void Button-MQxsNoc(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, androidx.ui.unit.Dp elevation = 2.dp, androidx.ui.graphics.Shape shape = small, androidx.ui.foundation.Border? border = null, long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.layout.InnerPadding padding = Button.DefaultInnerPadding, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+    method public static inline void OutlinedButton-MQxsNoc(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, androidx.ui.unit.Dp elevation = 0.dp, androidx.ui.graphics.Shape shape = small, androidx.ui.foundation.Border? border = Border(1.dp, MaterialTheme.colors.onSurface.copy(OutlinedStrokeOpacity)), long backgroundColor = MaterialTheme.colors.surface, long contentColor = MaterialTheme.colors.primary, androidx.ui.layout.InnerPadding padding = Button.DefaultInnerPadding, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+    method public static inline void TextButton-MQxsNoc(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, androidx.ui.unit.Dp elevation = 0.dp, androidx.ui.graphics.Shape shape = small, androidx.ui.foundation.Border? border = null, long backgroundColor = Color.Transparent, long contentColor = MaterialTheme.colors.primary, androidx.ui.layout.InnerPadding padding = TextButton.DefaultInnerPadding, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+  }
+
+  public final class CardKt {
+    method public static void Card-r7cpYJI(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = medium, long color = MaterialTheme.colors.surface, long contentColor = contentColorFor(color), androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp elevation = 1.dp, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class CheckboxKt {
+    method public static void Checkbox-D4zOgQA(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.secondary);
+    method public static void TriStateCheckbox--Buf9SY(androidx.ui.foundation.selection.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.secondary);
+  }
+
+  public final class ColorKt {
+    method public static long contentColorFor-QEYXlZo(long color);
+    method public static long contentColorFor-ZITCLTE(androidx.ui.material.ColorPalette, long color);
+    method public static androidx.ui.material.ColorPalette darkColorPalette-bz757pg(long primary = Color(4290479868), long primaryVariant = Color(4281794739), long secondary = Color(4278442694), long background = Color(4279374354), long surface = Color(4279374354), long error = Color(4291782265), long onPrimary = Color.Black, long onSecondary = Color.Black, long onBackground = Color.White, long onSurface = Color.White, long onError = Color.Black);
+    method public static androidx.ui.material.ColorPalette lightColorPalette-eO6A0Mk(long primary = Color(4284612846), long primaryVariant = Color(4281794739), long secondary = Color(4278442694), long secondaryVariant = Color(4278290310), long background = Color.White, long surface = Color.White, long error = Color(4289724448), long onPrimary = Color.White, long onSecondary = Color.Black, long onBackground = Color.Black, long onSurface = Color.Black, long onError = Color.White);
+  }
+
+  public interface ColorPalette {
+    method public long getBackground();
+    method public long getError();
+    method public long getOnBackground();
+    method public long getOnError();
+    method public long getOnPrimary();
+    method public long getOnSecondary();
+    method public long getOnSurface();
+    method public long getPrimary();
+    method public long getPrimaryVariant();
+    method public long getSecondary();
+    method public long getSecondaryVariant();
+    method public long getSurface();
+    method public boolean isLight();
+    property public abstract long background;
+    property public abstract long error;
+    property public abstract boolean isLight;
+    property public abstract long onBackground;
+    property public abstract long onError;
+    property public abstract long onPrimary;
+    property public abstract long onSecondary;
+    property public abstract long onSurface;
+    property public abstract long primary;
+    property public abstract long primaryVariant;
+    property public abstract long secondary;
+    property public abstract long secondaryVariant;
+    property public abstract long surface;
+  }
+
+  public final class DividerKt {
+    method public static void Divider-5sN9_mQ(androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.surface, androidx.ui.unit.Dp thickness = 1.dp, androidx.ui.unit.Dp startIndent = 0.dp);
+  }
+
+  public final class DrawerKt {
+    method public static void BottomDrawerLayout(androidx.ui.material.DrawerState drawerState, kotlin.jvm.functions.Function1<? super androidx.ui.material.DrawerState,kotlin.Unit> onStateChange, boolean gesturesEnabled = true, kotlin.jvm.functions.Function0<kotlin.Unit> drawerContent, kotlin.jvm.functions.Function0<kotlin.Unit> bodyContent);
+    method public static void ModalDrawerLayout(androidx.ui.material.DrawerState drawerState, kotlin.jvm.functions.Function1<? super androidx.ui.material.DrawerState,kotlin.Unit> onStateChange, boolean gesturesEnabled = true, kotlin.jvm.functions.Function0<kotlin.Unit> drawerContent, kotlin.jvm.functions.Function0<kotlin.Unit> bodyContent);
+  }
+
+  public enum DrawerState {
+    enum_constant public static final androidx.ui.material.DrawerState Closed;
+    enum_constant public static final androidx.ui.material.DrawerState Opened;
+  }
+
+  public interface Emphasis {
+    method public long emphasize-QEYXlZo(long color);
+  }
+
+  public final class EmphasisKt {
+    method public static void ProvideEmphasis(androidx.ui.material.Emphasis emphasis, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static androidx.compose.Ambient<androidx.ui.material.EmphasisLevels> getEmphasisAmbient();
+  }
+
+  public interface EmphasisLevels {
+    method public androidx.ui.material.Emphasis getDisabled();
+    method public androidx.ui.material.Emphasis getHigh();
+    method public androidx.ui.material.Emphasis getMedium();
+    property public abstract androidx.ui.material.Emphasis disabled;
+    property public abstract androidx.ui.material.Emphasis high;
+    property public abstract androidx.ui.material.Emphasis medium;
+  }
+
+  public final class FloatingActionButtonKt {
+    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
+    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+  }
+
+  public final class IconButtonKt {
+    method public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+    method public static void IconToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+  }
+
+  public final class ListItemKt {
+    method public static void ListItem(String text, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick = null, androidx.ui.graphics.ImageAsset? icon = null, String? secondaryText = null, boolean singleLineSecondaryText = true, String? overlineText = null, String? metaText = null);
+    method public static void ListItem(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick = null, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? secondaryText = null, boolean singleLineSecondaryText = true, kotlin.jvm.functions.Function0<kotlin.Unit>? overlineText = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailing = null, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+  }
+
+  public final class MaterialTheme {
+    method public androidx.ui.material.ColorPalette getColors();
+    method public androidx.ui.material.Shapes getShapes();
+    method public androidx.ui.material.Typography getTypography();
+    property public final androidx.ui.material.ColorPalette colors;
+    property public final androidx.ui.material.Shapes shapes;
+    property public final androidx.ui.material.Typography typography;
+    field public static final androidx.ui.material.MaterialTheme! INSTANCE;
+  }
+
+  public final class MaterialThemeKt {
+    method public static void MaterialTheme(androidx.ui.material.ColorPalette colors = MaterialTheme.colors, androidx.ui.material.Typography typography = MaterialTheme.typography, androidx.ui.material.Shapes shapes = MaterialTheme.shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class ProgressIndicatorKt {
+    method public static void CircularProgressIndicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+    method public static void CircularProgressIndicator-kB8eKMs(@FloatRange(from=0.0, to=1.0) float progress, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+    method public static void LinearProgressIndicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+    method public static void LinearProgressIndicator-kB8eKMs(@FloatRange(from=0.0, to=1.0) float progress, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+  }
+
+  public final class RadioButtonKt {
+    method public static void RadioButton-Mt5Voig(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onSelect, long color = MaterialTheme.colors.secondary);
+    method public static void RadioGroup(kotlin.jvm.functions.Function1<? super androidx.ui.material.RadioGroupScope,kotlin.Unit> content);
+    method public static void RadioGroup-lgrJWgo(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+  }
+
+  public final class RadioGroupScope {
+    method public void RadioGroupItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public void RadioGroupTextItem-7CoRhzM(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+  }
+
+  public final class Scaffold {
+    field public static final androidx.ui.material.Scaffold! INSTANCE;
+  }
+
+  public enum Scaffold.FabPosition {
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition Center;
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition CenterDocked;
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition End;
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition EndDocked;
+  }
+
+  public final class ScaffoldKt {
+    method public static void Scaffold(androidx.ui.material.ScaffoldState scaffoldState = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function0<kotlin.Unit>? topAppBar = null, kotlin.jvm.functions.Function1<? super androidx.ui.material.BottomAppBar.FabConfiguration,kotlin.Unit>? bottomAppBar = null, kotlin.jvm.functions.Function0<kotlin.Unit>? floatingActionButton = null, androidx.ui.material.Scaffold.FabPosition floatingActionButtonPosition = androidx.ui.material.Scaffold.FabPosition.End, kotlin.jvm.functions.Function0<kotlin.Unit>? drawerContent = null, kotlin.jvm.functions.Function1<? super androidx.ui.core.Modifier,kotlin.Unit> bodyContent);
+  }
+
+  public final class ScaffoldState {
+    ctor public ScaffoldState(androidx.ui.material.DrawerState drawerState, boolean isDrawerGesturesEnabled);
+    ctor public ScaffoldState();
+    method public androidx.ui.material.DrawerState getDrawerState();
+    method public boolean isDrawerGesturesEnabled();
+    method public void setDrawerGesturesEnabled(boolean p);
+    method public void setDrawerState(androidx.ui.material.DrawerState p);
+  }
+
+  public final class Shapes {
+    ctor public Shapes(androidx.ui.foundation.shape.corner.CornerBasedShape small, androidx.ui.foundation.shape.corner.CornerBasedShape medium, androidx.ui.foundation.shape.corner.CornerBasedShape large);
+    ctor public Shapes();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape component1();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape component2();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape component3();
+    method public androidx.ui.material.Shapes copy(androidx.ui.foundation.shape.corner.CornerBasedShape small, androidx.ui.foundation.shape.corner.CornerBasedShape medium, androidx.ui.foundation.shape.corner.CornerBasedShape large);
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape getLarge();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape getMedium();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape getSmall();
+  }
+
+  public final class ShapesKt {
+  }
+
+  public final class SliderKt {
+    method public static void Slider-NGIokMc(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange = 0.0 .. 1.0, @IntRange(from=0) int steps = 0, kotlin.jvm.functions.Function0<kotlin.Unit> onValueChangeEnd = {}, long color = MaterialTheme.colors.primary);
+  }
+
+  public final class SnackbarKt {
+    method public static void Snackbar(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit>? action = null, androidx.ui.core.Modifier modifier = Modifier, boolean actionOnNewLine = false, androidx.ui.graphics.Shape shape = small, androidx.ui.unit.Dp elevation = 6.dp);
+    method public static long snackbarPrimaryColorFor(androidx.ui.material.ColorPalette colors);
+  }
+
+  public final class SurfaceKt {
+    method public static void Surface-r7cpYJI(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long color = MaterialTheme.colors.surface, long contentColor = contentColorFor(color), androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp elevation = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static long getPrimarySurface(androidx.ui.material.ColorPalette);
+  }
+
+  public final class SwitchKt {
+    method public static void Switch-V29Pvv8(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, boolean enabled = true, long color = MaterialTheme.colors.secondaryVariant);
+  }
+
+  public final class TabKt {
+    method public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static void Tab-5SZ958c(kotlin.jvm.functions.Function0<kotlin.Unit> text = emptyContent(), kotlin.jvm.functions.Function0<kotlin.Unit> icon = emptyContent(), boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, androidx.ui.core.Modifier modifier = Modifier, long activeColor = contentColor(), long inactiveColor = EmphasisAmbient.current.medium.emphasize(activeColor));
+    method public static <T> void TabRow-nOWMzd0(java.util.List<? extends T> items, int selectedIndex, androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), boolean scrollable = false, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.material.TabRow.TabPosition>,kotlin.Unit> indicatorContainer = { tabPositions -> TabRow.IndicatorContainer(tabPositions, selectedIndex, { 
+    TabRow.Indicator()
+}) }, kotlin.jvm.functions.Function0<kotlin.Unit> divider = { Divider(1.dp, contentColor().copy(DividerOpacity)) }, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> tab);
+  }
+
+  public final class TabRow {
+    method public void Indicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = contentColor());
+    method public void IndicatorContainer(java.util.List<androidx.ui.material.TabRow.TabPosition> tabPositions, int selectedIndex, kotlin.jvm.functions.Function0<kotlin.Unit> indicator);
+    field public static final androidx.ui.material.TabRow! INSTANCE;
+  }
+
+  public static final class TabRow.TabPosition {
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.material.TabRow.TabPosition copy-rRMsBxU(int left, int width);
+    method public int getLeft();
+    method public int getRight();
+    method public int getWidth();
+    property public final int right;
+  }
+
+  public final class TextButton {
+    method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
+    property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
+    field public static final androidx.ui.material.TextButton! INSTANCE;
+  }
+
+  public final class TextFieldKt {
+    method public static void FilledTextField-A1xS8DE(androidx.ui.foundation.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> placeholder = emptyContent(), kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+    method public static void FilledTextField-SHpsG1Y(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> placeholder = emptyContent(), kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+  }
+
+  public final class Typography {
+    ctor public Typography(androidx.ui.text.font.FontFamily defaultFontFamily, androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
+    method public androidx.ui.text.TextStyle component1();
+    method public androidx.ui.text.TextStyle component10();
+    method public androidx.ui.text.TextStyle component11();
+    method public androidx.ui.text.TextStyle component12();
+    method public androidx.ui.text.TextStyle component13();
+    method public androidx.ui.text.TextStyle component2();
+    method public androidx.ui.text.TextStyle component3();
+    method public androidx.ui.text.TextStyle component4();
+    method public androidx.ui.text.TextStyle component5();
+    method public androidx.ui.text.TextStyle component6();
+    method public androidx.ui.text.TextStyle component7();
+    method public androidx.ui.text.TextStyle component8();
+    method public androidx.ui.text.TextStyle component9();
+    method public androidx.ui.material.Typography copy(androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
+    method public androidx.ui.text.TextStyle getBody1();
+    method public androidx.ui.text.TextStyle getBody2();
+    method public androidx.ui.text.TextStyle getButton();
+    method public androidx.ui.text.TextStyle getCaption();
+    method public androidx.ui.text.TextStyle getH1();
+    method public androidx.ui.text.TextStyle getH2();
+    method public androidx.ui.text.TextStyle getH3();
+    method public androidx.ui.text.TextStyle getH4();
+    method public androidx.ui.text.TextStyle getH5();
+    method public androidx.ui.text.TextStyle getH6();
+    method public androidx.ui.text.TextStyle getOverline();
+    method public androidx.ui.text.TextStyle getSubtitle1();
+    method public androidx.ui.text.TextStyle getSubtitle2();
+  }
+
+  public final class TypographyKt {
+  }
+
+}
+
+package androidx.ui.material.internal {
+
+  public final class StateDraggableKt {
+  }
+
+}
+
+package androidx.ui.material.ripple {
+
+  public final class DefaultRippleEffectFactory implements androidx.ui.material.ripple.RippleEffectFactory {
+    method public androidx.ui.material.ripple.RippleEffect create(androidx.ui.unit.IntPxSize size, androidx.ui.unit.PxPosition startPosition, androidx.ui.unit.Density density, androidx.ui.unit.Dp? radius, boolean clipped, androidx.animation.AnimationClockObservable clock, kotlin.jvm.functions.Function1<? super androidx.ui.material.ripple.RippleEffect,kotlin.Unit> onAnimationFinished);
+    field public static final androidx.ui.material.ripple.DefaultRippleEffectFactory! INSTANCE;
+  }
+
+  public final class DefaultRippleEffectKt {
+  }
+
+  public interface RippleEffect {
+    method public default void dispose();
+    method public void draw-_wst67s(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.IntPxSize size, long color);
+    method public void finish(boolean canceled);
+  }
+
+  public interface RippleEffectFactory {
+    method public androidx.ui.material.ripple.RippleEffect create(androidx.ui.unit.IntPxSize size, androidx.ui.unit.PxPosition startPosition, androidx.ui.unit.Density density, androidx.ui.unit.Dp? radius, boolean clipped, androidx.animation.AnimationClockObservable clock, kotlin.jvm.functions.Function1<? super androidx.ui.material.ripple.RippleEffect,kotlin.Unit> onAnimationFinished);
+  }
+
+  public final class RippleKt {
+    method public static androidx.ui.core.Modifier ripple-8aGIaPY(androidx.ui.core.Modifier, boolean bounded = true, androidx.ui.unit.Dp? radius = null, long color = Color.Unset, boolean enabled = true, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+  }
+
+  public final class RippleTheme {
+    ctor public RippleTheme(androidx.ui.material.ripple.RippleEffectFactory factory, kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> defaultColor, kotlin.jvm.functions.Function0<java.lang.Float> opacity);
+    method public androidx.ui.material.ripple.RippleEffectFactory component1();
+    method public kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> component2();
+    method public kotlin.jvm.functions.Function0<java.lang.Float> component3();
+    method public androidx.ui.material.ripple.RippleTheme copy(androidx.ui.material.ripple.RippleEffectFactory factory, kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> defaultColor, kotlin.jvm.functions.Function0<java.lang.Float> opacity);
+    method public kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> getDefaultColor();
+    method public androidx.ui.material.ripple.RippleEffectFactory getFactory();
+    method public kotlin.jvm.functions.Function0<java.lang.Float> getOpacity();
+  }
+
+  public final class RippleThemeKt {
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.material.ripple.RippleTheme> getRippleThemeAmbient();
+  }
+
+}
+
diff --git a/ui/ui-material/api/public_plus_experimental_current.txt b/ui/ui-material/api/public_plus_experimental_current.txt
index 6a5eace..752b42a 100644
--- a/ui/ui-material/api/public_plus_experimental_current.txt
+++ b/ui/ui-material/api/public_plus_experimental_current.txt
@@ -126,8 +126,8 @@
   }
 
   public final class FloatingActionButtonKt {
-    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
-    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
+    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
   }
 
   public final class IconButtonKt {
diff --git a/ui/ui-material/api/res-0.1.0-dev11.txt b/ui/ui-material/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-material/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-material/api/restricted_0.1.0-dev10.txt b/ui/ui-material/api/restricted_0.1.0-dev10.txt
index 6a5eace..752b42a 100644
--- a/ui/ui-material/api/restricted_0.1.0-dev10.txt
+++ b/ui/ui-material/api/restricted_0.1.0-dev10.txt
@@ -126,8 +126,8 @@
   }
 
   public final class FloatingActionButtonKt {
-    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
-    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
+    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
   }
 
   public final class IconButtonKt {
diff --git a/ui/ui-material/api/restricted_0.1.0-dev11.txt b/ui/ui-material/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..752b42a
--- /dev/null
+++ b/ui/ui-material/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,352 @@
+// Signature format: 3.0
+package androidx.ui.material {
+
+  public enum AlertDialogButtonLayout {
+    enum_constant public static final androidx.ui.material.AlertDialogButtonLayout SideBySide;
+    enum_constant public static final androidx.ui.material.AlertDialogButtonLayout Stacked;
+  }
+
+  public final class AlertDialogKt {
+    method public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onCloseRequest, kotlin.jvm.functions.Function0<kotlin.Unit>? title = null, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> confirmButton, kotlin.jvm.functions.Function0<kotlin.Unit>? dismissButton = null, androidx.ui.material.AlertDialogButtonLayout buttonLayout = androidx.ui.material.AlertDialogButtonLayout.SideBySide, androidx.ui.graphics.Shape shape = medium);
+    method public static void AlertDialog(kotlin.jvm.functions.Function0<kotlin.Unit> onCloseRequest, kotlin.jvm.functions.Function0<kotlin.Unit>? title = null, kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> buttons, androidx.ui.graphics.Shape shape = medium);
+  }
+
+  public final class AppBarKt {
+    method public static void BottomAppBar-GqrRtJg(androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.material.BottomAppBar.FabConfiguration? fabConfiguration = null, androidx.ui.graphics.Shape? cutoutShape = null, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> content);
+    method public static void TopAppBar-FikZsjU(kotlin.jvm.functions.Function0<kotlin.Unit> title, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? navigationIcon = null, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> actions = {}, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = androidx.ui.material.AppBarKt.TopAppBarElevation);
+    method public static void TopAppBar-oP-1cd0(androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = androidx.ui.material.AppBarKt.TopAppBarElevation, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> content);
+  }
+
+  public final class BottomAppBar {
+    field public static final androidx.ui.material.BottomAppBar! INSTANCE;
+  }
+
+  public static final class BottomAppBar.FabConfiguration {
+    ctor public BottomAppBar.FabConfiguration(internal androidx.ui.unit.IntPxSize fabSize, internal androidx.ui.unit.PxPosition fabTopLeftPosition, internal androidx.ui.material.BottomAppBar.FabDockedPosition fabDockedPosition);
+    method public androidx.ui.material.BottomAppBar.FabConfiguration copy(androidx.ui.unit.IntPxSize fabSize, androidx.ui.unit.PxPosition fabTopLeftPosition, androidx.ui.material.BottomAppBar.FabDockedPosition fabDockedPosition);
+  }
+
+  public enum BottomAppBar.FabDockedPosition {
+    enum_constant public static final androidx.ui.material.BottomAppBar.FabDockedPosition Center;
+    enum_constant public static final androidx.ui.material.BottomAppBar.FabDockedPosition End;
+  }
+
+  public final class BottomNavigationKt {
+    method public static void BottomNavigation-oP-1cd0(androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = androidx.ui.material.BottomNavigationKt.BottomNavigationElevation, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> content);
+    method public static void BottomNavigationItem-dOPBtLY(kotlin.jvm.functions.Function0<kotlin.Unit> icon, kotlin.jvm.functions.Function0<kotlin.Unit> text = emptyContent(), boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, androidx.ui.core.Modifier modifier = Modifier, boolean alwaysShowLabels = true, long activeColor = contentColor(), long inactiveColor = EmphasisAmbient.current.medium.emphasize(activeColor));
+  }
+
+  public final class Button {
+    method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
+    property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
+    field public static final androidx.ui.material.Button! INSTANCE;
+  }
+
+  public final class ButtonKt {
+    method public static void Button-MQxsNoc(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, androidx.ui.unit.Dp elevation = 2.dp, androidx.ui.graphics.Shape shape = small, androidx.ui.foundation.Border? border = null, long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.layout.InnerPadding padding = Button.DefaultInnerPadding, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+    method public static inline void OutlinedButton-MQxsNoc(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, androidx.ui.unit.Dp elevation = 0.dp, androidx.ui.graphics.Shape shape = small, androidx.ui.foundation.Border? border = Border(1.dp, MaterialTheme.colors.onSurface.copy(OutlinedStrokeOpacity)), long backgroundColor = MaterialTheme.colors.surface, long contentColor = MaterialTheme.colors.primary, androidx.ui.layout.InnerPadding padding = Button.DefaultInnerPadding, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+    method public static inline void TextButton-MQxsNoc(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, androidx.ui.unit.Dp elevation = 0.dp, androidx.ui.graphics.Shape shape = small, androidx.ui.foundation.Border? border = null, long backgroundColor = Color.Transparent, long contentColor = MaterialTheme.colors.primary, androidx.ui.layout.InnerPadding padding = TextButton.DefaultInnerPadding, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+  }
+
+  public final class CardKt {
+    method public static void Card-r7cpYJI(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = medium, long color = MaterialTheme.colors.surface, long contentColor = contentColorFor(color), androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp elevation = 1.dp, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class CheckboxKt {
+    method public static void Checkbox-D4zOgQA(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.secondary);
+    method public static void TriStateCheckbox--Buf9SY(androidx.ui.foundation.selection.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.secondary);
+  }
+
+  public final class ColorKt {
+    method public static long contentColorFor-QEYXlZo(long color);
+    method public static long contentColorFor-ZITCLTE(androidx.ui.material.ColorPalette, long color);
+    method public static androidx.ui.material.ColorPalette darkColorPalette-bz757pg(long primary = Color(4290479868), long primaryVariant = Color(4281794739), long secondary = Color(4278442694), long background = Color(4279374354), long surface = Color(4279374354), long error = Color(4291782265), long onPrimary = Color.Black, long onSecondary = Color.Black, long onBackground = Color.White, long onSurface = Color.White, long onError = Color.Black);
+    method public static androidx.ui.material.ColorPalette lightColorPalette-eO6A0Mk(long primary = Color(4284612846), long primaryVariant = Color(4281794739), long secondary = Color(4278442694), long secondaryVariant = Color(4278290310), long background = Color.White, long surface = Color.White, long error = Color(4289724448), long onPrimary = Color.White, long onSecondary = Color.Black, long onBackground = Color.Black, long onSurface = Color.Black, long onError = Color.White);
+  }
+
+  public interface ColorPalette {
+    method public long getBackground();
+    method public long getError();
+    method public long getOnBackground();
+    method public long getOnError();
+    method public long getOnPrimary();
+    method public long getOnSecondary();
+    method public long getOnSurface();
+    method public long getPrimary();
+    method public long getPrimaryVariant();
+    method public long getSecondary();
+    method public long getSecondaryVariant();
+    method public long getSurface();
+    method public boolean isLight();
+    property public abstract long background;
+    property public abstract long error;
+    property public abstract boolean isLight;
+    property public abstract long onBackground;
+    property public abstract long onError;
+    property public abstract long onPrimary;
+    property public abstract long onSecondary;
+    property public abstract long onSurface;
+    property public abstract long primary;
+    property public abstract long primaryVariant;
+    property public abstract long secondary;
+    property public abstract long secondaryVariant;
+    property public abstract long surface;
+  }
+
+  public final class DividerKt {
+    method public static void Divider-5sN9_mQ(androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.surface, androidx.ui.unit.Dp thickness = 1.dp, androidx.ui.unit.Dp startIndent = 0.dp);
+  }
+
+  public final class DrawerKt {
+    method public static void BottomDrawerLayout(androidx.ui.material.DrawerState drawerState, kotlin.jvm.functions.Function1<? super androidx.ui.material.DrawerState,kotlin.Unit> onStateChange, boolean gesturesEnabled = true, kotlin.jvm.functions.Function0<kotlin.Unit> drawerContent, kotlin.jvm.functions.Function0<kotlin.Unit> bodyContent);
+    method public static void ModalDrawerLayout(androidx.ui.material.DrawerState drawerState, kotlin.jvm.functions.Function1<? super androidx.ui.material.DrawerState,kotlin.Unit> onStateChange, boolean gesturesEnabled = true, kotlin.jvm.functions.Function0<kotlin.Unit> drawerContent, kotlin.jvm.functions.Function0<kotlin.Unit> bodyContent);
+  }
+
+  public enum DrawerState {
+    enum_constant public static final androidx.ui.material.DrawerState Closed;
+    enum_constant public static final androidx.ui.material.DrawerState Opened;
+  }
+
+  public interface Emphasis {
+    method public long emphasize-QEYXlZo(long color);
+  }
+
+  public final class EmphasisKt {
+    method public static void ProvideEmphasis(androidx.ui.material.Emphasis emphasis, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static androidx.compose.Ambient<androidx.ui.material.EmphasisLevels> getEmphasisAmbient();
+  }
+
+  public interface EmphasisLevels {
+    method public androidx.ui.material.Emphasis getDisabled();
+    method public androidx.ui.material.Emphasis getHigh();
+    method public androidx.ui.material.Emphasis getMedium();
+    property public abstract androidx.ui.material.Emphasis disabled;
+    property public abstract androidx.ui.material.Emphasis high;
+    property public abstract androidx.ui.material.Emphasis medium;
+  }
+
+  public final class FloatingActionButtonKt {
+    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
+    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+  }
+
+  public final class IconButtonKt {
+    method public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+    method public static void IconToggleButton(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, boolean enabled = true, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+  }
+
+  public final class ListItemKt {
+    method public static void ListItem(String text, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick = null, androidx.ui.graphics.ImageAsset? icon = null, String? secondaryText = null, boolean singleLineSecondaryText = true, String? overlineText = null, String? metaText = null);
+    method public static void ListItem(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick = null, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? secondaryText = null, boolean singleLineSecondaryText = true, kotlin.jvm.functions.Function0<kotlin.Unit>? overlineText = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailing = null, kotlin.jvm.functions.Function0<kotlin.Unit> text);
+  }
+
+  public final class MaterialTheme {
+    method public androidx.ui.material.ColorPalette getColors();
+    method public androidx.ui.material.Shapes getShapes();
+    method public androidx.ui.material.Typography getTypography();
+    property public final androidx.ui.material.ColorPalette colors;
+    property public final androidx.ui.material.Shapes shapes;
+    property public final androidx.ui.material.Typography typography;
+    field public static final androidx.ui.material.MaterialTheme! INSTANCE;
+  }
+
+  public final class MaterialThemeKt {
+    method public static void MaterialTheme(androidx.ui.material.ColorPalette colors = MaterialTheme.colors, androidx.ui.material.Typography typography = MaterialTheme.typography, androidx.ui.material.Shapes shapes = MaterialTheme.shapes, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class ProgressIndicatorKt {
+    method public static void CircularProgressIndicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+    method public static void CircularProgressIndicator-kB8eKMs(@FloatRange(from=0.0, to=1.0) float progress, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+    method public static void LinearProgressIndicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+    method public static void LinearProgressIndicator-kB8eKMs(@FloatRange(from=0.0, to=1.0) float progress, androidx.ui.core.Modifier modifier = Modifier, long color = MaterialTheme.colors.primary);
+  }
+
+  public final class RadioButtonKt {
+    method public static void RadioButton-Mt5Voig(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onSelect, long color = MaterialTheme.colors.secondary);
+    method public static void RadioGroup(kotlin.jvm.functions.Function1<? super androidx.ui.material.RadioGroupScope,kotlin.Unit> content);
+    method public static void RadioGroup-lgrJWgo(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+  }
+
+  public final class RadioGroupScope {
+    method public void RadioGroupItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public void RadioGroupTextItem-7CoRhzM(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+  }
+
+  public final class Scaffold {
+    field public static final androidx.ui.material.Scaffold! INSTANCE;
+  }
+
+  public enum Scaffold.FabPosition {
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition Center;
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition CenterDocked;
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition End;
+    enum_constant public static final androidx.ui.material.Scaffold.FabPosition EndDocked;
+  }
+
+  public final class ScaffoldKt {
+    method public static void Scaffold(androidx.ui.material.ScaffoldState scaffoldState = remember({ 
+    <init>()
+}), kotlin.jvm.functions.Function0<kotlin.Unit>? topAppBar = null, kotlin.jvm.functions.Function1<? super androidx.ui.material.BottomAppBar.FabConfiguration,kotlin.Unit>? bottomAppBar = null, kotlin.jvm.functions.Function0<kotlin.Unit>? floatingActionButton = null, androidx.ui.material.Scaffold.FabPosition floatingActionButtonPosition = androidx.ui.material.Scaffold.FabPosition.End, kotlin.jvm.functions.Function0<kotlin.Unit>? drawerContent = null, kotlin.jvm.functions.Function1<? super androidx.ui.core.Modifier,kotlin.Unit> bodyContent);
+  }
+
+  public final class ScaffoldState {
+    ctor public ScaffoldState(androidx.ui.material.DrawerState drawerState, boolean isDrawerGesturesEnabled);
+    ctor public ScaffoldState();
+    method public androidx.ui.material.DrawerState getDrawerState();
+    method public boolean isDrawerGesturesEnabled();
+    method public void setDrawerGesturesEnabled(boolean p);
+    method public void setDrawerState(androidx.ui.material.DrawerState p);
+  }
+
+  public final class Shapes {
+    ctor public Shapes(androidx.ui.foundation.shape.corner.CornerBasedShape small, androidx.ui.foundation.shape.corner.CornerBasedShape medium, androidx.ui.foundation.shape.corner.CornerBasedShape large);
+    ctor public Shapes();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape component1();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape component2();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape component3();
+    method public androidx.ui.material.Shapes copy(androidx.ui.foundation.shape.corner.CornerBasedShape small, androidx.ui.foundation.shape.corner.CornerBasedShape medium, androidx.ui.foundation.shape.corner.CornerBasedShape large);
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape getLarge();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape getMedium();
+    method public androidx.ui.foundation.shape.corner.CornerBasedShape getSmall();
+  }
+
+  public final class ShapesKt {
+  }
+
+  public final class SliderKt {
+    method public static void Slider-NGIokMc(float value, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, kotlin.ranges.ClosedFloatingPointRange<java.lang.Float> valueRange = 0.0 .. 1.0, @IntRange(from=0) int steps = 0, kotlin.jvm.functions.Function0<kotlin.Unit> onValueChangeEnd = {}, long color = MaterialTheme.colors.primary);
+  }
+
+  public final class SnackbarKt {
+    method public static void Snackbar(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit>? action = null, androidx.ui.core.Modifier modifier = Modifier, boolean actionOnNewLine = false, androidx.ui.graphics.Shape shape = small, androidx.ui.unit.Dp elevation = 6.dp);
+    method public static long snackbarPrimaryColorFor(androidx.ui.material.ColorPalette colors);
+  }
+
+  public final class SurfaceKt {
+    method public static void Surface-r7cpYJI(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = RectangleShape, long color = MaterialTheme.colors.surface, long contentColor = contentColorFor(color), androidx.ui.foundation.Border? border = null, androidx.ui.unit.Dp elevation = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static long getPrimarySurface(androidx.ui.material.ColorPalette);
+  }
+
+  public final class SwitchKt {
+    method public static void Switch-V29Pvv8(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, boolean enabled = true, long color = MaterialTheme.colors.secondaryVariant);
+  }
+
+  public final class TabKt {
+    method public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public static void Tab-5SZ958c(kotlin.jvm.functions.Function0<kotlin.Unit> text = emptyContent(), kotlin.jvm.functions.Function0<kotlin.Unit> icon = emptyContent(), boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelected, androidx.ui.core.Modifier modifier = Modifier, long activeColor = contentColor(), long inactiveColor = EmphasisAmbient.current.medium.emphasize(activeColor));
+    method public static <T> void TabRow-nOWMzd0(java.util.List<? extends T> items, int selectedIndex, androidx.ui.core.Modifier modifier = Modifier, long backgroundColor = MaterialTheme.colors.primarySurface, long contentColor = contentColorFor(backgroundColor), boolean scrollable = false, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.material.TabRow.TabPosition>,kotlin.Unit> indicatorContainer = { tabPositions -> TabRow.IndicatorContainer(tabPositions, selectedIndex, { 
+    TabRow.Indicator()
+}) }, kotlin.jvm.functions.Function0<kotlin.Unit> divider = { Divider(1.dp, contentColor().copy(DividerOpacity)) }, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> tab);
+  }
+
+  public final class TabRow {
+    method public void Indicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = contentColor());
+    method public void IndicatorContainer(java.util.List<androidx.ui.material.TabRow.TabPosition> tabPositions, int selectedIndex, kotlin.jvm.functions.Function0<kotlin.Unit> indicator);
+    field public static final androidx.ui.material.TabRow! INSTANCE;
+  }
+
+  public static final class TabRow.TabPosition {
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.material.TabRow.TabPosition copy-rRMsBxU(int left, int width);
+    method public int getLeft();
+    method public int getRight();
+    method public int getWidth();
+    property public final int right;
+  }
+
+  public final class TextButton {
+    method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
+    property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
+    field public static final androidx.ui.material.TextButton! INSTANCE;
+  }
+
+  public final class TextFieldKt {
+    method public static void FilledTextField-A1xS8DE(androidx.ui.foundation.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.foundation.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> placeholder = emptyContent(), kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+    method public static void FilledTextField-SHpsG1Y(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit> label, kotlin.jvm.functions.Function0<kotlin.Unit> placeholder = emptyContent(), kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+  }
+
+  public final class Typography {
+    ctor public Typography(androidx.ui.text.font.FontFamily defaultFontFamily, androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
+    method public androidx.ui.text.TextStyle component1();
+    method public androidx.ui.text.TextStyle component10();
+    method public androidx.ui.text.TextStyle component11();
+    method public androidx.ui.text.TextStyle component12();
+    method public androidx.ui.text.TextStyle component13();
+    method public androidx.ui.text.TextStyle component2();
+    method public androidx.ui.text.TextStyle component3();
+    method public androidx.ui.text.TextStyle component4();
+    method public androidx.ui.text.TextStyle component5();
+    method public androidx.ui.text.TextStyle component6();
+    method public androidx.ui.text.TextStyle component7();
+    method public androidx.ui.text.TextStyle component8();
+    method public androidx.ui.text.TextStyle component9();
+    method public androidx.ui.material.Typography copy(androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
+    method public androidx.ui.text.TextStyle getBody1();
+    method public androidx.ui.text.TextStyle getBody2();
+    method public androidx.ui.text.TextStyle getButton();
+    method public androidx.ui.text.TextStyle getCaption();
+    method public androidx.ui.text.TextStyle getH1();
+    method public androidx.ui.text.TextStyle getH2();
+    method public androidx.ui.text.TextStyle getH3();
+    method public androidx.ui.text.TextStyle getH4();
+    method public androidx.ui.text.TextStyle getH5();
+    method public androidx.ui.text.TextStyle getH6();
+    method public androidx.ui.text.TextStyle getOverline();
+    method public androidx.ui.text.TextStyle getSubtitle1();
+    method public androidx.ui.text.TextStyle getSubtitle2();
+  }
+
+  public final class TypographyKt {
+  }
+
+}
+
+package androidx.ui.material.internal {
+
+  public final class StateDraggableKt {
+  }
+
+}
+
+package androidx.ui.material.ripple {
+
+  public final class DefaultRippleEffectFactory implements androidx.ui.material.ripple.RippleEffectFactory {
+    method public androidx.ui.material.ripple.RippleEffect create(androidx.ui.unit.IntPxSize size, androidx.ui.unit.PxPosition startPosition, androidx.ui.unit.Density density, androidx.ui.unit.Dp? radius, boolean clipped, androidx.animation.AnimationClockObservable clock, kotlin.jvm.functions.Function1<? super androidx.ui.material.ripple.RippleEffect,kotlin.Unit> onAnimationFinished);
+    field public static final androidx.ui.material.ripple.DefaultRippleEffectFactory! INSTANCE;
+  }
+
+  public final class DefaultRippleEffectKt {
+  }
+
+  public interface RippleEffect {
+    method public default void dispose();
+    method public void draw-_wst67s(androidx.ui.graphics.Canvas canvas, androidx.ui.unit.IntPxSize size, long color);
+    method public void finish(boolean canceled);
+  }
+
+  public interface RippleEffectFactory {
+    method public androidx.ui.material.ripple.RippleEffect create(androidx.ui.unit.IntPxSize size, androidx.ui.unit.PxPosition startPosition, androidx.ui.unit.Density density, androidx.ui.unit.Dp? radius, boolean clipped, androidx.animation.AnimationClockObservable clock, kotlin.jvm.functions.Function1<? super androidx.ui.material.ripple.RippleEffect,kotlin.Unit> onAnimationFinished);
+  }
+
+  public final class RippleKt {
+    method public static androidx.ui.core.Modifier ripple-8aGIaPY(androidx.ui.core.Modifier, boolean bounded = true, androidx.ui.unit.Dp? radius = null, long color = Color.Unset, boolean enabled = true, androidx.animation.AnimationClockObservable clock = AnimationClockAmbient.current);
+  }
+
+  public final class RippleTheme {
+    ctor public RippleTheme(androidx.ui.material.ripple.RippleEffectFactory factory, kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> defaultColor, kotlin.jvm.functions.Function0<java.lang.Float> opacity);
+    method public androidx.ui.material.ripple.RippleEffectFactory component1();
+    method public kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> component2();
+    method public kotlin.jvm.functions.Function0<java.lang.Float> component3();
+    method public androidx.ui.material.ripple.RippleTheme copy(androidx.ui.material.ripple.RippleEffectFactory factory, kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> defaultColor, kotlin.jvm.functions.Function0<java.lang.Float> opacity);
+    method public kotlin.jvm.functions.Function0<androidx.ui.graphics.Color> getDefaultColor();
+    method public androidx.ui.material.ripple.RippleEffectFactory getFactory();
+    method public kotlin.jvm.functions.Function0<java.lang.Float> getOpacity();
+  }
+
+  public final class RippleThemeKt {
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.material.ripple.RippleTheme> getRippleThemeAmbient();
+  }
+
+}
+
diff --git a/ui/ui-material/api/restricted_current.txt b/ui/ui-material/api/restricted_current.txt
index 6a5eace..752b42a 100644
--- a/ui/ui-material/api/restricted_current.txt
+++ b/ui/ui-material/api/restricted_current.txt
@@ -126,8 +126,8 @@
   }
 
   public final class FloatingActionButtonKt {
-    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
-    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.primary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
+    method public static void ExtendedFloatingActionButton-r9QhOOE(kotlin.jvm.functions.Function0<kotlin.Unit> text, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit>? icon = null, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp);
+    method public static void FloatingActionButton-rf6Y9PE(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(CornerSize(50)), long backgroundColor = MaterialTheme.colors.secondary, long contentColor = contentColorFor(backgroundColor), androidx.ui.unit.Dp elevation = 6.dp, kotlin.jvm.functions.Function0<kotlin.Unit> icon);
   }
 
   public final class IconButtonKt {
diff --git a/ui/ui-material/icons/core/api/0.1.0-dev11.txt b/ui/ui-material/icons/core/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..49fcc65
--- /dev/null
+++ b/ui/ui-material/icons/core/api/0.1.0-dev11.txt
@@ -0,0 +1,1036 @@
+// Signature format: 3.0
+package androidx.ui.material.icons {
+
+  public final class Icons {
+    method public androidx.ui.material.icons.Icons.Filled getDefault();
+    property public final androidx.ui.material.icons.Icons.Filled Default;
+    field public static final androidx.ui.material.icons.Icons! INSTANCE;
+  }
+
+  public static final class Icons.Filled {
+    field public static final androidx.ui.material.icons.Icons.Filled! INSTANCE;
+  }
+
+  public static final class Icons.Outlined {
+    field public static final androidx.ui.material.icons.Icons.Outlined! INSTANCE;
+  }
+
+  public static final class Icons.Rounded {
+    field public static final androidx.ui.material.icons.Icons.Rounded! INSTANCE;
+  }
+
+  public static final class Icons.Sharp {
+    field public static final androidx.ui.material.icons.Icons.Sharp! INSTANCE;
+  }
+
+  public static final class Icons.TwoTone {
+    field public static final androidx.ui.material.icons.Icons.TwoTone! INSTANCE;
+  }
+
+  public final class IconsKt {
+    method public static kotlin.Lazy<androidx.ui.graphics.vector.VectorAsset> lazyMaterialIcon(kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.VectorAssetBuilder,androidx.ui.graphics.vector.VectorAssetBuilder> block);
+    method public static androidx.ui.graphics.vector.VectorAssetBuilder materialPath(androidx.ui.graphics.vector.VectorAssetBuilder, float fillAlpha = 1f, float strokeAlpha = 1f, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+}
+
+package androidx.ui.material.icons.filled {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Filled);
+  }
+
+}
+
+package androidx.ui.material.icons.outlined {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+}
+
+package androidx.ui.material.icons.rounded {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+}
+
+package androidx.ui.material.icons.sharp {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+}
+
+package androidx.ui.material.icons.twotone {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+}
+
diff --git a/ui/ui-material/icons/core/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-material/icons/core/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..49fcc65
--- /dev/null
+++ b/ui/ui-material/icons/core/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,1036 @@
+// Signature format: 3.0
+package androidx.ui.material.icons {
+
+  public final class Icons {
+    method public androidx.ui.material.icons.Icons.Filled getDefault();
+    property public final androidx.ui.material.icons.Icons.Filled Default;
+    field public static final androidx.ui.material.icons.Icons! INSTANCE;
+  }
+
+  public static final class Icons.Filled {
+    field public static final androidx.ui.material.icons.Icons.Filled! INSTANCE;
+  }
+
+  public static final class Icons.Outlined {
+    field public static final androidx.ui.material.icons.Icons.Outlined! INSTANCE;
+  }
+
+  public static final class Icons.Rounded {
+    field public static final androidx.ui.material.icons.Icons.Rounded! INSTANCE;
+  }
+
+  public static final class Icons.Sharp {
+    field public static final androidx.ui.material.icons.Icons.Sharp! INSTANCE;
+  }
+
+  public static final class Icons.TwoTone {
+    field public static final androidx.ui.material.icons.Icons.TwoTone! INSTANCE;
+  }
+
+  public final class IconsKt {
+    method public static kotlin.Lazy<androidx.ui.graphics.vector.VectorAsset> lazyMaterialIcon(kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.VectorAssetBuilder,androidx.ui.graphics.vector.VectorAssetBuilder> block);
+    method public static androidx.ui.graphics.vector.VectorAssetBuilder materialPath(androidx.ui.graphics.vector.VectorAssetBuilder, float fillAlpha = 1f, float strokeAlpha = 1f, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+}
+
+package androidx.ui.material.icons.filled {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Filled);
+  }
+
+}
+
+package androidx.ui.material.icons.outlined {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+}
+
+package androidx.ui.material.icons.rounded {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+}
+
+package androidx.ui.material.icons.sharp {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+}
+
+package androidx.ui.material.icons.twotone {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+}
+
diff --git a/ui/ui-material/icons/core/api/res-0.1.0-dev11.txt b/ui/ui-material/icons/core/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-material/icons/core/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-material/icons/core/api/restricted_0.1.0-dev11.txt b/ui/ui-material/icons/core/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..49fcc65
--- /dev/null
+++ b/ui/ui-material/icons/core/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,1036 @@
+// Signature format: 3.0
+package androidx.ui.material.icons {
+
+  public final class Icons {
+    method public androidx.ui.material.icons.Icons.Filled getDefault();
+    property public final androidx.ui.material.icons.Icons.Filled Default;
+    field public static final androidx.ui.material.icons.Icons! INSTANCE;
+  }
+
+  public static final class Icons.Filled {
+    field public static final androidx.ui.material.icons.Icons.Filled! INSTANCE;
+  }
+
+  public static final class Icons.Outlined {
+    field public static final androidx.ui.material.icons.Icons.Outlined! INSTANCE;
+  }
+
+  public static final class Icons.Rounded {
+    field public static final androidx.ui.material.icons.Icons.Rounded! INSTANCE;
+  }
+
+  public static final class Icons.Sharp {
+    field public static final androidx.ui.material.icons.Icons.Sharp! INSTANCE;
+  }
+
+  public static final class Icons.TwoTone {
+    field public static final androidx.ui.material.icons.Icons.TwoTone! INSTANCE;
+  }
+
+  public final class IconsKt {
+    method public static kotlin.Lazy<androidx.ui.graphics.vector.VectorAsset> lazyMaterialIcon(kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.VectorAssetBuilder,androidx.ui.graphics.vector.VectorAssetBuilder> block);
+    method public static androidx.ui.graphics.vector.VectorAssetBuilder materialPath(androidx.ui.graphics.vector.VectorAssetBuilder, float fillAlpha = 1f, float strokeAlpha = 1f, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.PathBuilder,kotlin.Unit> pathBuilder);
+  }
+
+}
+
+package androidx.ui.material.icons.filled {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Filled);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Filled);
+  }
+
+}
+
+package androidx.ui.material.icons.outlined {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Outlined);
+  }
+
+}
+
+package androidx.ui.material.icons.rounded {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Rounded);
+  }
+
+}
+
+package androidx.ui.material.icons.sharp {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.Sharp);
+  }
+
+}
+
+package androidx.ui.material.icons.twotone {
+
+  public final class AccountBoxKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountBox(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class AccountCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAccountCircle(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAddCircle(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class AddKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getAdd(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowBackKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowBack(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowDropDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowDropDown(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ArrowForwardKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getArrowForward(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class BuildKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getBuild(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CallKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCall(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckCircleKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheckCircle(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CheckKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCheck(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ClearKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClear(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CloseKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getClose(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class CreateKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getCreate(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class DateRangeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDateRange(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class DeleteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDelete(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class DoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getDone(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class EditKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEdit(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class EmailKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getEmail(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ExitToAppKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getExitToApp(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class FaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFace(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteBorderKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavoriteBorder(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class FavoriteKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getFavorite(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class HomeKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getHome(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class InfoKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getInfo(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowDownKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowDown(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowLeftKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowLeft(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowRightKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowRight(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class KeyboardArrowUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getKeyboardArrowUp(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ListKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getList(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class LocationOnKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLocationOn(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class LockKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getLock(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class MailOutlineKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMailOutline(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class MenuKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMenu(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class MoreVertKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getMoreVert(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class NotificationsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getNotifications(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PersonKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPerson(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PhoneKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPhone(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlaceKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlace(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class PlayArrowKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getPlayArrow(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class RefreshKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getRefresh(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class SearchKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSearch(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class SendKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSend(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class SettingsKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getSettings(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShareKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShare(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ShoppingCartKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getShoppingCart(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class StarKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getStar(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class ThumbUpKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getThumbUp(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+  public final class WarningKt {
+    method public static androidx.ui.graphics.vector.VectorAsset getWarning(androidx.ui.material.icons.Icons.TwoTone);
+  }
+
+}
+
diff --git a/ui/ui-material/icons/extended/src/androidTest/java/androidx/ui/material/icons/test/IconComparisonTest.kt b/ui/ui-material/icons/extended/src/androidTest/java/androidx/ui/material/icons/test/IconComparisonTest.kt
index 536a6ba0..3de92c1 100644
--- a/ui/ui-material/icons/extended/src/androidTest/java/androidx/ui/material/icons/test/IconComparisonTest.kt
+++ b/ui/ui-material/icons/extended/src/androidTest/java/androidx/ui/material/icons/test/IconComparisonTest.kt
@@ -23,7 +23,6 @@
 import androidx.compose.Composition
 import androidx.test.filters.LargeTest
 import androidx.test.filters.SdkSuppress
-import androidx.test.rule.ActivityTestRule
 import androidx.ui.core.Alignment
 import androidx.ui.core.ContextAmbient
 import androidx.ui.core.DensityAmbient
@@ -41,8 +40,10 @@
 import androidx.ui.layout.preferredSize
 import androidx.ui.res.vectorResource
 import androidx.ui.semantics.Semantics
+import androidx.ui.test.android.AndroidComposeTestRule
 import androidx.ui.test.captureToBitmap
 import androidx.ui.test.findByTag
+import androidx.ui.test.runOnUiThread
 import androidx.ui.unit.ipx
 import com.google.common.truth.Truth
 import org.junit.Rule
@@ -70,7 +71,7 @@
      * to run this test ~tenfold.
      */
     @get:Rule
-    val activityTestRule = ActivityTestRule(ComponentActivity::class.java)
+    val composeTestRule = AndroidComposeTestRule<ComponentActivity>()
 
     @Test
     fun compareVectorAssets() {
@@ -79,8 +80,8 @@
             val programmaticVector = property.get()
             var composition: Composition? = null
 
-            activityTestRule.runOnUiThread {
-                composition = activityTestRule.activity.setContent {
+            runOnUiThread {
+                composition = composeTestRule.activityTestRule.activity.setContent {
                     xmlVector = drawableName.toVectorAsset()
                     DrawVectors(programmaticVector, xmlVector!!)
                 }
@@ -97,7 +98,7 @@
             )
 
             // Dispose between composing each pair of icons to ensure correctness
-            activityTestRule.runOnUiThread {
+            runOnUiThread {
                 composition?.dispose()
             }
         }
diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DynamicThemeActivity.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DynamicThemeActivity.kt
index 0dc7751..93ae9fc 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DynamicThemeActivity.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/DynamicThemeActivity.kt
@@ -109,11 +109,9 @@
 
 @Composable
 private fun Fab(scrollFraction: ScrollFraction) {
-    val secondary = MaterialTheme.colors.secondary
     val fabText = emojiForScrollFraction(scrollFraction.fraction)
     ExtendedFloatingActionButton(
         text = { Text(fabText, style = MaterialTheme.typography.h5) },
-        backgroundColor = secondary,
         onClick = {}
     )
 }
diff --git a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyAlertDialog.kt b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyAlertDialog.kt
index 9aa8d62..485303a 100644
--- a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyAlertDialog.kt
+++ b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyAlertDialog.kt
@@ -19,7 +19,7 @@
 import androidx.compose.Composable
 import androidx.ui.core.Modifier
 import androidx.ui.foundation.Text
-import androidx.ui.foundation.shape.RectangleShape
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.layout.Column
 import androidx.ui.layout.InnerPadding
 import androidx.ui.layout.fillMaxWidth
diff --git a/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ScaffoldSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ScaffoldSamples.kt
index b96940b..a186fbf 100644
--- a/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ScaffoldSamples.kt
+++ b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ScaffoldSamples.kt
@@ -37,7 +37,6 @@
 import androidx.ui.material.DrawerState
 import androidx.ui.material.ExtendedFloatingActionButton
 import androidx.ui.material.IconButton
-import androidx.ui.material.MaterialTheme
 import androidx.ui.material.Scaffold
 import androidx.ui.material.ScaffoldState
 import androidx.ui.material.TopAppBar
@@ -145,8 +144,7 @@
             ExtendedFloatingActionButton(
                 text = { Text("Change shape") },
                 onClick = changeShape,
-                shape = fabShape,
-                backgroundColor = MaterialTheme.colors.secondary
+                shape = fabShape
             )
         },
         floatingActionButtonPosition = Scaffold.FabPosition.CenterDocked,
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/FloatingActionButtonTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/FloatingActionButtonTest.kt
index 90be23f..fe17fc3 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/FloatingActionButtonTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/FloatingActionButtonTest.kt
@@ -150,11 +150,11 @@
         val themeShape = CutCornerShape(4.dp)
         val realShape = CutCornerShape(50)
         var surface = Color.Transparent
-        var primary = Color.Transparent
+        var fabColor = Color.Transparent
         composeTestRule.setMaterialContent {
             Stack {
                 surface = MaterialTheme.colors.surface
-                primary = MaterialTheme.colors.primary
+                fabColor = MaterialTheme.colors.secondary
                 Providers(ShapesAmbient provides Shapes(small = themeShape)) {
                     TestTag(tag = "myButton") {
                         FloatingActionButton(onClick = {}, elevation = 0.dp) {
@@ -170,7 +170,39 @@
             .assertShape(
                 density = composeTestRule.density,
                 shape = realShape,
-                shapeColor = primary,
+                shapeColor = fabColor,
+                backgroundColor = surface,
+                shapeOverlapPixelCount = with(composeTestRule.density) { 1.dp.toPx() }
+            )
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun extendedFab_shapeAndColorFromThemeIsUsed() {
+        val themeShape = CutCornerShape(4.dp)
+        val realShape = CutCornerShape(50)
+        var surface = Color.Transparent
+        var fabColor = Color.Transparent
+        composeTestRule.setMaterialContent {
+            Stack {
+                surface = MaterialTheme.colors.surface
+                fabColor = MaterialTheme.colors.secondary
+                Providers(ShapesAmbient provides Shapes(small = themeShape)) {
+                    TestTag(tag = "myButton") {
+                        ExtendedFloatingActionButton(onClick = {}, elevation = 0.dp, text = {
+                            Box(Modifier.preferredSize(10.dp, 50.dp))
+                        })
+                    }
+                }
+            }
+        }
+
+        findByTag("myButton")
+            .captureToBitmap()
+            .assertShape(
+                density = composeTestRule.density,
+                shape = realShape,
+                shapeColor = fabColor,
                 backgroundColor = surface,
                 shapeOverlapPixelCount = with(composeTestRule.density) { 1.dp.toPx() }
             )
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/ProgressIndicatorTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/ProgressIndicatorTest.kt
index ebe01e3..2b1137f 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/ProgressIndicatorTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/ProgressIndicatorTest.kt
@@ -24,6 +24,7 @@
 import androidx.ui.test.findByTag
 import androidx.ui.test.runOnUiThread
 import androidx.ui.unit.dp
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -80,6 +81,7 @@
     }
 
     @Test
+    @Ignore("b/154757752")
     fun indeterminateLinearProgressIndicator_Size() {
         composeTestRule
             .setMaterialContentAndCollectSizes {
@@ -124,6 +126,7 @@
     }
 
     @Test
+    @Ignore("b/154757752")
     fun indeterminateCircularProgressIndicator_Size() {
         composeTestRule
             .setMaterialContentAndCollectSizes {
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/RippleTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/RippleTest.kt
index 6ce52d5..4ee94bd 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/RippleTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/RippleTest.kt
@@ -31,11 +31,11 @@
 import androidx.ui.foundation.Clickable
 import androidx.ui.foundation.ContentGravity
 import androidx.ui.foundation.drawBackground
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.geometry.Rect
 import androidx.ui.graphics.Canvas
 import androidx.ui.graphics.Color
 import androidx.ui.graphics.Paint
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.layout.Row
 import androidx.ui.layout.padding
 import androidx.ui.layout.preferredSize
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt
index 739addb..483189a 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt
@@ -20,6 +20,7 @@
 import androidx.ui.core.LayoutCoordinates
 import androidx.ui.core.Modifier
 import androidx.ui.core.TestTag
+import androidx.ui.core.drawShadow
 import androidx.ui.core.onPositioned
 import androidx.ui.core.positionInParent
 import androidx.ui.foundation.Box
@@ -28,11 +29,14 @@
 import androidx.ui.foundation.drawBackground
 import androidx.ui.graphics.Color
 import androidx.ui.layout.DpConstraints
+import androidx.ui.layout.Stack
 import androidx.ui.layout.fillMaxWidth
 import androidx.ui.layout.preferredHeight
+import androidx.ui.layout.size
 import androidx.ui.material.icons.Icons
 import androidx.ui.material.icons.filled.Favorite
 import androidx.ui.semantics.Semantics
+import androidx.ui.test.captureToBitmap
 import androidx.ui.test.createComposeRule
 import androidx.ui.test.doGesture
 import androidx.ui.test.findByTag
@@ -359,4 +363,39 @@
         val expectedFabY = bottomBarPosition.y - fabSize.height / 2
         assertThat(fabPosition.y).isEqualTo(expectedFabY)
     }
+
+    @Test
+    fun scaffold_topAppBarIsDrawnOnTopOfContent() {
+        composeTestRule.setContent {
+            Stack(Modifier.size(10.dp, 20.dp)) {
+                TestTag(tag = "Scaffold") {
+                    Semantics(container = true, mergeAllDescendants = true) {
+                        Scaffold(
+                            topAppBar = {
+                                Box(
+                                    Modifier.size(10.dp)
+                                        .drawShadow(4.dp)
+                                        .drawBackground(Color.White)
+                                )
+                            }
+                        ) {
+                            Box(
+                                Modifier.size(10.dp)
+                                    .drawBackground(Color.White)
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+        findByTag("Scaffold")
+            .captureToBitmap().apply {
+                // asserts the appbar(top half part) has the shadow
+                val yPos = height / 2 + 2
+                assertThat(Color(getPixel(0, yPos))).isNotEqualTo(Color.White)
+                assertThat(Color(getPixel(width / 2, yPos))).isNotEqualTo(Color.White)
+                assertThat(Color(getPixel(width - 1, yPos))).isNotEqualTo(Color.White)
+            }
+    }
 }
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/SurfaceTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/SurfaceTest.kt
new file mode 100644
index 0000000..f55c8c8
--- /dev/null
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/SurfaceTest.kt
@@ -0,0 +1,157 @@
+/*
+ * 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.ui.material
+
+import android.os.Build
+import androidx.test.filters.MediumTest
+import androidx.test.filters.SdkSuppress
+import androidx.ui.core.Modifier
+import androidx.ui.core.TestTag
+import androidx.ui.core.zIndex
+import androidx.ui.foundation.Box
+import androidx.ui.foundation.drawBackground
+import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
+import androidx.ui.layout.Stack
+import androidx.ui.layout.fillMaxSize
+import androidx.ui.layout.preferredSize
+import androidx.ui.semantics.Semantics
+import androidx.ui.test.assertShape
+import androidx.ui.test.captureToBitmap
+import androidx.ui.test.createComposeRule
+import androidx.ui.test.findByTag
+import androidx.ui.unit.dp
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@MediumTest
+@RunWith(JUnit4::class)
+class SurfaceTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun zOrderingBasedOnElevationIsApplied() {
+        composeTestRule.setMaterialContent {
+            TestTag(tag = "stack") {
+                Semantics(container = true, mergeAllDescendants = true) {
+                    Stack(Modifier.preferredSize(10.dp, 10.dp)) {
+                        Surface(color = Color.Yellow, elevation = 2.dp) {
+                            Box(Modifier.fillMaxSize())
+                        }
+                        Surface(color = Color.Green) {
+                            Box(Modifier.fillMaxSize())
+                        }
+                    }
+                }
+            }
+        }
+
+        findByTag("stack")
+            .captureToBitmap()
+            .assertShape(
+                density = composeTestRule.density,
+                shape = RectangleShape,
+                shapeColor = Color.Yellow,
+                backgroundColor = Color.White
+            )
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun originalOrderingWhenTheDefaultElevationIsUsed() {
+        composeTestRule.setMaterialContent {
+            TestTag(tag = "stack") {
+                Semantics(container = true, mergeAllDescendants = true) {
+                    Stack(Modifier.preferredSize(10.dp, 10.dp)) {
+                        Surface(color = Color.Yellow) {
+                            Box(Modifier.fillMaxSize())
+                        }
+                        Surface(color = Color.Green) {
+                            Box(Modifier.fillMaxSize())
+                        }
+                    }
+                }
+            }
+        }
+
+        findByTag("stack")
+            .captureToBitmap()
+            .assertShape(
+                density = composeTestRule.density,
+                shape = RectangleShape,
+                shapeColor = Color.Green,
+                backgroundColor = Color.White
+            )
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun elevationRawValueIsUsedAsZIndex_drawsBelow() {
+        composeTestRule.setMaterialContent {
+            TestTag(tag = "stack") {
+                Semantics(container = true, mergeAllDescendants = true) {
+                    Stack(Modifier.preferredSize(10.dp, 10.dp)) {
+                        Box(Modifier.fillMaxSize().drawBackground(Color.Green).zIndex(3f))
+                        Surface(color = Color.Yellow, elevation = 2.dp) {
+                            Box(Modifier.fillMaxSize())
+                        }
+                    }
+                }
+            }
+        }
+
+        findByTag("stack")
+            .captureToBitmap()
+            .assertShape(
+                density = composeTestRule.density,
+                shape = RectangleShape,
+                shapeColor = Color.Green,
+                backgroundColor = Color.Green
+            )
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
+    @Test
+    fun elevationRawValueIsUsedAsZIndex_drawsAbove() {
+        composeTestRule.setMaterialContent {
+            TestTag(tag = "stack") {
+                Semantics(container = true, mergeAllDescendants = true) {
+                    Stack(Modifier.preferredSize(10.dp, 10.dp)) {
+                        Box(Modifier.fillMaxSize().drawBackground(Color.Green).zIndex(1f))
+                        Surface(color = Color.Yellow, elevation = 2.dp) {
+                            Box(Modifier.fillMaxSize())
+                        }
+                    }
+                }
+            }
+        }
+
+        findByTag("stack")
+            .captureToBitmap()
+            .assertShape(
+                density = composeTestRule.density,
+                shape = RectangleShape,
+                shapeColor = Color.Yellow,
+                backgroundColor = Color.Yellow
+            )
+    }
+}
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt b/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
index 7a7b321..87183c2 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
@@ -23,7 +23,6 @@
 import androidx.ui.foundation.Box
 import androidx.ui.foundation.ContentGravity
 import androidx.ui.foundation.ProvideTextStyle
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.foundation.shape.corner.CircleShape
 import androidx.ui.geometry.Offset
 import androidx.ui.geometry.Rect
@@ -31,6 +30,7 @@
 import androidx.ui.graphics.Outline
 import androidx.ui.graphics.Path
 import androidx.ui.graphics.PathOperation
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.Shape
 import androidx.ui.graphics.addOutline
 import androidx.ui.layout.AlignmentLineOffset
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Color.kt b/ui/ui-material/src/main/java/androidx/ui/material/Color.kt
index df452c7..ab21f70 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Color.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Color.kt
@@ -51,9 +51,8 @@
      * The secondary color provides more ways to accent and distinguish your product.
      * Secondary colors are best for:
      * - Floating action buttons
-     * - Selection controls, like sliders and switches
+     * - Selection controls, like checkboxes and radio buttons
      * - Highlighting selected text
-     * - Progress bars
      * - Links and headlines
      */
     val secondary: Color
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt b/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
index c7610a4..0527145 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
@@ -69,7 +69,7 @@
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     shape: Shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50)),
-    backgroundColor: Color = MaterialTheme.colors.primary,
+    backgroundColor: Color = MaterialTheme.colors.secondary,
     contentColor: Color = contentColorFor(backgroundColor),
     elevation: Dp = 6.dp,
     icon: @Composable() () -> Unit
@@ -125,7 +125,7 @@
     modifier: Modifier = Modifier,
     icon: @Composable() (() -> Unit)? = null,
     shape: Shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50)),
-    backgroundColor: Color = MaterialTheme.colors.primary,
+    backgroundColor: Color = MaterialTheme.colors.secondary,
     contentColor: Color = contentColorFor(backgroundColor),
     elevation: Dp = 6.dp
 ) {
@@ -190,25 +190,25 @@
         measurable: Measurable,
         height: IntPx,
         layoutDirection: LayoutDirection
-    ) = max(measurable.minIntrinsicWidth(height), FabSize.toIntPx())
+    ) = max(measurable.minIntrinsicWidth(height, layoutDirection), FabSize.toIntPx())
 
     override fun Density.minIntrinsicHeightOf(
         measurable: Measurable,
         width: IntPx,
         layoutDirection: LayoutDirection
-    ) = max(measurable.minIntrinsicHeight(width), FabSize.toIntPx())
+    ) = max(measurable.minIntrinsicHeight(width, layoutDirection), FabSize.toIntPx())
 
     override fun Density.maxIntrinsicWidthOf(
         measurable: Measurable,
         height: IntPx,
         layoutDirection: LayoutDirection
-    ) = max(measurable.maxIntrinsicWidth(height), FabSize.toIntPx())
+    ) = max(measurable.maxIntrinsicWidth(height, layoutDirection), FabSize.toIntPx())
 
     override fun Density.maxIntrinsicHeightOf(
         measurable: Measurable,
         width: IntPx,
         layoutDirection: LayoutDirection
-    ) = max(measurable.maxIntrinsicHeight(width), FabSize.toIntPx())
+    ) = max(measurable.maxIntrinsicHeight(width, layoutDirection), FabSize.toIntPx())
 }
 
 private val FabSize = 56.dp
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Scaffold.kt b/ui/ui-material/src/main/java/androidx/ui/material/Scaffold.kt
index 4e68bc5..8407886 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Scaffold.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Scaffold.kt
@@ -25,6 +25,7 @@
 import androidx.ui.core.Layout
 import androidx.ui.core.Modifier
 import androidx.ui.core.onPositioned
+import androidx.ui.core.zIndex
 import androidx.ui.layout.Column
 import androidx.ui.layout.Stack
 import androidx.ui.layout.fillMaxSize
@@ -132,7 +133,9 @@
     val child = @Composable {
         Surface(color = MaterialTheme.colors.background) {
             Column(Modifier.fillMaxSize()) {
-                if (topAppBar != null) ScaffoldSlot(content = topAppBar)
+                if (topAppBar != null) {
+                    ScaffoldSlot(Modifier.zIndex(TopAppBarZIndex), topAppBar)
+                }
                 Stack(Modifier.weight(1f, fill = true)) {
                     ScaffoldContent(Modifier.fillMaxSize(), scaffoldState, bodyContent)
                     ScaffoldBottom(
@@ -314,4 +317,5 @@
 }
 
 private val FabSpacing = 16.dp
-private val DockedFabEndSpacing = 16.dp
\ No newline at end of file
+private val DockedFabEndSpacing = 16.dp
+private const val TopAppBarZIndex = 1f
\ No newline at end of file
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt b/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt
index 3d8a3c7..07342b0 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt
@@ -22,14 +22,15 @@
 import androidx.ui.core.Modifier
 import androidx.ui.core.clip
 import androidx.ui.core.drawShadow
+import androidx.ui.core.zIndex
 import androidx.ui.foundation.Border
 import androidx.ui.foundation.ContentColorAmbient
 import androidx.ui.foundation.ProvideTextStyle
 import androidx.ui.foundation.Text
 import androidx.ui.foundation.drawBackground
 import androidx.ui.foundation.drawBorder
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.Shape
 import androidx.ui.graphics.compositeOver
 import androidx.ui.text.TextStyle
@@ -88,7 +89,8 @@
     content: @Composable() () -> Unit
 ) {
     SurfaceLayout(
-        modifier.drawShadow(shape = shape, elevation = elevation, clipToOutline = false)
+        modifier.drawShadow(elevation = elevation, shape = shape, clipToOutline = false)
+            .zIndex(elevation.value)
             .plus(if (border != null) Modifier.drawBorder(border, shape) else Modifier)
             .drawBackground(
                 color = getBackgroundColorForElevation(color, elevation),
diff --git a/ui/ui-platform/api/0.1.0-dev10.txt b/ui/ui-platform/api/0.1.0-dev10.txt
index 36d7415..62bad6a 100644
--- a/ui/ui-platform/api/0.1.0-dev10.txt
+++ b/ui/ui-platform/api/0.1.0-dev10.txt
@@ -121,7 +121,7 @@
     method @Deprecated public boolean getHandlesParentData();
     method public int getHeight();
     method public java.util.List<androidx.ui.core.LayoutNode> getLayoutChildren();
-    method public androidx.ui.core.LayoutDirection? getLayoutDirection();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
     method public androidx.ui.core.LayoutNode.MeasureBlocks getMeasureBlocks();
     method public androidx.ui.core.MeasureScope getMeasureScope();
     method public androidx.ui.core.Modifier getModifier();
@@ -140,18 +140,18 @@
     method public boolean isMeasuring();
     method public boolean isPlaced();
     method public void layout();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public void onInvalidate();
     method public void place-rRMsBxU(int x, int y);
     method public void requestRemeasure();
     method @Deprecated public void setCanMultiMeasure(boolean p);
     method public void setConstraints(androidx.ui.core.Constraints p);
     method @Deprecated public void setHandlesParentData(boolean p);
-    method public void setLayoutDirection(androidx.ui.core.LayoutDirection? p);
+    method public void setLayoutDirection(androidx.ui.core.LayoutDirection p);
     method public void setMeasureBlocks(androidx.ui.core.LayoutNode.MeasureBlocks value);
     method public void setModifier(androidx.ui.core.Modifier value);
     method public void setOnAttach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
@@ -169,7 +169,7 @@
     property public final boolean isMeasuring;
     property public final boolean isPlaced;
     property public final java.util.List<androidx.ui.core.LayoutNode> layoutChildren;
-    property public final androidx.ui.core.LayoutDirection? layoutDirection;
+    property public final androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.core.LayoutNode.MeasureBlocks measureBlocks;
     property public final androidx.ui.core.MeasureScope measureScope;
     property public final androidx.ui.core.Modifier modifier;
@@ -184,26 +184,20 @@
     property public final int width;
   }
 
-  public abstract static class LayoutNode.InnerMeasureScope extends androidx.ui.core.MeasureScope {
-    ctor public LayoutNode.InnerMeasureScope();
-    method public abstract androidx.ui.core.LayoutNode getLayoutNode();
-    property public abstract androidx.ui.core.LayoutNode layoutNode;
-  }
-
   public static interface LayoutNode.MeasureBlocks {
-    method public int maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope measureScope, java.util.List<? extends androidx.ui.core.Measurable> measurables, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public abstract static class LayoutNode.NoIntrinsicsMeasureBlocks implements androidx.ui.core.LayoutNode.MeasureBlocks {
     ctor public LayoutNode.NoIntrinsicsMeasureBlocks(String error);
-    method public Void maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public final class ModelObserver {
diff --git a/ui/ui-platform/api/0.1.0-dev11.txt b/ui/ui-platform/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..62bad6a
--- /dev/null
+++ b/ui/ui-platform/api/0.1.0-dev11.txt
@@ -0,0 +1,498 @@
+// Signature format: 3.0
+package androidx.ui.autofill {
+
+  public final class AndroidAutofillDebugUtilsKt {
+  }
+
+  public final class AndroidAutofillKt {
+  }
+
+  public final class AndroidAutofillTypeKt {
+  }
+
+}
+
+package androidx.ui.core {
+
+  public interface AndroidOwner extends androidx.ui.core.Owner {
+    method public void addAndroidView(android.view.View view, androidx.ui.core.LayoutNode layoutNode);
+    method public android.view.View getView();
+    method public void removeAndroidView(android.view.View view);
+    property public abstract android.view.View view;
+  }
+
+  public final class AndroidOwnerKt {
+    method public static androidx.ui.core.AndroidOwner createOwner(android.content.Context context, androidx.lifecycle.LifecycleOwner? lifecycleOwner = null);
+    method public static androidx.ui.core.LayoutDirection getLocaleLayoutDirection(android.content.res.Configuration);
+  }
+
+  public abstract sealed class ComponentNode {
+    method public void attach(androidx.ui.core.Owner owner);
+    method public void detach();
+    method public final operator androidx.ui.core.ComponentNode get(int index);
+    method public final int getCount();
+    method public final int getDepth();
+    method public final androidx.ui.core.Owner? getOwner();
+    method public final Object? getOwnerData();
+    method public final androidx.ui.core.ComponentNode? getParent();
+    method public androidx.ui.core.LayoutNode? getParentLayoutNode();
+    method public final void insertAt(int index, androidx.ui.core.ComponentNode instance);
+    method public final void move(int from, int to, int count);
+    method public final void removeAt(int index, int count);
+    method public final void setDepth(int p);
+    method public final void setOwnerData(Object? p);
+    method public final inline void visitChildren(kotlin.jvm.functions.Function1<? super androidx.ui.core.ComponentNode,kotlin.Unit> block);
+    method public final inline void visitChildrenReverse(kotlin.jvm.functions.Function1<? super androidx.ui.core.ComponentNode,kotlin.Unit> block);
+    property public final int count;
+    property public final int depth;
+    property public final androidx.ui.core.Owner? owner;
+    property public final Object? ownerData;
+    property public final androidx.ui.core.ComponentNode? parent;
+    property public androidx.ui.core.LayoutNode? parentLayoutNode;
+  }
+
+  public final class ComponentNodesKt {
+    method public static void add(androidx.ui.core.ComponentNode, androidx.ui.core.ComponentNode child);
+    method public static androidx.ui.core.ComponentNode? findClosestParentNode(androidx.ui.core.ComponentNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.ComponentNode,java.lang.Boolean> selector);
+    method public static androidx.ui.core.LayoutNode? findLastLayoutChild(androidx.ui.core.ComponentNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutNode,java.lang.Boolean> block);
+    method public static androidx.ui.core.DataNodeKey<java.lang.Object> getParentDataKey();
+    method public static boolean hasNoLayoutDescendants(androidx.ui.core.ComponentNode);
+    method public static boolean isAttached(androidx.ui.core.ComponentNode);
+    method public static androidx.ui.core.Owner requireOwner(androidx.ui.core.ComponentNode);
+    method public static void visitLayoutChildren(androidx.ui.core.ComponentNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutNode,kotlin.Unit> block);
+  }
+
+  public final class DataNode<T> extends androidx.ui.core.ComponentNode {
+    ctor public DataNode(androidx.ui.core.DataNodeKey<T> key, T! value);
+    method public androidx.ui.core.DataNodeKey<T> getKey();
+    method public T! getValue();
+    method public void setValue(T? p);
+  }
+
+  public final class DataNodeKey<T> {
+    ctor public DataNodeKey(String name);
+    method public String getName();
+  }
+
+  public final class DebugUtilsKt {
+  }
+
+  public final class DrawNode extends androidx.ui.core.ComponentNode {
+    ctor public DrawNode();
+    method public boolean getNeedsPaint();
+    method public kotlin.jvm.functions.Function3<androidx.ui.unit.Density,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? getOnPaint();
+    method public kotlin.jvm.functions.Function3<androidx.ui.core.ContentDrawScope,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? getOnPaintWithChildren();
+    method public void invalidate();
+    method public void setNeedsPaint(boolean p);
+    method public void setOnPaint(kotlin.jvm.functions.Function3<? super androidx.ui.unit.Density,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit>? value);
+    method public void setOnPaintWithChildren(kotlin.jvm.functions.Function3<? super androidx.ui.core.ContentDrawScope,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit>? value);
+    property public final boolean needsPaint;
+    property public final kotlin.jvm.functions.Function3<androidx.ui.unit.Density,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? onPaint;
+    property public final kotlin.jvm.functions.Function3<androidx.ui.core.ContentDrawScope,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? onPaintWithChildren;
+  }
+
+  public final class FocusNode extends androidx.ui.core.ComponentNode {
+    ctor public FocusNode();
+    method public boolean captureFocus();
+    method public boolean freeFocus();
+    method public androidx.ui.focus.FocusDetailedState getFocusState();
+    method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> getRecompose();
+    method public androidx.ui.core.Ref<androidx.ui.core.FocusNode>? getRef();
+    method public void requestFocus(boolean propagateFocus = true);
+    method public void setLayoutCoordinates(androidx.ui.core.LayoutCoordinates? p);
+    method public void setRecompose(kotlin.jvm.functions.Function0<kotlin.Unit> value);
+    method public void setRef(androidx.ui.core.Ref<androidx.ui.core.FocusNode>? value);
+    property public final androidx.ui.focus.FocusDetailedState focusState;
+    property public final androidx.ui.core.LayoutCoordinates? layoutCoordinates;
+    property public final kotlin.jvm.functions.Function0<kotlin.Unit> recompose;
+    property public final androidx.ui.core.Ref<androidx.ui.core.FocusNode>? ref;
+  }
+
+  public final class LayoutNode extends androidx.ui.core.ComponentNode implements androidx.ui.core.Measurable {
+    ctor public LayoutNode();
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public boolean getAffectsParentSize();
+    method public androidx.ui.unit.IntPx? getAlignmentLine(androidx.ui.core.AlignmentLine line);
+    method @Deprecated public boolean getCanMultiMeasure();
+    method public androidx.ui.core.Constraints getConstraints();
+    method public androidx.ui.core.LayoutNode? getContainingLayoutNode$lintWithKotlin();
+    method public androidx.ui.core.LayoutCoordinates getCoordinates();
+    method @Deprecated public boolean getHandlesParentData();
+    method public int getHeight();
+    method public java.util.List<androidx.ui.core.LayoutNode> getLayoutChildren();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public androidx.ui.core.LayoutNode.MeasureBlocks getMeasureBlocks();
+    method public androidx.ui.core.MeasureScope getMeasureScope();
+    method public androidx.ui.core.Modifier getModifier();
+    method public java.util.List<androidx.ui.core.ModifierInfo> getModifierInfo();
+    method public boolean getNeedsRelayout();
+    method public boolean getNeedsRemeasure();
+    method public kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? getOnAttach();
+    method public kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? getOnDetach();
+    method public Object? getParentData();
+    method public boolean getPositionedDuringMeasurePass();
+    method public androidx.ui.core.Ref<androidx.ui.core.LayoutNode>? getRef();
+    method public int getWidth();
+    method public boolean hitTest(androidx.ui.unit.PxPosition pointerPositionRelativeToScreen, java.util.List<androidx.ui.core.pointerinput.PointerInputFilter> hitPointerInputFilters);
+    method public void ignoreModelReads(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public boolean isLayingOut();
+    method public boolean isMeasuring();
+    method public boolean isPlaced();
+    method public void layout();
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public void onInvalidate();
+    method public void place-rRMsBxU(int x, int y);
+    method public void requestRemeasure();
+    method @Deprecated public void setCanMultiMeasure(boolean p);
+    method public void setConstraints(androidx.ui.core.Constraints p);
+    method @Deprecated public void setHandlesParentData(boolean p);
+    method public void setLayoutDirection(androidx.ui.core.LayoutDirection p);
+    method public void setMeasureBlocks(androidx.ui.core.LayoutNode.MeasureBlocks value);
+    method public void setModifier(androidx.ui.core.Modifier value);
+    method public void setOnAttach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
+    method public void setOnDetach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
+    method public void setPositionedDuringMeasurePass(boolean p);
+    method public void setRef(androidx.ui.core.Ref<androidx.ui.core.LayoutNode>? value);
+    property public final boolean affectsParentSize;
+    property @Deprecated public final boolean canMultiMeasure;
+    property public final androidx.ui.core.Constraints constraints;
+    property public androidx.ui.core.LayoutNode? containingLayoutNode;
+    property public final androidx.ui.core.LayoutCoordinates coordinates;
+    property @Deprecated public final boolean handlesParentData;
+    property public final int height;
+    property public final boolean isLayingOut;
+    property public final boolean isMeasuring;
+    property public final boolean isPlaced;
+    property public final java.util.List<androidx.ui.core.LayoutNode> layoutChildren;
+    property public final androidx.ui.core.LayoutDirection layoutDirection;
+    property public final androidx.ui.core.LayoutNode.MeasureBlocks measureBlocks;
+    property public final androidx.ui.core.MeasureScope measureScope;
+    property public final androidx.ui.core.Modifier modifier;
+    property public final boolean needsRelayout;
+    property public final boolean needsRemeasure;
+    property public final kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? onAttach;
+    property public final kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? onDetach;
+    property public Object? parentData;
+    property public androidx.ui.core.LayoutNode? parentLayoutNode;
+    property public final boolean positionedDuringMeasurePass;
+    property public final androidx.ui.core.Ref<androidx.ui.core.LayoutNode>? ref;
+    property public final int width;
+  }
+
+  public static interface LayoutNode.MeasureBlocks {
+    method public int maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope measureScope, java.util.List<? extends androidx.ui.core.Measurable> measurables, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public abstract static class LayoutNode.NoIntrinsicsMeasureBlocks implements androidx.ui.core.LayoutNode.MeasureBlocks {
+    ctor public LayoutNode.NoIntrinsicsMeasureBlocks(String error);
+    method public Void maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class ModelObserver {
+    ctor public ModelObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> commitExecutor);
+    method public void clear(Object target);
+    method public void enableModelUpdatesObserving(boolean enabled);
+    method public <T> void observeReads(T target, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onCommit, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void pauseObservingReads(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public final class ModifierInfo {
+    ctor public ModifierInfo(androidx.ui.core.Modifier modifier, androidx.ui.core.LayoutCoordinates coordinates, Object? extra);
+    method public androidx.ui.core.LayoutCoordinates getCoordinates();
+    method public Object? getExtra();
+    method public androidx.ui.core.Modifier getModifier();
+  }
+
+  public interface OwnedLayer {
+    method public void destroy();
+    method public void drawLayer(androidx.ui.graphics.Canvas canvas);
+    method public long getLayerId();
+    method public android.graphics.Matrix getMatrix();
+    method public void invalidate();
+    method public void move(androidx.ui.unit.IntPxPosition position);
+    method public void resize(androidx.ui.unit.IntPxSize size);
+    method public void updateDisplayList();
+    method public void updateLayerProperties();
+    property public abstract long layerId;
+  }
+
+  public interface Owner {
+    method public androidx.ui.unit.IntPxPosition calculatePosition();
+    method public void callDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.core.ComponentNode node, androidx.ui.unit.PxSize parentSize);
+    method public androidx.ui.core.OwnedLayer createLayer(androidx.ui.core.DrawLayerModifier drawLayerModifier, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.Canvas,kotlin.Unit> drawBlock, kotlin.jvm.functions.Function0<kotlin.Unit> invalidateParentLayer);
+    method public androidx.ui.autofill.Autofill? getAutofill();
+    method public androidx.ui.autofill.AutofillTree getAutofillTree();
+    method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> getConfigurationChangeObserver();
+    method public androidx.ui.unit.Density getDensity();
+    method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+    method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
+    method public androidx.lifecycle.LifecycleOwner? getLifecycleOwner();
+    method public long getMeasureIteration();
+    method public androidx.ui.core.LayoutNode getRoot();
+    method public androidx.ui.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
+    method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
+    method public boolean getShowLayoutBounds();
+    method public androidx.ui.input.TextInputService getTextInputService();
+    method public void measureAndLayout();
+    method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void observeMeasureModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void onAttach(androidx.ui.core.ComponentNode node);
+    method public void onDetach(androidx.ui.core.ComponentNode node);
+    method public void onInvalidate(androidx.ui.core.DrawNode drawNode);
+    method public void onInvalidate(androidx.ui.core.LayoutNode layoutNode);
+    method public void onRequestMeasure(androidx.ui.core.LayoutNode layoutNode);
+    method public void pauseModelReadObserveration(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public boolean requestFocus();
+    method public void setConfigurationChangeObserver(kotlin.jvm.functions.Function0<kotlin.Unit> p);
+    method public void setOnLifecycleOwnerAvailable(kotlin.jvm.functions.Function1<? super androidx.lifecycle.LifecycleOwner,kotlin.Unit> callback);
+    method public void setOnSavedStateRegistryAvailable(kotlin.jvm.functions.Function1<? super androidx.ui.savedinstancestate.UiSavedStateRegistry,kotlin.Unit> callback);
+    property public abstract androidx.ui.autofill.Autofill? autofill;
+    property public abstract androidx.ui.autofill.AutofillTree autofillTree;
+    property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
+    property public abstract kotlin.jvm.functions.Function0<kotlin.Unit> configurationChangeObserver;
+    property public abstract androidx.ui.unit.Density density;
+    property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+    property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
+    property public abstract androidx.lifecycle.LifecycleOwner? lifecycleOwner;
+    property public abstract long measureIteration;
+    property public abstract androidx.ui.core.LayoutNode root;
+    property public abstract androidx.ui.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
+    property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
+    property public abstract boolean showLayoutBounds;
+    property public abstract androidx.ui.input.TextInputService textInputService;
+    field public static final androidx.ui.core.Owner.Companion! Companion;
+  }
+
+  public static final class Owner.Companion {
+    method public boolean getEnableExtraAssertions();
+    method public void setEnableExtraAssertions(boolean p);
+    property public final boolean enableExtraAssertions;
+  }
+
+  public final class PointerInputNode extends androidx.ui.core.ComponentNode {
+    ctor public PointerInputNode();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> getCancelHandler();
+    method public kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? getCustomEventHandler();
+    method public kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? getInitHandler();
+    method public kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> getPointerInputHandler();
+    method public void setCancelHandler(kotlin.jvm.functions.Function0<kotlin.Unit> p);
+    method public void setCustomEventHandler(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? p);
+    method public void setInitHandler(kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? p);
+    method public void setPointerInputHandler(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> p);
+    property public final kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler;
+    property public final kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler;
+    property public final kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler;
+    property public final kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler;
+  }
+
+  public final class SavedStateDelegateKt {
+  }
+
+}
+
+package androidx.ui.core.clipboard {
+
+  public final class AndroidClipboardManagerKt {
+  }
+
+  public interface ClipboardManager {
+    method public androidx.ui.text.AnnotatedString? getText();
+    method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+  }
+
+}
+
+package androidx.ui.core.focus {
+
+  public final class FocusModifierImplKt {
+    method public static androidx.ui.focus.FocusModifier createFocusModifier(androidx.ui.focus.FocusDetailedState focusDetailedState);
+  }
+
+  public final class FocusNodeUtilsKt {
+    method public static void initializeFocusState(androidx.ui.core.FocusNode);
+  }
+
+}
+
+package androidx.ui.core.hapticfeedback {
+
+  public interface HapticFeedback {
+    method public void performHapticFeedback(androidx.ui.core.hapticfeedback.HapticFeedbackType hapticFeedbackType);
+  }
+
+  public enum HapticFeedbackType {
+    enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType LongPress;
+    enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType TextHandleMove;
+  }
+
+}
+
+package androidx.ui.core.pointerinput {
+
+  public final class MotionEventAdapter {
+    ctor public MotionEventAdapter();
+  }
+
+  public final class PointerInputEventData {
+    method public long component1();
+    method public androidx.ui.core.PointerInputData component2();
+    method public androidx.ui.core.pointerinput.PointerInputEventData copy-tII9_pY(long id, androidx.ui.core.PointerInputData pointerInputData);
+    method public long getId();
+    method public androidx.ui.core.PointerInputData getPointerInputData();
+  }
+
+  public final class PointerInputEventProcessorKt {
+  }
+
+  public abstract class PointerInputFilter {
+    ctor public PointerInputFilter();
+    method public abstract void onCancel();
+    method public void onCustomEvent(androidx.ui.core.CustomEvent customEvent, androidx.ui.core.PointerEventPass pass);
+    method public void onInit(androidx.ui.core.CustomEventDispatcher customEventDispatcher);
+    method public abstract java.util.List<androidx.ui.core.PointerInputChange> onPointerInput(java.util.List<androidx.ui.core.PointerInputChange> changes, androidx.ui.core.PointerEventPass pass, androidx.ui.unit.IntPxSize bounds);
+  }
+
+  public interface PointerInputModifier extends androidx.ui.core.Modifier.Element {
+    method public androidx.ui.core.pointerinput.PointerInputFilter getPointerInputFilter();
+    property public abstract androidx.ui.core.pointerinput.PointerInputFilter pointerInputFilter;
+  }
+
+}
+
+package androidx.ui.core.semantics {
+
+  public final class SemanticsConfiguration implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.ui.semantics.SemanticsPropertyKey<?>,?>> kotlin.jvm.internal.markers.KMappedMarker androidx.ui.semantics.SemanticsPropertyReceiver {
+    ctor public SemanticsConfiguration();
+    method public operator <T> boolean contains(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    method public androidx.ui.core.semantics.SemanticsConfiguration copy();
+    method public operator <T> T! get(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> T! getOrElse(androidx.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public <T> T? getOrElseNullable(androidx.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public boolean isEmpty();
+    method public boolean isMergingSemanticsOfDescendants();
+    method public boolean isSemanticBoundary();
+    method public java.util.Iterator<java.util.Map.Entry<androidx.ui.semantics.SemanticsPropertyKey<?>,java.lang.Object>> iterator();
+    method public <T> void set(androidx.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+    method public void setMergingSemanticsOfDescendants(boolean value);
+    method public void setSemanticBoundary(boolean value);
+    property public final boolean isEmpty;
+    property public final boolean isMergingSemanticsOfDescendants;
+    property public final boolean isSemanticBoundary;
+  }
+
+  public final class SemanticsConfigurationKt {
+    method public static <T> T? getOrNull(androidx.ui.core.semantics.SemanticsConfiguration, androidx.ui.semantics.SemanticsPropertyKey<T> key);
+  }
+
+  public final class SemanticsHintOverrides {
+    ctor public SemanticsHintOverrides(String? onTapHint, String? onLongPressHint);
+    method public String? component1();
+    method public String? component2();
+    method public androidx.ui.core.semantics.SemanticsHintOverrides copy(String? onTapHint, String? onLongPressHint);
+    method public String? getOnLongPressHint();
+    method public String? getOnTapHint();
+    method public boolean isNotEmpty();
+    property public final boolean isNotEmpty;
+  }
+
+  public interface SemanticsModifier extends androidx.ui.core.Modifier.Element {
+    method public int getId();
+    method public androidx.ui.core.semantics.SemanticsConfiguration getSemanticsConfiguration();
+    property public abstract int id;
+    property public abstract androidx.ui.core.semantics.SemanticsConfiguration semanticsConfiguration;
+  }
+
+  public final class SemanticsModifierKt {
+    method @Deprecated public static androidx.ui.core.semantics.SemanticsModifier semanticsCore(androidx.ui.core.Modifier, boolean container = false, boolean mergeAllDescendants = false, kotlin.jvm.functions.Function1<? super androidx.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit>? properties = null);
+  }
+
+  public final class SemanticsNode {
+    method public androidx.ui.unit.PxBounds getBoundsInRoot();
+    method public java.util.List<androidx.ui.core.semantics.SemanticsNode> getChildren();
+    method public androidx.ui.core.ComponentNode getComponentNode();
+    method public androidx.ui.core.semantics.SemanticsConfiguration getConfig();
+    method public androidx.ui.unit.PxBounds getGlobalBounds();
+    method public androidx.ui.unit.PxPosition getGlobalPosition();
+    method public boolean getHasChildren();
+    method public int getId();
+    method public androidx.ui.core.semantics.SemanticsNode? getParent();
+    method public androidx.ui.unit.IntPxSize getSize();
+    method public androidx.ui.core.semantics.SemanticsConfiguration getUnmergedConfig();
+    method public boolean isSemanticBoundary();
+    method public void setComponentNode(androidx.ui.core.ComponentNode p);
+    property public final androidx.ui.unit.PxBounds boundsInRoot;
+    property public final java.util.List<androidx.ui.core.semantics.SemanticsNode> children;
+    property public final androidx.ui.core.semantics.SemanticsConfiguration config;
+    property public final androidx.ui.unit.PxBounds globalBounds;
+    property public final androidx.ui.unit.PxPosition globalPosition;
+    property public final boolean hasChildren;
+    property public final boolean isSemanticBoundary;
+    property public final androidx.ui.core.semantics.SemanticsNode? parent;
+    property public final androidx.ui.unit.IntPxSize size;
+    field public static final androidx.ui.core.semantics.SemanticsNode.Companion! Companion;
+  }
+
+  public static final class SemanticsNode.Companion {
+    method public int generateNewId();
+  }
+
+  public final class SemanticsNodeKt {
+    method public static androidx.ui.core.semantics.SemanticsNode? findClosestParentNode(androidx.ui.core.semantics.SemanticsNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.semantics.SemanticsNode,java.lang.Boolean> selector);
+  }
+
+  public final class SemanticsOwner {
+    ctor public SemanticsOwner(androidx.ui.core.ComponentNode rootNode);
+    method public androidx.ui.core.semantics.SemanticsNode getRootSemanticsNode();
+    property public final androidx.ui.core.semantics.SemanticsNode rootSemanticsNode;
+  }
+
+  public final class SemanticsOwnerKt {
+    method public static java.util.List<androidx.ui.core.semantics.SemanticsNode> getAllSemanticsNodes(androidx.ui.core.semantics.SemanticsOwner);
+  }
+
+}
+
+package androidx.ui.input {
+
+  public final class InputStateKt {
+  }
+
+  public final class RecordingInputConnectionKt {
+  }
+
+}
+
+package androidx.ui.platform {
+
+  public final class AndroidUriHandler implements androidx.ui.platform.UriHandler {
+    ctor public AndroidUriHandler(android.content.Context context);
+    method public void openUri(String uri);
+  }
+
+  public interface UriHandler {
+    method public void openUri(String uri);
+  }
+
+}
+
+package androidx.ui.temputils {
+
+  public final class CoroutineUtilsKt {
+    method public static kotlinx.coroutines.Job delay(androidx.ui.unit.Duration duration, kotlin.coroutines.CoroutineContext context, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+}
+
diff --git a/ui/ui-platform/api/current.txt b/ui/ui-platform/api/current.txt
index 36d7415..62bad6a 100644
--- a/ui/ui-platform/api/current.txt
+++ b/ui/ui-platform/api/current.txt
@@ -121,7 +121,7 @@
     method @Deprecated public boolean getHandlesParentData();
     method public int getHeight();
     method public java.util.List<androidx.ui.core.LayoutNode> getLayoutChildren();
-    method public androidx.ui.core.LayoutDirection? getLayoutDirection();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
     method public androidx.ui.core.LayoutNode.MeasureBlocks getMeasureBlocks();
     method public androidx.ui.core.MeasureScope getMeasureScope();
     method public androidx.ui.core.Modifier getModifier();
@@ -140,18 +140,18 @@
     method public boolean isMeasuring();
     method public boolean isPlaced();
     method public void layout();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public void onInvalidate();
     method public void place-rRMsBxU(int x, int y);
     method public void requestRemeasure();
     method @Deprecated public void setCanMultiMeasure(boolean p);
     method public void setConstraints(androidx.ui.core.Constraints p);
     method @Deprecated public void setHandlesParentData(boolean p);
-    method public void setLayoutDirection(androidx.ui.core.LayoutDirection? p);
+    method public void setLayoutDirection(androidx.ui.core.LayoutDirection p);
     method public void setMeasureBlocks(androidx.ui.core.LayoutNode.MeasureBlocks value);
     method public void setModifier(androidx.ui.core.Modifier value);
     method public void setOnAttach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
@@ -169,7 +169,7 @@
     property public final boolean isMeasuring;
     property public final boolean isPlaced;
     property public final java.util.List<androidx.ui.core.LayoutNode> layoutChildren;
-    property public final androidx.ui.core.LayoutDirection? layoutDirection;
+    property public final androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.core.LayoutNode.MeasureBlocks measureBlocks;
     property public final androidx.ui.core.MeasureScope measureScope;
     property public final androidx.ui.core.Modifier modifier;
@@ -184,26 +184,20 @@
     property public final int width;
   }
 
-  public abstract static class LayoutNode.InnerMeasureScope extends androidx.ui.core.MeasureScope {
-    ctor public LayoutNode.InnerMeasureScope();
-    method public abstract androidx.ui.core.LayoutNode getLayoutNode();
-    property public abstract androidx.ui.core.LayoutNode layoutNode;
-  }
-
   public static interface LayoutNode.MeasureBlocks {
-    method public int maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope measureScope, java.util.List<? extends androidx.ui.core.Measurable> measurables, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public abstract static class LayoutNode.NoIntrinsicsMeasureBlocks implements androidx.ui.core.LayoutNode.MeasureBlocks {
     ctor public LayoutNode.NoIntrinsicsMeasureBlocks(String error);
-    method public Void maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public final class ModelObserver {
diff --git a/ui/ui-platform/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-platform/api/public_plus_experimental_0.1.0-dev10.txt
index 9e4e151..0bba3da 100644
--- a/ui/ui-platform/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/ui/ui-platform/api/public_plus_experimental_0.1.0-dev10.txt
@@ -122,7 +122,7 @@
     method @Deprecated public boolean getHandlesParentData();
     method public int getHeight();
     method public java.util.List<androidx.ui.core.LayoutNode> getLayoutChildren();
-    method public androidx.ui.core.LayoutDirection? getLayoutDirection();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
     method public androidx.ui.core.LayoutNode.MeasureBlocks getMeasureBlocks();
     method public androidx.ui.core.MeasureScope getMeasureScope();
     method public androidx.ui.core.Modifier getModifier();
@@ -141,18 +141,18 @@
     method public boolean isMeasuring();
     method public boolean isPlaced();
     method public void layout();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public void onInvalidate();
     method public void place-rRMsBxU(int x, int y);
     method public void requestRemeasure();
     method @Deprecated public void setCanMultiMeasure(boolean p);
     method public void setConstraints(androidx.ui.core.Constraints p);
     method @Deprecated public void setHandlesParentData(boolean p);
-    method public void setLayoutDirection(androidx.ui.core.LayoutDirection? p);
+    method public void setLayoutDirection(androidx.ui.core.LayoutDirection p);
     method public void setMeasureBlocks(androidx.ui.core.LayoutNode.MeasureBlocks value);
     method public void setModifier(androidx.ui.core.Modifier value);
     method public void setOnAttach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
@@ -170,7 +170,7 @@
     property public final boolean isMeasuring;
     property public final boolean isPlaced;
     property public final java.util.List<androidx.ui.core.LayoutNode> layoutChildren;
-    property public final androidx.ui.core.LayoutDirection? layoutDirection;
+    property public final androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.core.LayoutNode.MeasureBlocks measureBlocks;
     property public final androidx.ui.core.MeasureScope measureScope;
     property public final androidx.ui.core.Modifier modifier;
@@ -185,26 +185,20 @@
     property public final int width;
   }
 
-  public abstract static class LayoutNode.InnerMeasureScope extends androidx.ui.core.MeasureScope {
-    ctor public LayoutNode.InnerMeasureScope();
-    method public abstract androidx.ui.core.LayoutNode getLayoutNode();
-    property public abstract androidx.ui.core.LayoutNode layoutNode;
-  }
-
   public static interface LayoutNode.MeasureBlocks {
-    method public int maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope measureScope, java.util.List<? extends androidx.ui.core.Measurable> measurables, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public abstract static class LayoutNode.NoIntrinsicsMeasureBlocks implements androidx.ui.core.LayoutNode.MeasureBlocks {
     ctor public LayoutNode.NoIntrinsicsMeasureBlocks(String error);
-    method public Void maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public final class ModelObserver {
diff --git a/ui/ui-platform/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-platform/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..0bba3da
--- /dev/null
+++ b/ui/ui-platform/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,500 @@
+// Signature format: 3.0
+package androidx.ui.autofill {
+
+  public final class AndroidAutofillDebugUtilsKt {
+  }
+
+  public final class AndroidAutofillKt {
+  }
+
+  public final class AndroidAutofillTypeKt {
+  }
+
+}
+
+package androidx.ui.core {
+
+  public interface AndroidOwner extends androidx.ui.core.Owner {
+    method public void addAndroidView(android.view.View view, androidx.ui.core.LayoutNode layoutNode);
+    method public android.view.View getView();
+    method public void removeAndroidView(android.view.View view);
+    property public abstract android.view.View view;
+  }
+
+  public final class AndroidOwnerKt {
+    method public static androidx.ui.core.AndroidOwner createOwner(android.content.Context context, androidx.lifecycle.LifecycleOwner? lifecycleOwner = null);
+    method public static androidx.ui.core.LayoutDirection getLocaleLayoutDirection(android.content.res.Configuration);
+  }
+
+  public abstract sealed class ComponentNode {
+    method public void attach(androidx.ui.core.Owner owner);
+    method public void detach();
+    method public final operator androidx.ui.core.ComponentNode get(int index);
+    method public final int getCount();
+    method public final int getDepth();
+    method public final androidx.ui.core.Owner? getOwner();
+    method public final Object? getOwnerData();
+    method public final androidx.ui.core.ComponentNode? getParent();
+    method public androidx.ui.core.LayoutNode? getParentLayoutNode();
+    method public final void insertAt(int index, androidx.ui.core.ComponentNode instance);
+    method public final void move(int from, int to, int count);
+    method public final void removeAt(int index, int count);
+    method public final void setDepth(int p);
+    method public final void setOwnerData(Object? p);
+    method public final inline void visitChildren(kotlin.jvm.functions.Function1<? super androidx.ui.core.ComponentNode,kotlin.Unit> block);
+    method public final inline void visitChildrenReverse(kotlin.jvm.functions.Function1<? super androidx.ui.core.ComponentNode,kotlin.Unit> block);
+    property public final int count;
+    property public final int depth;
+    property public final androidx.ui.core.Owner? owner;
+    property public final Object? ownerData;
+    property public final androidx.ui.core.ComponentNode? parent;
+    property public androidx.ui.core.LayoutNode? parentLayoutNode;
+  }
+
+  public final class ComponentNodesKt {
+    method public static void add(androidx.ui.core.ComponentNode, androidx.ui.core.ComponentNode child);
+    method public static androidx.ui.core.ComponentNode? findClosestParentNode(androidx.ui.core.ComponentNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.ComponentNode,java.lang.Boolean> selector);
+    method public static androidx.ui.core.LayoutNode? findLastLayoutChild(androidx.ui.core.ComponentNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutNode,java.lang.Boolean> block);
+    method public static androidx.ui.core.DataNodeKey<java.lang.Object> getParentDataKey();
+    method public static boolean hasNoLayoutDescendants(androidx.ui.core.ComponentNode);
+    method public static boolean isAttached(androidx.ui.core.ComponentNode);
+    method public static androidx.ui.core.Owner requireOwner(androidx.ui.core.ComponentNode);
+    method public static void visitLayoutChildren(androidx.ui.core.ComponentNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutNode,kotlin.Unit> block);
+  }
+
+  public final class DataNode<T> extends androidx.ui.core.ComponentNode {
+    ctor public DataNode(androidx.ui.core.DataNodeKey<T> key, T! value);
+    method public androidx.ui.core.DataNodeKey<T> getKey();
+    method public T! getValue();
+    method public void setValue(T? p);
+  }
+
+  public final class DataNodeKey<T> {
+    ctor public DataNodeKey(String name);
+    method public String getName();
+  }
+
+  public final class DebugUtilsKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static String simpleIdentityToString(Object obj, String? name = null);
+  }
+
+  public final class DrawNode extends androidx.ui.core.ComponentNode {
+    ctor public DrawNode();
+    method public boolean getNeedsPaint();
+    method public kotlin.jvm.functions.Function3<androidx.ui.unit.Density,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? getOnPaint();
+    method public kotlin.jvm.functions.Function3<androidx.ui.core.ContentDrawScope,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? getOnPaintWithChildren();
+    method public void invalidate();
+    method public void setNeedsPaint(boolean p);
+    method public void setOnPaint(kotlin.jvm.functions.Function3<? super androidx.ui.unit.Density,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit>? value);
+    method public void setOnPaintWithChildren(kotlin.jvm.functions.Function3<? super androidx.ui.core.ContentDrawScope,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit>? value);
+    property public final boolean needsPaint;
+    property public final kotlin.jvm.functions.Function3<androidx.ui.unit.Density,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? onPaint;
+    property public final kotlin.jvm.functions.Function3<androidx.ui.core.ContentDrawScope,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? onPaintWithChildren;
+  }
+
+  public final class FocusNode extends androidx.ui.core.ComponentNode {
+    ctor public FocusNode();
+    method public boolean captureFocus();
+    method public boolean freeFocus();
+    method public androidx.ui.focus.FocusDetailedState getFocusState();
+    method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> getRecompose();
+    method public androidx.ui.core.Ref<androidx.ui.core.FocusNode>? getRef();
+    method public void requestFocus(boolean propagateFocus = true);
+    method public void setLayoutCoordinates(androidx.ui.core.LayoutCoordinates? p);
+    method public void setRecompose(kotlin.jvm.functions.Function0<kotlin.Unit> value);
+    method public void setRef(androidx.ui.core.Ref<androidx.ui.core.FocusNode>? value);
+    property public final androidx.ui.focus.FocusDetailedState focusState;
+    property public final androidx.ui.core.LayoutCoordinates? layoutCoordinates;
+    property public final kotlin.jvm.functions.Function0<kotlin.Unit> recompose;
+    property public final androidx.ui.core.Ref<androidx.ui.core.FocusNode>? ref;
+  }
+
+  public final class LayoutNode extends androidx.ui.core.ComponentNode implements androidx.ui.core.Measurable {
+    ctor public LayoutNode();
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public boolean getAffectsParentSize();
+    method public androidx.ui.unit.IntPx? getAlignmentLine(androidx.ui.core.AlignmentLine line);
+    method @Deprecated public boolean getCanMultiMeasure();
+    method public androidx.ui.core.Constraints getConstraints();
+    method public androidx.ui.core.LayoutNode? getContainingLayoutNode$lintWithKotlin();
+    method public androidx.ui.core.LayoutCoordinates getCoordinates();
+    method @Deprecated public boolean getHandlesParentData();
+    method public int getHeight();
+    method public java.util.List<androidx.ui.core.LayoutNode> getLayoutChildren();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public androidx.ui.core.LayoutNode.MeasureBlocks getMeasureBlocks();
+    method public androidx.ui.core.MeasureScope getMeasureScope();
+    method public androidx.ui.core.Modifier getModifier();
+    method public java.util.List<androidx.ui.core.ModifierInfo> getModifierInfo();
+    method public boolean getNeedsRelayout();
+    method public boolean getNeedsRemeasure();
+    method public kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? getOnAttach();
+    method public kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? getOnDetach();
+    method public Object? getParentData();
+    method public boolean getPositionedDuringMeasurePass();
+    method public androidx.ui.core.Ref<androidx.ui.core.LayoutNode>? getRef();
+    method public int getWidth();
+    method public boolean hitTest(androidx.ui.unit.PxPosition pointerPositionRelativeToScreen, java.util.List<androidx.ui.core.pointerinput.PointerInputFilter> hitPointerInputFilters);
+    method public void ignoreModelReads(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public boolean isLayingOut();
+    method public boolean isMeasuring();
+    method public boolean isPlaced();
+    method public void layout();
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public void onInvalidate();
+    method public void place-rRMsBxU(int x, int y);
+    method public void requestRemeasure();
+    method @Deprecated public void setCanMultiMeasure(boolean p);
+    method public void setConstraints(androidx.ui.core.Constraints p);
+    method @Deprecated public void setHandlesParentData(boolean p);
+    method public void setLayoutDirection(androidx.ui.core.LayoutDirection p);
+    method public void setMeasureBlocks(androidx.ui.core.LayoutNode.MeasureBlocks value);
+    method public void setModifier(androidx.ui.core.Modifier value);
+    method public void setOnAttach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
+    method public void setOnDetach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
+    method public void setPositionedDuringMeasurePass(boolean p);
+    method public void setRef(androidx.ui.core.Ref<androidx.ui.core.LayoutNode>? value);
+    property public final boolean affectsParentSize;
+    property @Deprecated public final boolean canMultiMeasure;
+    property public final androidx.ui.core.Constraints constraints;
+    property public androidx.ui.core.LayoutNode? containingLayoutNode;
+    property public final androidx.ui.core.LayoutCoordinates coordinates;
+    property @Deprecated public final boolean handlesParentData;
+    property public final int height;
+    property public final boolean isLayingOut;
+    property public final boolean isMeasuring;
+    property public final boolean isPlaced;
+    property public final java.util.List<androidx.ui.core.LayoutNode> layoutChildren;
+    property public final androidx.ui.core.LayoutDirection layoutDirection;
+    property public final androidx.ui.core.LayoutNode.MeasureBlocks measureBlocks;
+    property public final androidx.ui.core.MeasureScope measureScope;
+    property public final androidx.ui.core.Modifier modifier;
+    property public final boolean needsRelayout;
+    property public final boolean needsRemeasure;
+    property public final kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? onAttach;
+    property public final kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? onDetach;
+    property public Object? parentData;
+    property public androidx.ui.core.LayoutNode? parentLayoutNode;
+    property public final boolean positionedDuringMeasurePass;
+    property public final androidx.ui.core.Ref<androidx.ui.core.LayoutNode>? ref;
+    property public final int width;
+  }
+
+  public static interface LayoutNode.MeasureBlocks {
+    method public int maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope measureScope, java.util.List<? extends androidx.ui.core.Measurable> measurables, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public abstract static class LayoutNode.NoIntrinsicsMeasureBlocks implements androidx.ui.core.LayoutNode.MeasureBlocks {
+    ctor public LayoutNode.NoIntrinsicsMeasureBlocks(String error);
+    method public Void maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class ModelObserver {
+    ctor public ModelObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> commitExecutor);
+    method public void clear(Object target);
+    method public void enableModelUpdatesObserving(boolean enabled);
+    method public <T> void observeReads(T target, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onCommit, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void pauseObservingReads(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+  public final class ModifierInfo {
+    ctor public ModifierInfo(androidx.ui.core.Modifier modifier, androidx.ui.core.LayoutCoordinates coordinates, Object? extra);
+    method public androidx.ui.core.LayoutCoordinates getCoordinates();
+    method public Object? getExtra();
+    method public androidx.ui.core.Modifier getModifier();
+  }
+
+  public interface OwnedLayer {
+    method public void destroy();
+    method public void drawLayer(androidx.ui.graphics.Canvas canvas);
+    method public long getLayerId();
+    method public android.graphics.Matrix getMatrix();
+    method public void invalidate();
+    method public void move(androidx.ui.unit.IntPxPosition position);
+    method public void resize(androidx.ui.unit.IntPxSize size);
+    method public void updateDisplayList();
+    method public void updateLayerProperties();
+    property public abstract long layerId;
+  }
+
+  public interface Owner {
+    method public androidx.ui.unit.IntPxPosition calculatePosition();
+    method public void callDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.core.ComponentNode node, androidx.ui.unit.PxSize parentSize);
+    method public androidx.ui.core.OwnedLayer createLayer(androidx.ui.core.DrawLayerModifier drawLayerModifier, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.Canvas,kotlin.Unit> drawBlock, kotlin.jvm.functions.Function0<kotlin.Unit> invalidateParentLayer);
+    method public androidx.ui.autofill.Autofill? getAutofill();
+    method public androidx.ui.autofill.AutofillTree getAutofillTree();
+    method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> getConfigurationChangeObserver();
+    method public androidx.ui.unit.Density getDensity();
+    method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+    method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
+    method public androidx.lifecycle.LifecycleOwner? getLifecycleOwner();
+    method public long getMeasureIteration();
+    method public androidx.ui.core.LayoutNode getRoot();
+    method public androidx.ui.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
+    method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
+    method public boolean getShowLayoutBounds();
+    method public androidx.ui.input.TextInputService getTextInputService();
+    method public void measureAndLayout();
+    method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void observeMeasureModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void onAttach(androidx.ui.core.ComponentNode node);
+    method public void onDetach(androidx.ui.core.ComponentNode node);
+    method public void onInvalidate(androidx.ui.core.DrawNode drawNode);
+    method public void onInvalidate(androidx.ui.core.LayoutNode layoutNode);
+    method public void onRequestMeasure(androidx.ui.core.LayoutNode layoutNode);
+    method public void pauseModelReadObserveration(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public boolean requestFocus();
+    method public void setConfigurationChangeObserver(kotlin.jvm.functions.Function0<kotlin.Unit> p);
+    method public void setOnLifecycleOwnerAvailable(kotlin.jvm.functions.Function1<? super androidx.lifecycle.LifecycleOwner,kotlin.Unit> callback);
+    method public void setOnSavedStateRegistryAvailable(kotlin.jvm.functions.Function1<? super androidx.ui.savedinstancestate.UiSavedStateRegistry,kotlin.Unit> callback);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void setShowLayoutBounds(boolean p);
+    property public abstract androidx.ui.autofill.Autofill? autofill;
+    property public abstract androidx.ui.autofill.AutofillTree autofillTree;
+    property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
+    property public abstract kotlin.jvm.functions.Function0<kotlin.Unit> configurationChangeObserver;
+    property public abstract androidx.ui.unit.Density density;
+    property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+    property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
+    property public abstract androidx.lifecycle.LifecycleOwner? lifecycleOwner;
+    property public abstract long measureIteration;
+    property public abstract androidx.ui.core.LayoutNode root;
+    property public abstract androidx.ui.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
+    property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
+    property public abstract boolean showLayoutBounds;
+    property public abstract androidx.ui.input.TextInputService textInputService;
+    field public static final androidx.ui.core.Owner.Companion! Companion;
+  }
+
+  public static final class Owner.Companion {
+    method public boolean getEnableExtraAssertions();
+    method public void setEnableExtraAssertions(boolean p);
+    property public final boolean enableExtraAssertions;
+  }
+
+  public final class PointerInputNode extends androidx.ui.core.ComponentNode {
+    ctor public PointerInputNode();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> getCancelHandler();
+    method public kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? getCustomEventHandler();
+    method public kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? getInitHandler();
+    method public kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> getPointerInputHandler();
+    method public void setCancelHandler(kotlin.jvm.functions.Function0<kotlin.Unit> p);
+    method public void setCustomEventHandler(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? p);
+    method public void setInitHandler(kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? p);
+    method public void setPointerInputHandler(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> p);
+    property public final kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler;
+    property public final kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler;
+    property public final kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler;
+    property public final kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler;
+  }
+
+  public final class SavedStateDelegateKt {
+  }
+
+}
+
+package androidx.ui.core.clipboard {
+
+  public final class AndroidClipboardManagerKt {
+  }
+
+  public interface ClipboardManager {
+    method public androidx.ui.text.AnnotatedString? getText();
+    method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+  }
+
+}
+
+package androidx.ui.core.focus {
+
+  public final class FocusModifierImplKt {
+    method public static androidx.ui.focus.FocusModifier createFocusModifier(androidx.ui.focus.FocusDetailedState focusDetailedState);
+  }
+
+  public final class FocusNodeUtilsKt {
+    method public static void initializeFocusState(androidx.ui.core.FocusNode);
+  }
+
+}
+
+package androidx.ui.core.hapticfeedback {
+
+  public interface HapticFeedback {
+    method public void performHapticFeedback(androidx.ui.core.hapticfeedback.HapticFeedbackType hapticFeedbackType);
+  }
+
+  public enum HapticFeedbackType {
+    enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType LongPress;
+    enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType TextHandleMove;
+  }
+
+}
+
+package androidx.ui.core.pointerinput {
+
+  public final class MotionEventAdapter {
+    ctor public MotionEventAdapter();
+  }
+
+  public final class PointerInputEventData {
+    method public long component1();
+    method public androidx.ui.core.PointerInputData component2();
+    method public androidx.ui.core.pointerinput.PointerInputEventData copy-tII9_pY(long id, androidx.ui.core.PointerInputData pointerInputData);
+    method public long getId();
+    method public androidx.ui.core.PointerInputData getPointerInputData();
+  }
+
+  public final class PointerInputEventProcessorKt {
+  }
+
+  public abstract class PointerInputFilter {
+    ctor public PointerInputFilter();
+    method public abstract void onCancel();
+    method public void onCustomEvent(androidx.ui.core.CustomEvent customEvent, androidx.ui.core.PointerEventPass pass);
+    method public void onInit(androidx.ui.core.CustomEventDispatcher customEventDispatcher);
+    method public abstract java.util.List<androidx.ui.core.PointerInputChange> onPointerInput(java.util.List<androidx.ui.core.PointerInputChange> changes, androidx.ui.core.PointerEventPass pass, androidx.ui.unit.IntPxSize bounds);
+  }
+
+  public interface PointerInputModifier extends androidx.ui.core.Modifier.Element {
+    method public androidx.ui.core.pointerinput.PointerInputFilter getPointerInputFilter();
+    property public abstract androidx.ui.core.pointerinput.PointerInputFilter pointerInputFilter;
+  }
+
+}
+
+package androidx.ui.core.semantics {
+
+  public final class SemanticsConfiguration implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.ui.semantics.SemanticsPropertyKey<?>,?>> kotlin.jvm.internal.markers.KMappedMarker androidx.ui.semantics.SemanticsPropertyReceiver {
+    ctor public SemanticsConfiguration();
+    method public operator <T> boolean contains(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    method public androidx.ui.core.semantics.SemanticsConfiguration copy();
+    method public operator <T> T! get(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> T! getOrElse(androidx.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public <T> T? getOrElseNullable(androidx.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public boolean isEmpty();
+    method public boolean isMergingSemanticsOfDescendants();
+    method public boolean isSemanticBoundary();
+    method public java.util.Iterator<java.util.Map.Entry<androidx.ui.semantics.SemanticsPropertyKey<?>,java.lang.Object>> iterator();
+    method public <T> void set(androidx.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+    method public void setMergingSemanticsOfDescendants(boolean value);
+    method public void setSemanticBoundary(boolean value);
+    property public final boolean isEmpty;
+    property public final boolean isMergingSemanticsOfDescendants;
+    property public final boolean isSemanticBoundary;
+  }
+
+  public final class SemanticsConfigurationKt {
+    method public static <T> T? getOrNull(androidx.ui.core.semantics.SemanticsConfiguration, androidx.ui.semantics.SemanticsPropertyKey<T> key);
+  }
+
+  public final class SemanticsHintOverrides {
+    ctor public SemanticsHintOverrides(String? onTapHint, String? onLongPressHint);
+    method public String? component1();
+    method public String? component2();
+    method public androidx.ui.core.semantics.SemanticsHintOverrides copy(String? onTapHint, String? onLongPressHint);
+    method public String? getOnLongPressHint();
+    method public String? getOnTapHint();
+    method public boolean isNotEmpty();
+    property public final boolean isNotEmpty;
+  }
+
+  public interface SemanticsModifier extends androidx.ui.core.Modifier.Element {
+    method public int getId();
+    method public androidx.ui.core.semantics.SemanticsConfiguration getSemanticsConfiguration();
+    property public abstract int id;
+    property public abstract androidx.ui.core.semantics.SemanticsConfiguration semanticsConfiguration;
+  }
+
+  public final class SemanticsModifierKt {
+    method @Deprecated public static androidx.ui.core.semantics.SemanticsModifier semanticsCore(androidx.ui.core.Modifier, boolean container = false, boolean mergeAllDescendants = false, kotlin.jvm.functions.Function1<? super androidx.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit>? properties = null);
+  }
+
+  public final class SemanticsNode {
+    method public androidx.ui.unit.PxBounds getBoundsInRoot();
+    method public java.util.List<androidx.ui.core.semantics.SemanticsNode> getChildren();
+    method public androidx.ui.core.ComponentNode getComponentNode();
+    method public androidx.ui.core.semantics.SemanticsConfiguration getConfig();
+    method public androidx.ui.unit.PxBounds getGlobalBounds();
+    method public androidx.ui.unit.PxPosition getGlobalPosition();
+    method public boolean getHasChildren();
+    method public int getId();
+    method public androidx.ui.core.semantics.SemanticsNode? getParent();
+    method public androidx.ui.unit.IntPxSize getSize();
+    method public androidx.ui.core.semantics.SemanticsConfiguration getUnmergedConfig();
+    method public boolean isSemanticBoundary();
+    method public void setComponentNode(androidx.ui.core.ComponentNode p);
+    property public final androidx.ui.unit.PxBounds boundsInRoot;
+    property public final java.util.List<androidx.ui.core.semantics.SemanticsNode> children;
+    property public final androidx.ui.core.semantics.SemanticsConfiguration config;
+    property public final androidx.ui.unit.PxBounds globalBounds;
+    property public final androidx.ui.unit.PxPosition globalPosition;
+    property public final boolean hasChildren;
+    property public final boolean isSemanticBoundary;
+    property public final androidx.ui.core.semantics.SemanticsNode? parent;
+    property public final androidx.ui.unit.IntPxSize size;
+    field public static final androidx.ui.core.semantics.SemanticsNode.Companion! Companion;
+  }
+
+  public static final class SemanticsNode.Companion {
+    method public int generateNewId();
+  }
+
+  public final class SemanticsNodeKt {
+    method public static androidx.ui.core.semantics.SemanticsNode? findClosestParentNode(androidx.ui.core.semantics.SemanticsNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.semantics.SemanticsNode,java.lang.Boolean> selector);
+  }
+
+  public final class SemanticsOwner {
+    ctor public SemanticsOwner(androidx.ui.core.ComponentNode rootNode);
+    method public androidx.ui.core.semantics.SemanticsNode getRootSemanticsNode();
+    property public final androidx.ui.core.semantics.SemanticsNode rootSemanticsNode;
+  }
+
+  public final class SemanticsOwnerKt {
+    method public static java.util.List<androidx.ui.core.semantics.SemanticsNode> getAllSemanticsNodes(androidx.ui.core.semantics.SemanticsOwner);
+  }
+
+}
+
+package androidx.ui.input {
+
+  public final class InputStateKt {
+  }
+
+  public final class RecordingInputConnectionKt {
+  }
+
+}
+
+package androidx.ui.platform {
+
+  public final class AndroidUriHandler implements androidx.ui.platform.UriHandler {
+    ctor public AndroidUriHandler(android.content.Context context);
+    method public void openUri(String uri);
+  }
+
+  public interface UriHandler {
+    method public void openUri(String uri);
+  }
+
+}
+
+package androidx.ui.temputils {
+
+  public final class CoroutineUtilsKt {
+    method public static kotlinx.coroutines.Job delay(androidx.ui.unit.Duration duration, kotlin.coroutines.CoroutineContext context, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+}
+
diff --git a/ui/ui-platform/api/public_plus_experimental_current.txt b/ui/ui-platform/api/public_plus_experimental_current.txt
index 9e4e151..0bba3da 100644
--- a/ui/ui-platform/api/public_plus_experimental_current.txt
+++ b/ui/ui-platform/api/public_plus_experimental_current.txt
@@ -122,7 +122,7 @@
     method @Deprecated public boolean getHandlesParentData();
     method public int getHeight();
     method public java.util.List<androidx.ui.core.LayoutNode> getLayoutChildren();
-    method public androidx.ui.core.LayoutDirection? getLayoutDirection();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
     method public androidx.ui.core.LayoutNode.MeasureBlocks getMeasureBlocks();
     method public androidx.ui.core.MeasureScope getMeasureScope();
     method public androidx.ui.core.Modifier getModifier();
@@ -141,18 +141,18 @@
     method public boolean isMeasuring();
     method public boolean isPlaced();
     method public void layout();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public void onInvalidate();
     method public void place-rRMsBxU(int x, int y);
     method public void requestRemeasure();
     method @Deprecated public void setCanMultiMeasure(boolean p);
     method public void setConstraints(androidx.ui.core.Constraints p);
     method @Deprecated public void setHandlesParentData(boolean p);
-    method public void setLayoutDirection(androidx.ui.core.LayoutDirection? p);
+    method public void setLayoutDirection(androidx.ui.core.LayoutDirection p);
     method public void setMeasureBlocks(androidx.ui.core.LayoutNode.MeasureBlocks value);
     method public void setModifier(androidx.ui.core.Modifier value);
     method public void setOnAttach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
@@ -170,7 +170,7 @@
     property public final boolean isMeasuring;
     property public final boolean isPlaced;
     property public final java.util.List<androidx.ui.core.LayoutNode> layoutChildren;
-    property public final androidx.ui.core.LayoutDirection? layoutDirection;
+    property public final androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.core.LayoutNode.MeasureBlocks measureBlocks;
     property public final androidx.ui.core.MeasureScope measureScope;
     property public final androidx.ui.core.Modifier modifier;
@@ -185,26 +185,20 @@
     property public final int width;
   }
 
-  public abstract static class LayoutNode.InnerMeasureScope extends androidx.ui.core.MeasureScope {
-    ctor public LayoutNode.InnerMeasureScope();
-    method public abstract androidx.ui.core.LayoutNode getLayoutNode();
-    property public abstract androidx.ui.core.LayoutNode layoutNode;
-  }
-
   public static interface LayoutNode.MeasureBlocks {
-    method public int maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope measureScope, java.util.List<? extends androidx.ui.core.Measurable> measurables, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public abstract static class LayoutNode.NoIntrinsicsMeasureBlocks implements androidx.ui.core.LayoutNode.MeasureBlocks {
     ctor public LayoutNode.NoIntrinsicsMeasureBlocks(String error);
-    method public Void maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public final class ModelObserver {
diff --git a/ui/ui-platform/api/res-0.1.0-dev11.txt b/ui/ui-platform/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-platform/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-platform/api/restricted_0.1.0-dev10.txt b/ui/ui-platform/api/restricted_0.1.0-dev10.txt
index 905bd31..220aef0 100644
--- a/ui/ui-platform/api/restricted_0.1.0-dev10.txt
+++ b/ui/ui-platform/api/restricted_0.1.0-dev10.txt
@@ -128,7 +128,7 @@
     method @Deprecated public boolean getHandlesParentData();
     method public int getHeight();
     method public java.util.List<androidx.ui.core.LayoutNode> getLayoutChildren();
-    method public androidx.ui.core.LayoutDirection? getLayoutDirection();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
     method public androidx.ui.core.LayoutNode.MeasureBlocks getMeasureBlocks();
     method public androidx.ui.core.MeasureScope getMeasureScope();
     method public androidx.ui.core.Modifier getModifier();
@@ -147,18 +147,18 @@
     method public boolean isMeasuring();
     method public boolean isPlaced();
     method public void layout();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public void onInvalidate();
     method public void place-rRMsBxU(int x, int y);
     method public void requestRemeasure();
     method @Deprecated public void setCanMultiMeasure(boolean p);
     method public void setConstraints(androidx.ui.core.Constraints p);
     method @Deprecated public void setHandlesParentData(boolean p);
-    method public void setLayoutDirection(androidx.ui.core.LayoutDirection? p);
+    method public void setLayoutDirection(androidx.ui.core.LayoutDirection p);
     method public void setMeasureBlocks(androidx.ui.core.LayoutNode.MeasureBlocks value);
     method public void setModifier(androidx.ui.core.Modifier value);
     method public void setOnAttach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
@@ -176,7 +176,7 @@
     property public final boolean isMeasuring;
     property public final boolean isPlaced;
     property public final java.util.List<androidx.ui.core.LayoutNode> layoutChildren;
-    property public final androidx.ui.core.LayoutDirection? layoutDirection;
+    property public final androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.core.LayoutNode.MeasureBlocks measureBlocks;
     property public final androidx.ui.core.MeasureScope measureScope;
     property public final androidx.ui.core.Modifier modifier;
@@ -191,26 +191,20 @@
     property public final int width;
   }
 
-  public abstract static class LayoutNode.InnerMeasureScope extends androidx.ui.core.MeasureScope {
-    ctor public LayoutNode.InnerMeasureScope();
-    method public abstract androidx.ui.core.LayoutNode getLayoutNode();
-    property public abstract androidx.ui.core.LayoutNode layoutNode;
-  }
-
   public static interface LayoutNode.MeasureBlocks {
-    method public int maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope measureScope, java.util.List<? extends androidx.ui.core.Measurable> measurables, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public abstract static class LayoutNode.NoIntrinsicsMeasureBlocks implements androidx.ui.core.LayoutNode.MeasureBlocks {
     ctor public LayoutNode.NoIntrinsicsMeasureBlocks(String error);
-    method public Void maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public final class ModelObserver {
diff --git a/ui/ui-platform/api/restricted_0.1.0-dev11.txt b/ui/ui-platform/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..220aef0
--- /dev/null
+++ b/ui/ui-platform/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,508 @@
+// Signature format: 3.0
+package androidx.ui.autofill {
+
+  public final class AndroidAutofillDebugUtilsKt {
+  }
+
+  public final class AndroidAutofillKt {
+  }
+
+  public final class AndroidAutofillTypeKt {
+  }
+
+}
+
+package androidx.ui.core {
+
+  public interface AndroidOwner extends androidx.ui.core.Owner {
+    method public void addAndroidView(android.view.View view, androidx.ui.core.LayoutNode layoutNode);
+    method public android.view.View getView();
+    method public void removeAndroidView(android.view.View view);
+    property public abstract android.view.View view;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static final class AndroidOwner.Companion {
+    method public kotlin.jvm.functions.Function1<androidx.ui.core.AndroidOwner,kotlin.Unit>? getOnAndroidOwnerCreatedCallback();
+    method public void setOnAndroidOwnerCreatedCallback(kotlin.jvm.functions.Function1<? super androidx.ui.core.AndroidOwner,kotlin.Unit>? p);
+    property public final kotlin.jvm.functions.Function1<androidx.ui.core.AndroidOwner,kotlin.Unit>? onAndroidOwnerCreatedCallback;
+  }
+
+  public final class AndroidOwnerKt {
+    method public static androidx.ui.core.AndroidOwner createOwner(android.content.Context context, androidx.lifecycle.LifecycleOwner? lifecycleOwner = null);
+    method public static androidx.ui.core.LayoutDirection getLocaleLayoutDirection(android.content.res.Configuration);
+  }
+
+  public abstract sealed class ComponentNode {
+    method public void attach(androidx.ui.core.Owner owner);
+    method public void detach();
+    method public final operator androidx.ui.core.ComponentNode get(int index);
+    method public final int getCount();
+    method public final int getDepth();
+    method public final androidx.ui.core.Owner? getOwner();
+    method public final Object? getOwnerData();
+    method public final androidx.ui.core.ComponentNode? getParent();
+    method public androidx.ui.core.LayoutNode? getParentLayoutNode();
+    method public final void insertAt(int index, androidx.ui.core.ComponentNode instance);
+    method public final void move(int from, int to, int count);
+    method public final void removeAt(int index, int count);
+    method public final void setDepth(int p);
+    method public final void setOwnerData(Object? p);
+    method public final inline void visitChildren(kotlin.jvm.functions.Function1<? super androidx.ui.core.ComponentNode,kotlin.Unit> block);
+    method public final inline void visitChildrenReverse(kotlin.jvm.functions.Function1<? super androidx.ui.core.ComponentNode,kotlin.Unit> block);
+    property public final int count;
+    property public final int depth;
+    property public final androidx.ui.core.Owner? owner;
+    property public final Object? ownerData;
+    property public final androidx.ui.core.ComponentNode? parent;
+    property public androidx.ui.core.LayoutNode? parentLayoutNode;
+  }
+
+  public final class ComponentNodesKt {
+    method public static void add(androidx.ui.core.ComponentNode, androidx.ui.core.ComponentNode child);
+    method public static androidx.ui.core.ComponentNode? findClosestParentNode(androidx.ui.core.ComponentNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.ComponentNode,java.lang.Boolean> selector);
+    method public static androidx.ui.core.LayoutNode? findLastLayoutChild(androidx.ui.core.ComponentNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutNode,java.lang.Boolean> block);
+    method public static androidx.ui.core.DataNodeKey<java.lang.Object> getParentDataKey();
+    method public static boolean hasNoLayoutDescendants(androidx.ui.core.ComponentNode);
+    method public static boolean isAttached(androidx.ui.core.ComponentNode);
+    method public static androidx.ui.core.Owner requireOwner(androidx.ui.core.ComponentNode);
+    method public static void visitLayoutChildren(androidx.ui.core.ComponentNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.LayoutNode,kotlin.Unit> block);
+  }
+
+  public final class DataNode<T> extends androidx.ui.core.ComponentNode {
+    ctor public DataNode(androidx.ui.core.DataNodeKey<T> key, T! value);
+    method public androidx.ui.core.DataNodeKey<T> getKey();
+    method public T! getValue();
+    method public void setValue(T? p);
+  }
+
+  public final class DataNodeKey<T> {
+    ctor public DataNodeKey(String name);
+    method public String getName();
+  }
+
+  public final class DebugUtilsKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static String simpleIdentityToString(Object obj, String? name = null);
+  }
+
+  public final class DrawNode extends androidx.ui.core.ComponentNode {
+    ctor public DrawNode();
+    method public boolean getNeedsPaint();
+    method public kotlin.jvm.functions.Function3<androidx.ui.unit.Density,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? getOnPaint();
+    method public kotlin.jvm.functions.Function3<androidx.ui.core.ContentDrawScope,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? getOnPaintWithChildren();
+    method public void invalidate();
+    method public void setNeedsPaint(boolean p);
+    method public void setOnPaint(kotlin.jvm.functions.Function3<? super androidx.ui.unit.Density,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit>? value);
+    method public void setOnPaintWithChildren(kotlin.jvm.functions.Function3<? super androidx.ui.core.ContentDrawScope,? super androidx.ui.graphics.Canvas,? super androidx.ui.unit.PxSize,kotlin.Unit>? value);
+    property public final boolean needsPaint;
+    property public final kotlin.jvm.functions.Function3<androidx.ui.unit.Density,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? onPaint;
+    property public final kotlin.jvm.functions.Function3<androidx.ui.core.ContentDrawScope,androidx.ui.graphics.Canvas,androidx.ui.unit.PxSize,kotlin.Unit>? onPaintWithChildren;
+  }
+
+  public final class FocusNode extends androidx.ui.core.ComponentNode {
+    ctor public FocusNode();
+    method public boolean captureFocus();
+    method public boolean freeFocus();
+    method public androidx.ui.focus.FocusDetailedState getFocusState();
+    method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> getRecompose();
+    method public androidx.ui.core.Ref<androidx.ui.core.FocusNode>? getRef();
+    method public void requestFocus(boolean propagateFocus = true);
+    method public void setLayoutCoordinates(androidx.ui.core.LayoutCoordinates? p);
+    method public void setRecompose(kotlin.jvm.functions.Function0<kotlin.Unit> value);
+    method public void setRef(androidx.ui.core.Ref<androidx.ui.core.FocusNode>? value);
+    property public final androidx.ui.focus.FocusDetailedState focusState;
+    property public final androidx.ui.core.LayoutCoordinates? layoutCoordinates;
+    property public final kotlin.jvm.functions.Function0<kotlin.Unit> recompose;
+    property public final androidx.ui.core.Ref<androidx.ui.core.FocusNode>? ref;
+  }
+
+  public final class LayoutNode extends androidx.ui.core.ComponentNode implements androidx.ui.core.Measurable {
+    ctor public LayoutNode();
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public boolean getAffectsParentSize();
+    method public androidx.ui.unit.IntPx? getAlignmentLine(androidx.ui.core.AlignmentLine line);
+    method @Deprecated public boolean getCanMultiMeasure();
+    method public androidx.ui.core.Constraints getConstraints();
+    method public androidx.ui.core.LayoutNode? getContainingLayoutNode$lintWithKotlin();
+    method public androidx.ui.core.LayoutCoordinates getCoordinates();
+    method @Deprecated public boolean getHandlesParentData();
+    method public int getHeight();
+    method public java.util.List<androidx.ui.core.LayoutNode> getLayoutChildren();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public androidx.ui.core.LayoutNode.MeasureBlocks getMeasureBlocks();
+    method public androidx.ui.core.MeasureScope getMeasureScope();
+    method public androidx.ui.core.Modifier getModifier();
+    method public java.util.List<androidx.ui.core.ModifierInfo> getModifierInfo();
+    method public boolean getNeedsRelayout();
+    method public boolean getNeedsRemeasure();
+    method public kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? getOnAttach();
+    method public kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? getOnDetach();
+    method public Object? getParentData();
+    method public boolean getPositionedDuringMeasurePass();
+    method public androidx.ui.core.Ref<androidx.ui.core.LayoutNode>? getRef();
+    method public int getWidth();
+    method public boolean hitTest(androidx.ui.unit.PxPosition pointerPositionRelativeToScreen, java.util.List<androidx.ui.core.pointerinput.PointerInputFilter> hitPointerInputFilters);
+    method public void ignoreModelReads(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public boolean isLayingOut();
+    method public boolean isMeasuring();
+    method public boolean isPlaced();
+    method public void layout();
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public void onInvalidate();
+    method public void place-rRMsBxU(int x, int y);
+    method public void requestRemeasure();
+    method @Deprecated public void setCanMultiMeasure(boolean p);
+    method public void setConstraints(androidx.ui.core.Constraints p);
+    method @Deprecated public void setHandlesParentData(boolean p);
+    method public void setLayoutDirection(androidx.ui.core.LayoutDirection p);
+    method public void setMeasureBlocks(androidx.ui.core.LayoutNode.MeasureBlocks value);
+    method public void setModifier(androidx.ui.core.Modifier value);
+    method public void setOnAttach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
+    method public void setOnDetach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
+    method public void setPositionedDuringMeasurePass(boolean p);
+    method public void setRef(androidx.ui.core.Ref<androidx.ui.core.LayoutNode>? value);
+    property public final boolean affectsParentSize;
+    property @Deprecated public final boolean canMultiMeasure;
+    property public final androidx.ui.core.Constraints constraints;
+    property public androidx.ui.core.LayoutNode? containingLayoutNode;
+    property public final androidx.ui.core.LayoutCoordinates coordinates;
+    property @Deprecated public final boolean handlesParentData;
+    property public final int height;
+    property public final boolean isLayingOut;
+    property public final boolean isMeasuring;
+    property public final boolean isPlaced;
+    property public final java.util.List<androidx.ui.core.LayoutNode> layoutChildren;
+    property public final androidx.ui.core.LayoutDirection layoutDirection;
+    property public final androidx.ui.core.LayoutNode.MeasureBlocks measureBlocks;
+    property public final androidx.ui.core.MeasureScope measureScope;
+    property public final androidx.ui.core.Modifier modifier;
+    property public final boolean needsRelayout;
+    property public final boolean needsRemeasure;
+    property public final kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? onAttach;
+    property public final kotlin.jvm.functions.Function1<androidx.ui.core.Owner,kotlin.Unit>? onDetach;
+    property public Object? parentData;
+    property public androidx.ui.core.LayoutNode? parentLayoutNode;
+    property public final boolean positionedDuringMeasurePass;
+    property public final androidx.ui.core.Ref<androidx.ui.core.LayoutNode>? ref;
+    property public final int width;
+  }
+
+  public static interface LayoutNode.MeasureBlocks {
+    method public int maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope measureScope, java.util.List<? extends androidx.ui.core.Measurable> measurables, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public abstract static class LayoutNode.NoIntrinsicsMeasureBlocks implements androidx.ui.core.LayoutNode.MeasureBlocks {
+    ctor public LayoutNode.NoIntrinsicsMeasureBlocks(String error);
+    method public Void maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+  }
+
+  public final class ModelObserver {
+    ctor public ModelObserver(kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> commitExecutor);
+    method public void clear(Object target);
+    method public void enableModelUpdatesObserving(boolean enabled);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public kotlin.jvm.functions.Function2<java.util.Set<?>,androidx.compose.frames.Frame,kotlin.Unit> getFrameCommitObserver();
+    method public <T> void observeReads(T target, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onCommit, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void pauseObservingReads(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final kotlin.jvm.functions.Function2<java.util.Set<?>,androidx.compose.frames.Frame,kotlin.Unit> frameCommitObserver;
+  }
+
+  public final class ModifierInfo {
+    ctor public ModifierInfo(androidx.ui.core.Modifier modifier, androidx.ui.core.LayoutCoordinates coordinates, Object? extra);
+    method public androidx.ui.core.LayoutCoordinates getCoordinates();
+    method public Object? getExtra();
+    method public androidx.ui.core.Modifier getModifier();
+  }
+
+  public interface OwnedLayer {
+    method public void destroy();
+    method public void drawLayer(androidx.ui.graphics.Canvas canvas);
+    method public long getLayerId();
+    method public android.graphics.Matrix getMatrix();
+    method public void invalidate();
+    method public void move(androidx.ui.unit.IntPxPosition position);
+    method public void resize(androidx.ui.unit.IntPxSize size);
+    method public void updateDisplayList();
+    method public void updateLayerProperties();
+    property public abstract long layerId;
+  }
+
+  public interface Owner {
+    method public androidx.ui.unit.IntPxPosition calculatePosition();
+    method public void callDraw(androidx.ui.graphics.Canvas canvas, androidx.ui.core.ComponentNode node, androidx.ui.unit.PxSize parentSize);
+    method public androidx.ui.core.OwnedLayer createLayer(androidx.ui.core.DrawLayerModifier drawLayerModifier, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.Canvas,kotlin.Unit> drawBlock, kotlin.jvm.functions.Function0<kotlin.Unit> invalidateParentLayer);
+    method public androidx.ui.autofill.Autofill? getAutofill();
+    method public androidx.ui.autofill.AutofillTree getAutofillTree();
+    method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> getConfigurationChangeObserver();
+    method public androidx.ui.unit.Density getDensity();
+    method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+    method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
+    method public androidx.lifecycle.LifecycleOwner? getLifecycleOwner();
+    method public long getMeasureIteration();
+    method public androidx.ui.core.LayoutNode getRoot();
+    method public androidx.ui.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
+    method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
+    method public boolean getShowLayoutBounds();
+    method public androidx.ui.input.TextInputService getTextInputService();
+    method public void measureAndLayout();
+    method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void observeMeasureModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public void onAttach(androidx.ui.core.ComponentNode node);
+    method public void onDetach(androidx.ui.core.ComponentNode node);
+    method public void onInvalidate(androidx.ui.core.DrawNode drawNode);
+    method public void onInvalidate(androidx.ui.core.LayoutNode layoutNode);
+    method public void onRequestMeasure(androidx.ui.core.LayoutNode layoutNode);
+    method public void pauseModelReadObserveration(kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    method public boolean requestFocus();
+    method public void setConfigurationChangeObserver(kotlin.jvm.functions.Function0<kotlin.Unit> p);
+    method public void setOnLifecycleOwnerAvailable(kotlin.jvm.functions.Function1<? super androidx.lifecycle.LifecycleOwner,kotlin.Unit> callback);
+    method public void setOnSavedStateRegistryAvailable(kotlin.jvm.functions.Function1<? super androidx.ui.savedinstancestate.UiSavedStateRegistry,kotlin.Unit> callback);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public void setShowLayoutBounds(boolean p);
+    property public abstract androidx.ui.autofill.Autofill? autofill;
+    property public abstract androidx.ui.autofill.AutofillTree autofillTree;
+    property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
+    property public abstract kotlin.jvm.functions.Function0<kotlin.Unit> configurationChangeObserver;
+    property public abstract androidx.ui.unit.Density density;
+    property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+    property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
+    property public abstract androidx.lifecycle.LifecycleOwner? lifecycleOwner;
+    property public abstract long measureIteration;
+    property public abstract androidx.ui.core.LayoutNode root;
+    property public abstract androidx.ui.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
+    property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
+    property public abstract boolean showLayoutBounds;
+    property public abstract androidx.ui.input.TextInputService textInputService;
+    field public static final androidx.ui.core.Owner.Companion! Companion;
+  }
+
+  public static final class Owner.Companion {
+    method public boolean getEnableExtraAssertions();
+    method public void setEnableExtraAssertions(boolean p);
+    property public final boolean enableExtraAssertions;
+  }
+
+  public final class PointerInputNode extends androidx.ui.core.ComponentNode {
+    ctor public PointerInputNode();
+    method public kotlin.jvm.functions.Function0<kotlin.Unit> getCancelHandler();
+    method public kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? getCustomEventHandler();
+    method public kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? getInitHandler();
+    method public kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> getPointerInputHandler();
+    method public void setCancelHandler(kotlin.jvm.functions.Function0<kotlin.Unit> p);
+    method public void setCustomEventHandler(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? p);
+    method public void setInitHandler(kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? p);
+    method public void setPointerInputHandler(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> p);
+    property public final kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler;
+    property public final kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler;
+    property public final kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler;
+    property public final kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler;
+  }
+
+  public final class SavedStateDelegateKt {
+  }
+
+}
+
+package androidx.ui.core.clipboard {
+
+  public final class AndroidClipboardManagerKt {
+  }
+
+  public interface ClipboardManager {
+    method public androidx.ui.text.AnnotatedString? getText();
+    method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+  }
+
+}
+
+package androidx.ui.core.focus {
+
+  public final class FocusModifierImplKt {
+    method public static androidx.ui.focus.FocusModifier createFocusModifier(androidx.ui.focus.FocusDetailedState focusDetailedState);
+  }
+
+  public final class FocusNodeUtilsKt {
+    method public static void initializeFocusState(androidx.ui.core.FocusNode);
+  }
+
+}
+
+package androidx.ui.core.hapticfeedback {
+
+  public interface HapticFeedback {
+    method public void performHapticFeedback(androidx.ui.core.hapticfeedback.HapticFeedbackType hapticFeedbackType);
+  }
+
+  public enum HapticFeedbackType {
+    enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType LongPress;
+    enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType TextHandleMove;
+  }
+
+}
+
+package androidx.ui.core.pointerinput {
+
+  public final class MotionEventAdapter {
+    ctor public MotionEventAdapter();
+  }
+
+  public final class PointerInputEventData {
+    method public long component1();
+    method public androidx.ui.core.PointerInputData component2();
+    method public androidx.ui.core.pointerinput.PointerInputEventData copy-tII9_pY(long id, androidx.ui.core.PointerInputData pointerInputData);
+    method public long getId();
+    method public androidx.ui.core.PointerInputData getPointerInputData();
+  }
+
+  public final class PointerInputEventProcessorKt {
+  }
+
+  public abstract class PointerInputFilter {
+    ctor public PointerInputFilter();
+    method public abstract void onCancel();
+    method public void onCustomEvent(androidx.ui.core.CustomEvent customEvent, androidx.ui.core.PointerEventPass pass);
+    method public void onInit(androidx.ui.core.CustomEventDispatcher customEventDispatcher);
+    method public abstract java.util.List<androidx.ui.core.PointerInputChange> onPointerInput(java.util.List<androidx.ui.core.PointerInputChange> changes, androidx.ui.core.PointerEventPass pass, androidx.ui.unit.IntPxSize bounds);
+  }
+
+  public interface PointerInputModifier extends androidx.ui.core.Modifier.Element {
+    method public androidx.ui.core.pointerinput.PointerInputFilter getPointerInputFilter();
+    property public abstract androidx.ui.core.pointerinput.PointerInputFilter pointerInputFilter;
+  }
+
+}
+
+package androidx.ui.core.semantics {
+
+  public final class SemanticsConfiguration implements java.lang.Iterable<java.util.Map.Entry<? extends androidx.ui.semantics.SemanticsPropertyKey<?>,?>> kotlin.jvm.internal.markers.KMappedMarker androidx.ui.semantics.SemanticsPropertyReceiver {
+    ctor public SemanticsConfiguration();
+    method public operator <T> boolean contains(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    method public androidx.ui.core.semantics.SemanticsConfiguration copy();
+    method public operator <T> T! get(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> T! getOrElse(androidx.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public <T> T? getOrElseNullable(androidx.ui.semantics.SemanticsPropertyKey<T> key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public boolean isEmpty();
+    method public boolean isMergingSemanticsOfDescendants();
+    method public boolean isSemanticBoundary();
+    method public java.util.Iterator<java.util.Map.Entry<androidx.ui.semantics.SemanticsPropertyKey<?>,java.lang.Object>> iterator();
+    method public <T> void set(androidx.ui.semantics.SemanticsPropertyKey<T> key, T? value);
+    method public void setMergingSemanticsOfDescendants(boolean value);
+    method public void setSemanticBoundary(boolean value);
+    property public final boolean isEmpty;
+    property public final boolean isMergingSemanticsOfDescendants;
+    property public final boolean isSemanticBoundary;
+  }
+
+  public final class SemanticsConfigurationKt {
+    method public static <T> T? getOrNull(androidx.ui.core.semantics.SemanticsConfiguration, androidx.ui.semantics.SemanticsPropertyKey<T> key);
+  }
+
+  public final class SemanticsHintOverrides {
+    ctor public SemanticsHintOverrides(String? onTapHint, String? onLongPressHint);
+    method public String? component1();
+    method public String? component2();
+    method public androidx.ui.core.semantics.SemanticsHintOverrides copy(String? onTapHint, String? onLongPressHint);
+    method public String? getOnLongPressHint();
+    method public String? getOnTapHint();
+    method public boolean isNotEmpty();
+    property public final boolean isNotEmpty;
+  }
+
+  public interface SemanticsModifier extends androidx.ui.core.Modifier.Element {
+    method public int getId();
+    method public androidx.ui.core.semantics.SemanticsConfiguration getSemanticsConfiguration();
+    property public abstract int id;
+    property public abstract androidx.ui.core.semantics.SemanticsConfiguration semanticsConfiguration;
+  }
+
+  public final class SemanticsModifierKt {
+    method @Deprecated public static androidx.ui.core.semantics.SemanticsModifier semanticsCore(androidx.ui.core.Modifier, boolean container = false, boolean mergeAllDescendants = false, kotlin.jvm.functions.Function1<? super androidx.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit>? properties = null);
+  }
+
+  public final class SemanticsNode {
+    method public androidx.ui.unit.PxBounds getBoundsInRoot();
+    method public java.util.List<androidx.ui.core.semantics.SemanticsNode> getChildren();
+    method public androidx.ui.core.ComponentNode getComponentNode();
+    method public androidx.ui.core.semantics.SemanticsConfiguration getConfig();
+    method public androidx.ui.unit.PxBounds getGlobalBounds();
+    method public androidx.ui.unit.PxPosition getGlobalPosition();
+    method public boolean getHasChildren();
+    method public int getId();
+    method public androidx.ui.core.semantics.SemanticsNode? getParent();
+    method public androidx.ui.unit.IntPxSize getSize();
+    method public androidx.ui.core.semantics.SemanticsConfiguration getUnmergedConfig();
+    method public boolean isSemanticBoundary();
+    method public void setComponentNode(androidx.ui.core.ComponentNode p);
+    property public final androidx.ui.unit.PxBounds boundsInRoot;
+    property public final java.util.List<androidx.ui.core.semantics.SemanticsNode> children;
+    property public final androidx.ui.core.semantics.SemanticsConfiguration config;
+    property public final androidx.ui.unit.PxBounds globalBounds;
+    property public final androidx.ui.unit.PxPosition globalPosition;
+    property public final boolean hasChildren;
+    property public final boolean isSemanticBoundary;
+    property public final androidx.ui.core.semantics.SemanticsNode? parent;
+    property public final androidx.ui.unit.IntPxSize size;
+    field public static final androidx.ui.core.semantics.SemanticsNode.Companion! Companion;
+  }
+
+  public static final class SemanticsNode.Companion {
+    method public int generateNewId();
+  }
+
+  public final class SemanticsNodeKt {
+    method public static androidx.ui.core.semantics.SemanticsNode? findClosestParentNode(androidx.ui.core.semantics.SemanticsNode, kotlin.jvm.functions.Function1<? super androidx.ui.core.semantics.SemanticsNode,java.lang.Boolean> selector);
+  }
+
+  public final class SemanticsOwner {
+    ctor public SemanticsOwner(androidx.ui.core.ComponentNode rootNode);
+    method public androidx.ui.core.semantics.SemanticsNode getRootSemanticsNode();
+    property public final androidx.ui.core.semantics.SemanticsNode rootSemanticsNode;
+  }
+
+  public final class SemanticsOwnerKt {
+    method public static java.util.List<androidx.ui.core.semantics.SemanticsNode> getAllSemanticsNodes(androidx.ui.core.semantics.SemanticsOwner);
+  }
+
+}
+
+package androidx.ui.input {
+
+  public final class InputStateKt {
+  }
+
+  public final class RecordingInputConnectionKt {
+  }
+
+}
+
+package androidx.ui.platform {
+
+  public final class AndroidUriHandler implements androidx.ui.platform.UriHandler {
+    ctor public AndroidUriHandler(android.content.Context context);
+    method public void openUri(String uri);
+  }
+
+  public interface UriHandler {
+    method public void openUri(String uri);
+  }
+
+}
+
+package androidx.ui.temputils {
+
+  public final class CoroutineUtilsKt {
+    method public static kotlinx.coroutines.Job delay(androidx.ui.unit.Duration duration, kotlin.coroutines.CoroutineContext context, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+  }
+
+}
+
diff --git a/ui/ui-platform/api/restricted_current.txt b/ui/ui-platform/api/restricted_current.txt
index 905bd31..220aef0 100644
--- a/ui/ui-platform/api/restricted_current.txt
+++ b/ui/ui-platform/api/restricted_current.txt
@@ -128,7 +128,7 @@
     method @Deprecated public boolean getHandlesParentData();
     method public int getHeight();
     method public java.util.List<androidx.ui.core.LayoutNode> getLayoutChildren();
-    method public androidx.ui.core.LayoutDirection? getLayoutDirection();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
     method public androidx.ui.core.LayoutNode.MeasureBlocks getMeasureBlocks();
     method public androidx.ui.core.MeasureScope getMeasureScope();
     method public androidx.ui.core.Modifier getModifier();
@@ -147,18 +147,18 @@
     method public boolean isMeasuring();
     method public boolean isPlaced();
     method public void layout();
-    method public int maxIntrinsicHeight-gshw56o(int width);
-    method public int maxIntrinsicWidth-gshw56o(int height);
-    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints);
-    method public int minIntrinsicHeight-gshw56o(int width);
-    method public int minIntrinsicWidth-gshw56o(int height);
+    method public int maxIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
+    method public androidx.ui.core.Placeable measure(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-Ujlv2dA(int width, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-Ujlv2dA(int height, androidx.ui.core.LayoutDirection layoutDirection);
     method public void onInvalidate();
     method public void place-rRMsBxU(int x, int y);
     method public void requestRemeasure();
     method @Deprecated public void setCanMultiMeasure(boolean p);
     method public void setConstraints(androidx.ui.core.Constraints p);
     method @Deprecated public void setHandlesParentData(boolean p);
-    method public void setLayoutDirection(androidx.ui.core.LayoutDirection? p);
+    method public void setLayoutDirection(androidx.ui.core.LayoutDirection p);
     method public void setMeasureBlocks(androidx.ui.core.LayoutNode.MeasureBlocks value);
     method public void setModifier(androidx.ui.core.Modifier value);
     method public void setOnAttach(kotlin.jvm.functions.Function1<? super androidx.ui.core.Owner,kotlin.Unit>? p);
@@ -176,7 +176,7 @@
     property public final boolean isMeasuring;
     property public final boolean isPlaced;
     property public final java.util.List<androidx.ui.core.LayoutNode> layoutChildren;
-    property public final androidx.ui.core.LayoutDirection? layoutDirection;
+    property public final androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.core.LayoutNode.MeasureBlocks measureBlocks;
     property public final androidx.ui.core.MeasureScope measureScope;
     property public final androidx.ui.core.Modifier modifier;
@@ -191,26 +191,20 @@
     property public final int width;
   }
 
-  public abstract static class LayoutNode.InnerMeasureScope extends androidx.ui.core.MeasureScope {
-    ctor public LayoutNode.InnerMeasureScope();
-    method public abstract androidx.ui.core.LayoutNode getLayoutNode();
-    property public abstract androidx.ui.core.LayoutNode layoutNode;
-  }
-
   public static interface LayoutNode.MeasureBlocks {
-    method public int maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
     method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope measureScope, java.util.List<? extends androidx.ui.core.Measurable> measurables, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public int minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public int minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public abstract static class LayoutNode.NoIntrinsicsMeasureBlocks implements androidx.ui.core.LayoutNode.MeasureBlocks {
     ctor public LayoutNode.NoIntrinsicsMeasureBlocks(String error);
-    method public Void maxIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void maxIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicHeight-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
-    method public Void minIntrinsicWidth-mV6jvqY(androidx.ui.unit.Density density, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void maxIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicHeight-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int w, androidx.ui.core.LayoutDirection layoutDirection);
+    method public Void minIntrinsicWidth-5Bu9FwI(androidx.ui.core.IntrinsicMeasureScope intrinsicMeasureScope, java.util.List<? extends androidx.ui.core.IntrinsicMeasurable> measurables, int h, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
   public final class ModelObserver {
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/AndroidOwner.kt b/ui/ui-platform/src/main/java/androidx/ui/core/AndroidOwner.kt
index 474a333..5e9a9b9 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/AndroidOwner.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/AndroidOwner.kt
@@ -421,7 +421,7 @@
                     if (layoutNode === root) {
                         // it is the root node - the only top node from relayoutNodes
                         // which needs to be remeasured.
-                        layoutNode.measure(constraints)
+                        layoutNode.measure(constraints, layoutNode.layoutDirection)
                     }
                     require(!layoutNode.needsRemeasure) {
                         "$layoutNode shouldn't require remeasure. relayoutNodes " +
@@ -794,13 +794,15 @@
                 return when {
                     measurables.isEmpty() -> measureScope.layout(IntPx.Zero, IntPx.Zero) {}
                     measurables.size == 1 -> {
-                        val placeable = measurables[0].measure(constraints)
+                        val placeable = measurables[0].measure(constraints, layoutDirection)
                         measureScope.layout(placeable.width, placeable.height) {
                             placeable.place(IntPx.Zero, IntPx.Zero)
                         }
                     }
                     else -> {
-                        val placeables = measurables.map { it.measure(constraints) }
+                        val placeables = measurables.map {
+                            it.measure(constraints, layoutDirection)
+                        }
                         var maxWidth = IntPx.Zero
                         var maxHeight = IntPx.Zero
                         placeables.forEach { placeable ->
@@ -817,28 +819,28 @@
             }
 
             override fun minIntrinsicWidth(
-                density: Density,
+                intrinsicMeasureScope: IntrinsicMeasureScope,
                 measurables: List<IntrinsicMeasurable>,
                 h: IntPx,
                 layoutDirection: LayoutDirection
             ) = error("Undefined intrinsics block and it is required")
 
             override fun minIntrinsicHeight(
-                density: Density,
+                intrinsicMeasureScope: IntrinsicMeasureScope,
                 measurables: List<IntrinsicMeasurable>,
                 w: IntPx,
                 layoutDirection: LayoutDirection
             ) = error("Undefined intrinsics block and it is required")
 
             override fun maxIntrinsicWidth(
-                density: Density,
+                intrinsicMeasureScope: IntrinsicMeasureScope,
                 measurables: List<IntrinsicMeasurable>,
                 h: IntPx,
                 layoutDirection: LayoutDirection
             ) = error("Undefined intrinsics block and it is required")
 
             override fun maxIntrinsicHeight(
-                density: Density,
+                intrinsicMeasureScope: IntrinsicMeasureScope,
                 measurables: List<IntrinsicMeasurable>,
                 w: IntPx,
                 layoutDirection: LayoutDirection
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/ComponentNodes.kt b/ui/ui-platform/src/main/java/androidx/ui/core/ComponentNodes.kt
index af36a5d..030a603 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/ComponentNodes.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/ComponentNodes.kt
@@ -685,7 +685,7 @@
          * The function used to calculate [IntrinsicMeasurable.minIntrinsicWidth].
          */
         fun minIntrinsicWidth(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             h: IntPx,
             layoutDirection: LayoutDirection
@@ -695,7 +695,7 @@
          * The lambda used to calculate [IntrinsicMeasurable.minIntrinsicHeight].
          */
         fun minIntrinsicHeight(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             w: IntPx,
             layoutDirection: LayoutDirection
@@ -705,7 +705,7 @@
          * The function used to calculate [IntrinsicMeasurable.maxIntrinsicWidth].
          */
         fun maxIntrinsicWidth(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             h: IntPx,
             layoutDirection: LayoutDirection
@@ -715,7 +715,7 @@
          * The lambda used to calculate [IntrinsicMeasurable.maxIntrinsicHeight].
          */
         fun maxIntrinsicHeight(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             w: IntPx,
             layoutDirection: LayoutDirection
@@ -724,39 +724,34 @@
 
     abstract class NoIntrinsicsMeasureBlocks(private val error: String) : MeasureBlocks {
         override fun minIntrinsicWidth(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             h: IntPx,
             layoutDirection: LayoutDirection
         ) = error(error)
 
         override fun minIntrinsicHeight(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             w: IntPx,
             layoutDirection: LayoutDirection
         ) = error(error)
 
         override fun maxIntrinsicWidth(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             h: IntPx,
             layoutDirection: LayoutDirection
         ) = error(error)
 
         override fun maxIntrinsicHeight(
-            density: Density,
+            intrinsicMeasureScope: IntrinsicMeasureScope,
             measurables: List<IntrinsicMeasurable>,
             w: IntPx,
             layoutDirection: LayoutDirection
         ) = error(error)
     }
 
-    // TODO(popam): used for multi composable children. Consider removing if possible.
-    abstract class InnerMeasureScope : MeasureScope() {
-        abstract val layoutNode: LayoutNode
-    }
-
     /**
      * Blocks that define the measurement and intrinsic measurement of the layout.
      */
@@ -771,14 +766,14 @@
     /**
      * The scope used to run the [MeasureBlocks.measure] [MeasureBlock].
      */
-    val measureScope: MeasureScope = object : InnerMeasureScope(), Density {
+    val measureScope: MeasureScope = object : MeasureScope(), Density {
         private val ownerDensity: Density
             get() = owner?.density ?: Density(1f)
         override val density: Float
             get() = ownerDensity.density
         override val fontScale: Float
             get() = ownerDensity.fontScale
-        override val layoutNode: LayoutNode = this@LayoutNode
+        override val layoutDirection: LayoutDirection get() = this@LayoutNode.layoutDirection
     }
 
     /**
@@ -789,14 +784,7 @@
     /**
      * The layout direction of the layout node.
      */
-    var layoutDirection: LayoutDirection? = null
-        get() {
-            if (field == null) {
-                // root node doesn't have a parent but its LD value is set during root creation
-                field = parentLayoutNode?.layoutDirection
-            }
-            return field
-        }
+    var layoutDirection: LayoutDirection = LayoutDirection.Ltr
 
     /**
      * Implementation oddity around composition; used to capture a reference to this
@@ -989,13 +977,13 @@
      * elevation as a zIndex. We will have a separate zIndex modifier later instead to decouple
      * this features.
      */
-    internal val zIndex: Float get() = outerLayerModifier?.elevation ?: 0f
+    internal val zIndex: Float get() = outerZIndexModifier?.zIndex ?: 0f
 
     /**
-     * The outermost DrawLayerModifier in the modifier chain or `null` if there are no
-     * DrawLayerModifiers in the modifier chain.
+     * The outermost ZIndexModifier in the modifier chain or `null` if there are no
+     * ZIndexModifier in the modifier chain.
      */
-    private var outerLayerModifier: DrawLayerModifier? = null
+    private var outerZIndexModifier: ZIndexModifier? = null
 
     /**
      * The [Modifier] currently applied to this node.
@@ -1010,7 +998,7 @@
             val addedCallback = hasNewPositioningCallback()
             onPositionedCallbacks.clear()
             onChildPositionedCallbacks.clear()
-            outerLayerModifier = null
+            outerZIndexModifier = null
             layoutNodeWrapper = modifier.foldOut(innerLayoutNodeWrapper) { mod, toWrap ->
                 var wrapper = toWrap
                 // The order in which the following blocks occur matters.  For example, the
@@ -1028,7 +1016,6 @@
                 }
                 if (mod is DrawLayerModifier) {
                     wrapper = LayerWrapper(wrapper, mod)
-                    outerLayerModifier = mod
                 }
                 if (mod is FocusModifier) {
                     require(mod is FocusModifierImpl)
@@ -1050,6 +1037,9 @@
                 if (mod is SemanticsModifier) {
                     wrapper = SemanticsWrapper(wrapper, mod)
                 }
+                if (mod is ZIndexModifier) {
+                    outerZIndexModifier = mod
+                }
                 wrapper
             }
             // Optimize the case where the layout itself is not modified. A common reason for
@@ -1126,7 +1116,7 @@
      */
     private val onChildPositionedCallbacks = mutableListOf<OnChildPositionedModifier>()
 
-    override fun measure(constraints: Constraints): Placeable {
+    override fun measure(constraints: Constraints, layoutDirection: LayoutDirection): Placeable {
         val owner = requireOwner()
         val iteration = owner.measureIteration
         @Suppress("Deprecation")
@@ -1149,28 +1139,32 @@
         dirtyAlignmentLines = true
         this.constraints = constraints
         owner.observeMeasureModelReads(this) {
-            layoutNodeWrapper.measure(constraints)
+            layoutNodeWrapper.measure(constraints, layoutDirection)
         }
         isMeasuring = false
         needsRelayout = true
         return layoutNodeWrapper
     }
 
-    override fun minIntrinsicWidth(height: IntPx): IntPx =
-        layoutNodeWrapper.minIntrinsicWidth(height)
+    override fun minIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx =
+        layoutNodeWrapper.minIntrinsicWidth(height, layoutDirection)
 
-    override fun maxIntrinsicWidth(height: IntPx): IntPx =
-        layoutNodeWrapper.maxIntrinsicWidth(height)
+    override fun maxIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx =
+        layoutNodeWrapper.maxIntrinsicWidth(height, layoutDirection)
 
-    override fun minIntrinsicHeight(width: IntPx): IntPx =
-        layoutNodeWrapper.minIntrinsicHeight(width)
+    override fun minIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx =
+        layoutNodeWrapper.minIntrinsicHeight(width, layoutDirection)
 
-    override fun maxIntrinsicHeight(width: IntPx): IntPx =
-        layoutNodeWrapper.maxIntrinsicHeight(width)
+    override fun maxIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx =
+        layoutNodeWrapper.maxIntrinsicHeight(width, layoutDirection)
 
     fun place(x: IntPx, y: IntPx) {
-        with(Placeable.PlacementScope) {
+        with(InnerPlacementScope) {
+            this.parentLayoutDirection = layoutDirection
+            val previousParentWidth = parentWidth
+            this.parentWidth = layoutNodeWrapper.size.width
             layoutNodeWrapper.place(x, y)
+            this.parentWidth = previousParentWidth
         }
     }
 
@@ -1247,7 +1241,7 @@
                 }
                 positionedDuringMeasurePass = parentLayoutNode?.isMeasuring ?: false ||
                         parentLayoutNode?.positionedDuringMeasurePass ?: false
-                innerLayoutNodeWrapper.measureResult.placeChildren(layoutDirection!!)
+                innerLayoutNodeWrapper.measureResult.placeChildren(layoutDirection)
                 layoutChildren.forEach { child ->
                     child.alignmentLinesRead = child.alignmentLinesQueriedSinceLastLayout
                 }
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/DelegatingLayoutNodeWrapper.kt b/ui/ui-platform/src/main/java/androidx/ui/core/DelegatingLayoutNodeWrapper.kt
index 609b9e9..1f449b1 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/DelegatingLayoutNodeWrapper.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/DelegatingLayoutNodeWrapper.kt
@@ -22,6 +22,7 @@
 import androidx.ui.unit.IntPx
 import androidx.ui.unit.IntPxPosition
 import androidx.ui.unit.PxPosition
+import androidx.ui.unit.ipx
 import androidx.ui.unit.round
 import androidx.ui.unit.toPx
 
@@ -39,8 +40,7 @@
     override val isAttached: Boolean
         get() = _isAttached && layoutNode.isAttached()
 
-    override val layoutDirection: LayoutDirection
-        get() = wrapped.layoutDirection
+    override val measureScope: MeasureScope get() = wrapped.measureScope
 
     init {
         wrapped.wrappedBy = this
@@ -73,17 +73,28 @@
 
     override fun place(position: IntPxPosition) {
         this.position = position
-        measureResult.placeChildren(layoutNode.layoutDirection!!)
+        with(InnerPlacementScope) {
+            this.parentLayoutDirection = measureScope.layoutDirection
+            val previousParentWidth = parentWidth
+            parentWidth = measuredSize.width
+            measureResult.placeChildren(measureScope.layoutDirection)
+            parentWidth = previousParentWidth
+        }
     }
 
-    override fun performMeasure(constraints: Constraints): Placeable {
-        val placeable = wrapped.measure(constraints)
+    override fun performMeasure(
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
+    ): Placeable {
+        val placeable = wrapped.measure(constraints, layoutDirection)
         measureResult = object : MeasureScope.MeasureResult {
             override val width: IntPx = wrapped.measureResult.width
             override val height: IntPx = wrapped.measureResult.height
             override val alignmentLines: Map<AlignmentLine, IntPx> = emptyMap()
             override fun placeChildren(layoutDirection: LayoutDirection) {
-                placeable.placeAbsolute(-apparentToRealOffset)
+                with(InnerPlacementScope) {
+                    placeable.placeAbsolute(-apparentToRealOffset)
+                }
             }
         }
         return this
@@ -107,14 +118,23 @@
         return lastFocusWrapper
     }
 
-    override fun minIntrinsicWidth(height: IntPx) = wrapped.minIntrinsicWidth(height)
-    override fun maxIntrinsicWidth(height: IntPx) = wrapped.maxIntrinsicWidth(height)
-    override fun minIntrinsicHeight(width: IntPx) = wrapped.minIntrinsicHeight(width)
-    override fun maxIntrinsicHeight(width: IntPx) = wrapped.maxIntrinsicHeight(width)
+    override fun minIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection) =
+        wrapped.minIntrinsicWidth(height, layoutDirection)
+    override fun maxIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection) =
+        wrapped.maxIntrinsicWidth(height, layoutDirection)
+    override fun minIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection) =
+        wrapped.minIntrinsicHeight(width, layoutDirection)
+    override fun maxIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection) =
+        wrapped.maxIntrinsicHeight(width, layoutDirection)
     override val parentData: Any? get() = wrapped.parentData
 
     override fun detach() {
         _isAttached = false
         wrapped.detach()
     }
-}
\ No newline at end of file
+}
+
+internal object InnerPlacementScope : Placeable.PlacementScope() {
+    override var parentWidth = 0.ipx
+    override var parentLayoutDirection = LayoutDirection.Ltr
+}
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/InnerPlaceable.kt b/ui/ui-platform/src/main/java/androidx/ui/core/InnerPlaceable.kt
index c1f7b4d0..9b9d1b9 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/InnerPlaceable.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/InnerPlaceable.kt
@@ -39,12 +39,18 @@
     override val isAttached: Boolean
         get() = layoutNode.isAttached()
 
-    override fun performMeasure(constraints: Constraints): Placeable {
+    override val measureScope get() = layoutNode.measureScope
+
+    override fun performMeasure(
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
+    ): Placeable {
+        layoutNode.layoutDirection = layoutDirection
         val measureResult = layoutNode.measureBlocks.measure(
             layoutNode.measureScope,
             layoutNode.layoutChildren,
             constraints,
-            layoutNode.layoutDirection!!
+            measureScope.layoutDirection
         )
         layoutNode.handleMeasureResult(measureResult)
         return this
@@ -60,9 +66,6 @@
                     .firstOrNull { it.layoutNodeWrapper.parentData != null }?.parentData
         }
 
-    override val layoutDirection: LayoutDirection
-        get() = layoutNode.layoutDirection!!
-
     override fun findFocusWrapperWrappingThisWrapper() =
         wrappedBy?.findFocusWrapperWrappingThisWrapper()
 
@@ -70,39 +73,39 @@
 
     override fun findLastFocusWrapper(): ModifiedFocusNode? = findFocusWrapperWrappingThisWrapper()
 
-    override fun minIntrinsicWidth(height: IntPx): IntPx {
+    override fun minIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx {
         return layoutNode.measureBlocks.minIntrinsicWidth(
             layoutNode.measureScope,
             layoutNode.layoutChildren,
             height,
-            layoutNode.layoutDirection!!
+            layoutDirection
         )
     }
 
-    override fun minIntrinsicHeight(width: IntPx): IntPx {
+    override fun minIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx {
         return layoutNode.measureBlocks.minIntrinsicHeight(
             layoutNode.measureScope,
             layoutNode.layoutChildren,
             width,
-            layoutNode.layoutDirection!!
+            layoutDirection
         )
     }
 
-    override fun maxIntrinsicWidth(height: IntPx): IntPx {
+    override fun maxIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx {
         return layoutNode.measureBlocks.maxIntrinsicWidth(
             layoutNode.measureScope,
             layoutNode.layoutChildren,
             height,
-            layoutNode.layoutDirection!!
+            layoutDirection
         )
     }
 
-    override fun maxIntrinsicHeight(width: IntPx): IntPx {
+    override fun maxIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx {
         return layoutNode.measureBlocks.maxIntrinsicHeight(
             layoutNode.measureScope,
             layoutNode.layoutChildren,
             width,
-            layoutNode.layoutDirection!!
+            layoutDirection
         )
     }
 
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/LayerWrapper.kt b/ui/ui-platform/src/main/java/androidx/ui/core/LayerWrapper.kt
index 3412df0..7c0ea0d 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/LayerWrapper.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/LayerWrapper.kt
@@ -54,8 +54,11 @@
     // TODO (njawad): This cache matrix is not thread safe
     private var inverseMatrixCache: Matrix? = null
 
-    override fun performMeasure(constraints: Constraints): Placeable {
-        val placeable = super.performMeasure(constraints)
+    override fun performMeasure(
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
+    ): Placeable {
+        val placeable = super.performMeasure(constraints, layoutDirection)
         layer.resize(measuredSize)
         return placeable
     }
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/LayoutNodeWrapper.kt b/ui/ui-platform/src/main/java/androidx/ui/core/LayoutNodeWrapper.kt
index ebf38985..5c18498 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/LayoutNodeWrapper.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/LayoutNodeWrapper.kt
@@ -40,6 +40,13 @@
     internal open val wrapped: LayoutNodeWrapper? = null
     internal var wrappedBy: LayoutNodeWrapper? = null
 
+    /**
+     * The scope used to measure the wrapped. InnerPlaceables are using the MeasureScope
+     * of the LayoutNode. ModifiedLayoutNode2s are using their own instances MeasureScopes.
+     * For fewer allocations, everything else is reusing the measure scope of their wrapped.
+     */
+    abstract val measureScope: MeasureScope
+
     // TODO(popam): avoid allocation here
     final override val measuredSize: IntPxSize
         get() = IntPxSize(measureResult.width, measureResult.height)
@@ -48,8 +55,6 @@
 
     final override var measurementConstraints = Constraints()
 
-    abstract val layoutDirection: LayoutDirection
-
     open val invalidateLayerOnBoundsChange = true
 
     private var _measureResult: MeasureScope.MeasureResult? = null
@@ -97,14 +102,20 @@
     /**
      * Measures the modified child.
      */
-    abstract fun performMeasure(constraints: Constraints): Placeable
+    abstract fun performMeasure(
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
+    ): Placeable
 
     /**
      * Measures the modified child.
      */
-    final override fun measure(constraints: Constraints): Placeable {
+    final override fun measure(
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
+    ): Placeable {
         measurementConstraints = constraints
-        return performMeasure(constraints)
+        return performMeasure(constraints, layoutDirection)
     }
 
     /**
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedDrawNode.kt b/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedDrawNode.kt
index 8374294..df6f8bd 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedDrawNode.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedDrawNode.kt
@@ -69,7 +69,7 @@
             get() = canvas!!.nativeCanvas
 
         override val layoutDirection: LayoutDirection
-            get() = this@ModifiedDrawNode.layoutDirection
+            get() = this@ModifiedDrawNode.measureScope.layoutDirection
 
         override fun save() = canvas!!.save()
 
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedLayoutNode.kt b/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedLayoutNode.kt
index 48f1d9a..e574860 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedLayoutNode.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedLayoutNode.kt
@@ -25,35 +25,43 @@
 
 internal class ModifiedLayoutNode2(
     wrapped: LayoutNodeWrapper,
-    val layoutModifier: LayoutModifier2
+    private val layoutModifier: LayoutModifier2
 ) : DelegatingLayoutNodeWrapper<LayoutModifier2>(wrapped, layoutModifier) {
 
-    override fun performMeasure(constraints: Constraints): Placeable = with(modifier) {
-        updateLayoutDirection()
-        measureResult =
-            layoutNode.measureScope.measure(wrapped, constraints, layoutNode.layoutDirection!!)
+    override val measureScope = ModifierMeasureScope()
+
+    override fun performMeasure(
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
+    ): Placeable = with(layoutModifier) {
+        measureScope.layoutDirection = layoutDirection
+        measureResult = measureScope.measure(wrapped, constraints, layoutDirection)
         this@ModifiedLayoutNode2
     }
 
-    override fun minIntrinsicWidth(height: IntPx): IntPx = with(modifier) {
-        updateLayoutDirection()
-        layoutNode.measureScope.minIntrinsicWidth(wrapped, height, layoutNode.layoutDirection!!)
-    }
+    override fun minIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx =
+        with(layoutModifier) {
+            measureScope.layoutDirection = layoutDirection
+            measureScope.minIntrinsicWidth(wrapped, height, layoutDirection)
+        }
 
-    override fun maxIntrinsicWidth(height: IntPx): IntPx = with(modifier) {
-        updateLayoutDirection()
-        layoutNode.measureScope.maxIntrinsicWidth(wrapped, height, layoutNode.layoutDirection!!)
-    }
+    override fun maxIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx =
+        with(layoutModifier) {
+            measureScope.layoutDirection = layoutDirection
+            measureScope.maxIntrinsicWidth(wrapped, height, layoutDirection)
+        }
 
-    override fun minIntrinsicHeight(width: IntPx): IntPx = with(modifier) {
-        updateLayoutDirection()
-        layoutNode.measureScope.minIntrinsicHeight(wrapped, width, layoutNode.layoutDirection!!)
-    }
+    override fun minIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx =
+        with(layoutModifier) {
+            measureScope.layoutDirection = layoutDirection
+            measureScope.minIntrinsicHeight(wrapped, width, layoutDirection)
+        }
 
-    override fun maxIntrinsicHeight(width: IntPx): IntPx = with(modifier) {
-        updateLayoutDirection()
-        layoutNode.measureScope.maxIntrinsicHeight(wrapped, width, layoutNode.layoutDirection!!)
-    }
+    override fun maxIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx =
+        with(layoutModifier) {
+            measureScope.layoutDirection = layoutDirection
+            measureScope.maxIntrinsicHeight(wrapped, width, layoutDirection)
+        }
 
     override operator fun get(line: AlignmentLine): IntPx? =
         measureResult.alignmentLines.getOrElse(line, { wrapped[line] })
@@ -75,8 +83,12 @@
         }
     }
 
-    private fun updateLayoutDirection() {
-        // TODO(popam): add support to change layout direction in the layout DSL
+    inner class ModifierMeasureScope : MeasureScope() {
+        override var layoutDirection: LayoutDirection = LayoutDirection.Ltr
+        override val density: Float
+            get() = layoutNode.measureScope.density
+        override val fontScale: Float
+            get() = layoutNode.measureScope.fontScale
     }
 }
 
@@ -85,18 +97,26 @@
     wrapped: LayoutNodeWrapper,
     layoutModifier: LayoutModifier
 ) : DelegatingLayoutNodeWrapper<LayoutModifier>(wrapped, layoutModifier) {
-    override fun performMeasure(constraints: Constraints): Placeable = with(modifier) {
-        updateLayoutDirection()
+    override val measureScope = ModifierMeasureScope()
+
+    override fun performMeasure(
+        constraints: Constraints,
+        layoutDirection: LayoutDirection
+    ): Placeable = with(modifier) {
+        val modifiedLayoutDirection = measureScope.modifyLayoutDirection(layoutDirection)
+        measureScope.layoutDirection = modifiedLayoutDirection
+
         val placeable = wrapped.measure(
-            layoutNode.measureScope.modifyConstraints(constraints, layoutDirection)
+            measureScope.modifyConstraints(constraints, layoutDirection),
+            measureScope.layoutDirection
         )
-        val size = layoutNode.measureScope.modifySize(
+        val size = measureScope.modifySize(
             constraints,
             layoutDirection,
             IntPxSize(placeable.width, placeable.height)
         )
         val wrappedPosition = with(modifier) {
-            layoutNode.measureScope.modifyPosition(
+            measureScope.modifyPosition(
                 IntPxSize(placeable.width, placeable.height),
                 size,
                 layoutDirection
@@ -107,37 +127,43 @@
             override val height: IntPx = size.height
             override val alignmentLines: Map<AlignmentLine, IntPx> = emptyMap()
             override fun placeChildren(layoutDirection: LayoutDirection) {
-                placeable.placeAbsolute(wrappedPosition)
+                with(InnerPlacementScope) {
+                    placeable.placeAbsolute(wrappedPosition)
+                }
             }
         }
         this@ModifiedLayoutNode
     }
 
-    override fun minIntrinsicWidth(height: IntPx): IntPx = with(modifier) {
-        updateLayoutDirection()
-        layoutNode.measureScope.minIntrinsicWidthOf(wrapped, height, layoutDirection)
-    }
+    override fun minIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx =
+        with(modifier) {
+            measureScope.layoutDirection = layoutDirection
+            measureScope.minIntrinsicWidthOf(wrapped, height, layoutDirection)
+        }
 
-    override fun maxIntrinsicWidth(height: IntPx): IntPx = with(modifier) {
-        updateLayoutDirection()
-        layoutNode.measureScope.maxIntrinsicWidthOf(wrapped, height, layoutDirection)
-    }
+    override fun maxIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx =
+        with(modifier) {
+            measureScope.layoutDirection = layoutDirection
+            measureScope.maxIntrinsicWidthOf(wrapped, height, layoutDirection)
+        }
 
-    override fun minIntrinsicHeight(width: IntPx): IntPx = with(modifier) {
-        updateLayoutDirection()
-        layoutNode.measureScope.minIntrinsicHeightOf(wrapped, width, layoutDirection)
-    }
+    override fun minIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx =
+        with(modifier) {
+            measureScope.layoutDirection = layoutDirection
+            measureScope.minIntrinsicHeightOf(wrapped, width, layoutDirection)
+        }
 
-    override fun maxIntrinsicHeight(width: IntPx): IntPx = with(modifier) {
-        updateLayoutDirection()
-        layoutNode.measureScope.maxIntrinsicHeightOf(wrapped, width, layoutDirection)
-    }
+    override fun maxIntrinsicHeight(width: IntPx, layoutDirection: LayoutDirection): IntPx =
+        with(modifier) {
+            measureScope.layoutDirection = layoutDirection
+            measureScope.maxIntrinsicHeightOf(wrapped, width, layoutDirection)
+        }
 
     override operator fun get(line: AlignmentLine): IntPx? = with(modifier) {
         return layoutNode.measureScope.modifyAlignmentLine(
             line,
             super.get(line),
-            layoutDirection
+            measureScope.layoutDirection
         )
     }
 
@@ -158,12 +184,11 @@
         }
     }
 
-    override lateinit var layoutDirection: LayoutDirection
-
-    private fun updateLayoutDirection() = with(modifier) {
-        val modifiedLayoutDirection =
-            layoutNode.measureScope.modifyLayoutDirection(layoutNode.layoutDirection!!)
-        layoutNode.layoutDirection = modifiedLayoutDirection
-        layoutDirection = modifiedLayoutDirection
+    inner class ModifierMeasureScope : MeasureScope() {
+        override var layoutDirection: LayoutDirection = LayoutDirection.Ltr
+        override val density: Float
+            get() = layoutNode.measureScope.density
+        override val fontScale: Float
+            get() = layoutNode.measureScope.fontScale
     }
 }
\ No newline at end of file
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/RenderNodeLayer.kt b/ui/ui-platform/src/main/java/androidx/ui/core/RenderNodeLayer.kt
index fa34d58..47e3fb2 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/RenderNodeLayer.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/RenderNodeLayer.kt
@@ -65,7 +65,7 @@
         renderNode.alpha = drawLayerModifier.alpha
         renderNode.translationX = drawLayerModifier.translationX
         renderNode.translationY = drawLayerModifier.translationY
-        renderNode.elevation = drawLayerModifier.elevation
+        renderNode.elevation = drawLayerModifier.shadowElevation
         renderNode.rotationZ = drawLayerModifier.rotationZ
         renderNode.rotationX = drawLayerModifier.rotationX
         renderNode.rotationY = drawLayerModifier.rotationY
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/ViewLayer.kt b/ui/ui-platform/src/main/java/androidx/ui/core/ViewLayer.kt
index d1a29b26..289a773 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/ViewLayer.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/ViewLayer.kt
@@ -69,7 +69,7 @@
         this.alpha = drawLayerModifier.alpha
         this.translationX = drawLayerModifier.translationX
         this.translationY = drawLayerModifier.translationY
-        this.elevation = drawLayerModifier.elevation
+        this.elevation = drawLayerModifier.shadowElevation
         this.rotation = drawLayerModifier.rotationZ
         this.rotationX = drawLayerModifier.rotationX
         this.rotationY = drawLayerModifier.rotationY
diff --git a/ui/ui-rxjava2/api/0.1.0-dev11.txt b/ui/ui-rxjava2/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..b9a6cea
--- /dev/null
+++ b/ui/ui-rxjava2/api/0.1.0-dev11.txt
@@ -0,0 +1,17 @@
+// Signature format: 3.0
+package androidx.ui.rxjava2 {
+
+  public final class RxJava2AdapterKt {
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Observable<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Observable<T>, R? initial);
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Flowable<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Flowable<T>, R? initial);
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Single<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Single<T>, R? initial);
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Maybe<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Maybe<T>, R? initial);
+    method public static androidx.compose.State<java.lang.Boolean> subscribeAsState(io.reactivex.Completable);
+  }
+
+}
+
diff --git a/ui/ui-rxjava2/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-rxjava2/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..b9a6cea
--- /dev/null
+++ b/ui/ui-rxjava2/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,17 @@
+// Signature format: 3.0
+package androidx.ui.rxjava2 {
+
+  public final class RxJava2AdapterKt {
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Observable<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Observable<T>, R? initial);
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Flowable<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Flowable<T>, R? initial);
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Single<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Single<T>, R? initial);
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Maybe<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Maybe<T>, R? initial);
+    method public static androidx.compose.State<java.lang.Boolean> subscribeAsState(io.reactivex.Completable);
+  }
+
+}
+
diff --git a/ui/ui-rxjava2/api/res-0.1.0-dev11.txt b/ui/ui-rxjava2/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-rxjava2/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-rxjava2/api/restricted_0.1.0-dev11.txt b/ui/ui-rxjava2/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..b9a6cea
--- /dev/null
+++ b/ui/ui-rxjava2/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,17 @@
+// Signature format: 3.0
+package androidx.ui.rxjava2 {
+
+  public final class RxJava2AdapterKt {
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Observable<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Observable<T>, R? initial);
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Flowable<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Flowable<T>, R? initial);
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Single<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Single<T>, R? initial);
+    method public static inline <T> androidx.compose.State<T> subscribeAsState(io.reactivex.Maybe<T>);
+    method public static <R, T extends R> androidx.compose.State<R> subscribeAsState(io.reactivex.Maybe<T>, R? initial);
+    method public static androidx.compose.State<java.lang.Boolean> subscribeAsState(io.reactivex.Completable);
+  }
+
+}
+
diff --git a/ui/ui-saved-instance-state/api/0.1.0-dev11.txt b/ui/ui-saved-instance-state/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..7e20c34
--- /dev/null
+++ b/ui/ui-saved-instance-state/api/0.1.0-dev11.txt
@@ -0,0 +1,48 @@
+// Signature format: 3.0
+package androidx.ui.savedinstancestate {
+
+  public final class ListSaverKt {
+    method public static <Original, Saveable> androidx.ui.savedinstancestate.Saver<Original,java.lang.Object> listSaver(kotlin.jvm.functions.Function2<? super androidx.ui.savedinstancestate.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.ui.savedinstancestate.Saver<T,java.lang.Object> mapSaver(kotlin.jvm.functions.Function2<? super androidx.ui.savedinstancestate.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 RememberSavedInstanceStateKt {
+    method public static <T> T rememberSavedInstanceState(Object![]? inputs, androidx.ui.savedinstancestate.Saver<T,?> saver = autoSaver(), String? key = null, kotlin.jvm.functions.Function0<? extends T> init);
+  }
+
+  public final class SavedInstanceStateKt {
+    method public static <T> androidx.compose.MutableState<T> savedInstanceState(Object![]? inputs, androidx.ui.savedinstancestate.Saver<T,?> saver = autoSaver(), String? key = null, kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual, kotlin.jvm.functions.Function0<? extends T> init);
+  }
+
+  public interface Saver<Original, Saveable> {
+    method public Original? restore(Saveable value);
+    method public Saveable? save(androidx.ui.savedinstancestate.SaverScope, Original? value);
+  }
+
+  public final class SaverKt {
+    method public static <Original, Saveable> androidx.ui.savedinstancestate.Saver<Original,Saveable> Saver(kotlin.jvm.functions.Function2<? super androidx.ui.savedinstancestate.SaverScope,? super Original,? extends Saveable> save, kotlin.jvm.functions.Function1<? super Saveable,? extends Original> restore);
+    method public static <T> androidx.ui.savedinstancestate.Saver<T,java.lang.Object> autoSaver();
+  }
+
+  public interface SaverScope {
+    method public boolean canBeSaved(Object value);
+  }
+
+  public interface UiSavedStateRegistry {
+    method public boolean canBeSaved(Object value);
+    method public Object? consumeRestored(String key);
+    method public java.util.Map<java.lang.String,java.lang.Object> performSave();
+    method public void registerProvider(String key, kotlin.jvm.functions.Function0<?> valueProvider);
+    method public void unregisterProvider(String key);
+  }
+
+  public final class UiSavedStateRegistryKt {
+    method public static androidx.ui.savedinstancestate.UiSavedStateRegistry UiSavedStateRegistry(java.util.Map<java.lang.String,?>? restoredValues, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> canBeSaved);
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.savedinstancestate.UiSavedStateRegistry> getUiSavedStateRegistryAmbient();
+  }
+
+}
+
diff --git a/ui/ui-saved-instance-state/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-saved-instance-state/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..7e20c34
--- /dev/null
+++ b/ui/ui-saved-instance-state/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,48 @@
+// Signature format: 3.0
+package androidx.ui.savedinstancestate {
+
+  public final class ListSaverKt {
+    method public static <Original, Saveable> androidx.ui.savedinstancestate.Saver<Original,java.lang.Object> listSaver(kotlin.jvm.functions.Function2<? super androidx.ui.savedinstancestate.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.ui.savedinstancestate.Saver<T,java.lang.Object> mapSaver(kotlin.jvm.functions.Function2<? super androidx.ui.savedinstancestate.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 RememberSavedInstanceStateKt {
+    method public static <T> T rememberSavedInstanceState(Object![]? inputs, androidx.ui.savedinstancestate.Saver<T,?> saver = autoSaver(), String? key = null, kotlin.jvm.functions.Function0<? extends T> init);
+  }
+
+  public final class SavedInstanceStateKt {
+    method public static <T> androidx.compose.MutableState<T> savedInstanceState(Object![]? inputs, androidx.ui.savedinstancestate.Saver<T,?> saver = autoSaver(), String? key = null, kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual, kotlin.jvm.functions.Function0<? extends T> init);
+  }
+
+  public interface Saver<Original, Saveable> {
+    method public Original? restore(Saveable value);
+    method public Saveable? save(androidx.ui.savedinstancestate.SaverScope, Original? value);
+  }
+
+  public final class SaverKt {
+    method public static <Original, Saveable> androidx.ui.savedinstancestate.Saver<Original,Saveable> Saver(kotlin.jvm.functions.Function2<? super androidx.ui.savedinstancestate.SaverScope,? super Original,? extends Saveable> save, kotlin.jvm.functions.Function1<? super Saveable,? extends Original> restore);
+    method public static <T> androidx.ui.savedinstancestate.Saver<T,java.lang.Object> autoSaver();
+  }
+
+  public interface SaverScope {
+    method public boolean canBeSaved(Object value);
+  }
+
+  public interface UiSavedStateRegistry {
+    method public boolean canBeSaved(Object value);
+    method public Object? consumeRestored(String key);
+    method public java.util.Map<java.lang.String,java.lang.Object> performSave();
+    method public void registerProvider(String key, kotlin.jvm.functions.Function0<?> valueProvider);
+    method public void unregisterProvider(String key);
+  }
+
+  public final class UiSavedStateRegistryKt {
+    method public static androidx.ui.savedinstancestate.UiSavedStateRegistry UiSavedStateRegistry(java.util.Map<java.lang.String,?>? restoredValues, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> canBeSaved);
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.savedinstancestate.UiSavedStateRegistry> getUiSavedStateRegistryAmbient();
+  }
+
+}
+
diff --git a/ui/ui-saved-instance-state/api/res-0.1.0-dev11.txt b/ui/ui-saved-instance-state/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-saved-instance-state/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-saved-instance-state/api/restricted_0.1.0-dev11.txt b/ui/ui-saved-instance-state/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..7e20c34
--- /dev/null
+++ b/ui/ui-saved-instance-state/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,48 @@
+// Signature format: 3.0
+package androidx.ui.savedinstancestate {
+
+  public final class ListSaverKt {
+    method public static <Original, Saveable> androidx.ui.savedinstancestate.Saver<Original,java.lang.Object> listSaver(kotlin.jvm.functions.Function2<? super androidx.ui.savedinstancestate.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.ui.savedinstancestate.Saver<T,java.lang.Object> mapSaver(kotlin.jvm.functions.Function2<? super androidx.ui.savedinstancestate.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 RememberSavedInstanceStateKt {
+    method public static <T> T rememberSavedInstanceState(Object![]? inputs, androidx.ui.savedinstancestate.Saver<T,?> saver = autoSaver(), String? key = null, kotlin.jvm.functions.Function0<? extends T> init);
+  }
+
+  public final class SavedInstanceStateKt {
+    method public static <T> androidx.compose.MutableState<T> savedInstanceState(Object![]? inputs, androidx.ui.savedinstancestate.Saver<T,?> saver = autoSaver(), String? key = null, kotlin.jvm.functions.Function2<? super T,? super T,java.lang.Boolean> areEquivalent = ReferentiallyEqual, kotlin.jvm.functions.Function0<? extends T> init);
+  }
+
+  public interface Saver<Original, Saveable> {
+    method public Original? restore(Saveable value);
+    method public Saveable? save(androidx.ui.savedinstancestate.SaverScope, Original? value);
+  }
+
+  public final class SaverKt {
+    method public static <Original, Saveable> androidx.ui.savedinstancestate.Saver<Original,Saveable> Saver(kotlin.jvm.functions.Function2<? super androidx.ui.savedinstancestate.SaverScope,? super Original,? extends Saveable> save, kotlin.jvm.functions.Function1<? super Saveable,? extends Original> restore);
+    method public static <T> androidx.ui.savedinstancestate.Saver<T,java.lang.Object> autoSaver();
+  }
+
+  public interface SaverScope {
+    method public boolean canBeSaved(Object value);
+  }
+
+  public interface UiSavedStateRegistry {
+    method public boolean canBeSaved(Object value);
+    method public Object? consumeRestored(String key);
+    method public java.util.Map<java.lang.String,java.lang.Object> performSave();
+    method public void registerProvider(String key, kotlin.jvm.functions.Function0<?> valueProvider);
+    method public void unregisterProvider(String key);
+  }
+
+  public final class UiSavedStateRegistryKt {
+    method public static androidx.ui.savedinstancestate.UiSavedStateRegistry UiSavedStateRegistry(java.util.Map<java.lang.String,?>? restoredValues, kotlin.jvm.functions.Function1<java.lang.Object,java.lang.Boolean> canBeSaved);
+    method public static androidx.compose.ProvidableAmbient<androidx.ui.savedinstancestate.UiSavedStateRegistry> getUiSavedStateRegistryAmbient();
+  }
+
+}
+
diff --git a/ui/ui-test-font/api/0.1.0-dev10.txt b/ui/ui-test-font/api/0.1.0-dev10.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/ui/ui-test-font/api/0.1.0-dev10.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ui/ui-test-font/api/0.1.0-dev11.txt b/ui/ui-test-font/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/ui/ui-test-font/api/0.1.0-dev11.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ui/ui-test-font/api/current.txt b/ui/ui-test-font/api/current.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/ui/ui-test-font/api/current.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ui/ui-test-font/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-test-font/api/public_plus_experimental_0.1.0-dev10.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/ui/ui-test-font/api/public_plus_experimental_0.1.0-dev10.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ui/ui-test-font/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-test-font/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/ui/ui-test-font/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ui/ui-test-font/api/public_plus_experimental_current.txt b/ui/ui-test-font/api/public_plus_experimental_current.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/ui/ui-test-font/api/public_plus_experimental_current.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ui/ui-test-font/api/res-0.1.0-dev10.txt b/ui/ui-test-font/api/res-0.1.0-dev10.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-test-font/api/res-0.1.0-dev10.txt
diff --git a/ui/ui-test-font/api/res-0.1.0-dev11.txt b/ui/ui-test-font/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-test-font/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-test-font/api/restricted_0.1.0-dev10.txt b/ui/ui-test-font/api/restricted_0.1.0-dev10.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/ui/ui-test-font/api/restricted_0.1.0-dev10.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ui/ui-test-font/api/restricted_0.1.0-dev11.txt b/ui/ui-test-font/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/ui/ui-test-font/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ui/ui-test-font/api/restricted_current.txt b/ui/ui-test-font/api/restricted_current.txt
new file mode 100644
index 0000000..da4f6cc
--- /dev/null
+++ b/ui/ui-test-font/api/restricted_current.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ui/ui-test-font/build.gradle b/ui/ui-test-font/build.gradle
index 38d00de..0bd8692 100644
--- a/ui/ui-test-font/build.gradle
+++ b/ui/ui-test-font/build.gradle
@@ -26,7 +26,7 @@
 
 androidx {
     name = "AndroidX UI Test Font resources"
-    publish = Publish.SNAPSHOT_AND_RELEASE
+    publish = Publish.NONE
     mavenVersion = LibraryVersions.UI
     mavenGroup = LibraryGroups.UI
     inceptionYear = "2020"
diff --git a/ui/ui-test/api/0.1.0-dev10.txt b/ui/ui-test/api/0.1.0-dev10.txt
index e8bf9f4..dadd0a3 100644
--- a/ui/ui-test/api/0.1.0-dev10.txt
+++ b/ui/ui-test/api/0.1.0-dev10.txt
@@ -211,6 +211,15 @@
     method public static String dumpToString(java.util.Collection<androidx.ui.test.SemanticsNodeInteraction>);
   }
 
+  public final class SelectorsKt {
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> ancestors(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction child(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> children(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction parent(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction sibling(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> siblings(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
   public final class SemanticsMatcher {
     ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>,? extends java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>> selector);
     method public infix androidx.ui.test.SemanticsMatcher and(androidx.ui.test.SemanticsMatcher other);
@@ -232,6 +241,9 @@
     property public final androidx.ui.test.SemanticsMatcher any;
   }
 
+  public final class SemanticsMatcherKt {
+  }
+
   public final class SemanticsNodeInteraction {
     method public void assertDoesNotExist();
     method public androidx.ui.test.SemanticsNodeInteraction assertExists(String? errorMessageOnFail = null);
@@ -256,6 +268,7 @@
   public final class SynchronizationKt {
     method public static <T> T! runOnIdleCompose(kotlin.jvm.functions.Function0<? extends T> action);
     method public static <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static void waitForIdle();
   }
 
   public interface TestAnimationClock extends androidx.animation.AnimationClockObservable {
diff --git a/ui/ui-test/api/0.1.0-dev11.txt b/ui/ui-test/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..dadd0a3
--- /dev/null
+++ b/ui/ui-test/api/0.1.0-dev11.txt
@@ -0,0 +1,341 @@
+// Signature format: 3.0
+package androidx.ui.test {
+
+  public final class ActionsKt {
+    method public static <T extends kotlin.Function<? extends kotlin.Unit>> void callSemanticsAction(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> invocation);
+    method public static void callSemanticsAction(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> key);
+    method public static androidx.ui.test.SemanticsNodeInteraction doClick(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction doGesture(androidx.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.ui.test.GestureScope,kotlin.Unit> block);
+    method public static androidx.ui.test.SemanticsNodeInteraction doScrollTo(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class AnimationClockTestRule implements org.junit.rules.TestRule {
+    ctor public AnimationClockTestRule();
+    method public void advanceClock(long milliseconds);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description? description);
+    method public androidx.ui.test.TestAnimationClock getClock();
+    method public boolean isPaused();
+    method public void pauseClock();
+    method public void resumeClock();
+    property public final androidx.ui.test.TestAnimationClock clock;
+    property public final boolean isPaused;
+  }
+
+  public final class AssertionsKt {
+    method public static androidx.ui.test.SemanticsNodeInteraction assert(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.test.SemanticsMatcher matcher);
+    method public static <T extends java.util.Collection<? extends androidx.ui.test.SemanticsNodeInteraction>> T assertCountEquals(T, int expectedSize);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertHasClickAction(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertHasNoClickAction(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsDisplayed(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsHidden(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsInMutuallyExclusiveGroup(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsNotDisplayed(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsNotHidden(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsOff(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsOn(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsSelectable(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsSelected(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsToggleable(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsUnselected(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertLabelEquals(androidx.ui.test.SemanticsNodeInteraction, String value);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertSemanticsIsEqualTo(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.core.semantics.SemanticsConfiguration expectedProperties);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertValueEquals(androidx.ui.test.SemanticsNodeInteraction, String value);
+  }
+
+  public final class BitmapHelpersKt {
+    method public static void assertPixelColor-9bBi3KA(android.graphics.Bitmap, long expected, int x, int y, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.Color,java.lang.String> error = { color -> "Pixel(" + x + ", " + y + ") expected to be " + expected + ", but was " + color });
+    method public static void assertPixels(android.graphics.Bitmap, androidx.ui.unit.IntPxSize? expectedSize = null, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPxPosition,androidx.ui.graphics.Color> expectedColorProvider);
+    method public static void assertShape-nbwoFSQ(android.graphics.Bitmap, androidx.ui.unit.Density density, androidx.ui.graphics.Shape shape, long shapeColor, long backgroundColor, androidx.ui.graphics.Shape backgroundShape = RectangleShape, float sizeX = width.toFloat().px, float sizeY = height.toFloat().px, float shapeSizeX = sizeX, float shapeSizeY = sizeY, float centerX = width.px / 2.0, float centerY = height.px / 2.0, float shapeOverlapPixelCount = 1.px);
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static android.graphics.Bitmap captureToBitmap(androidx.ui.test.SemanticsNodeInteraction);
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static android.graphics.Bitmap captureToBitmap(android.view.View);
+    method public static boolean contains(androidx.ui.graphics.Path, androidx.ui.geometry.Offset offset);
+  }
+
+  public final class CollectedSizes {
+    ctor public CollectedSizes(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+    method public androidx.ui.test.CollectedSizes assertHeightEqualsTo(androidx.ui.unit.Dp expectedHeight);
+    method public androidx.ui.test.CollectedSizes assertHeightEqualsTo(kotlin.jvm.functions.Function1<? super androidx.ui.unit.Density,androidx.ui.unit.IntPx> expectedHeightPx);
+    method public androidx.ui.test.CollectedSizes assertIsSquareWithSize(androidx.ui.unit.Dp expectedSize);
+    method public androidx.ui.test.CollectedSizes assertIsSquareWithSize(kotlin.jvm.functions.Function1<? super androidx.ui.unit.Density,androidx.ui.unit.IntPx> expectedSquarePx);
+    method public androidx.ui.test.CollectedSizes assertWidthEqualsTo(androidx.ui.unit.Dp expectedWidth);
+    method public androidx.ui.test.CollectedSizes assertWidthEqualsTo(kotlin.jvm.functions.Function1<? super androidx.ui.unit.Density,androidx.ui.unit.IntPx> expectedWidthPx);
+  }
+
+  public interface ComposeBenchmarkScope<T> extends androidx.ui.test.ComposeExecutionControl {
+    method public void createTestCase();
+    method public void disposeContent();
+    method public void draw();
+    method public void drawFinish();
+    method public void drawPrepare();
+    method public void emitContent();
+    method public T! getTestCase();
+    method public void invalidateViews();
+    method public void measureWithSpec(int widthSpec, int heightSpec);
+    method public void requestLayout();
+  }
+
+  public final class ComposeBenchmarkScopeKt {
+    method public static <T> void setupContent(androidx.ui.test.ComposeBenchmarkScope<T>);
+  }
+
+  public interface ComposeExecutionControl {
+    method public void capturePreviewPictureToActivity();
+    method public void doFrame();
+    method public void drawToBitmap();
+    method public boolean getDidLastRecomposeHaveChanges();
+    method public int getMeasuredHeight();
+    method public int getMeasuredWidth();
+    method public boolean hasPendingChanges();
+    method public void layout();
+    method public void measure();
+    method public void recompose();
+    property public abstract boolean didLastRecomposeHaveChanges;
+    property public abstract int measuredHeight;
+    property public abstract int measuredWidth;
+  }
+
+  public final class ComposeExecutionControlKt {
+    method public static void assertHasPendingChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertLastRecomposeHadChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertLastRecomposeHadNoChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertMeasureSizeIsPositive(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertNoPendingChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void doFramesAssertAllHadChangesExceptLastOne(androidx.ui.test.ComposeExecutionControl, int numberOfFramesToBeStable);
+    method public static int doFramesUntilNoChangesPending(androidx.ui.test.ComposeExecutionControl, int maxAmountOfFrames = 10);
+    method public static void recomposeAssertHadChanges(androidx.ui.test.ComposeExecutionControl);
+  }
+
+  public interface ComposeTestCase {
+    method public void emitContent();
+  }
+
+  public interface ComposeTestCaseSetup {
+    method public void performTestWithEventsControl(kotlin.jvm.functions.Function1<? super androidx.ui.test.ComposeExecutionControl,kotlin.Unit> block);
+  }
+
+  public interface ComposeTestRule extends org.junit.rules.TestRule {
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public android.graphics.Bitmap captureScreenOnIdle();
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenTestCase(androidx.ui.test.ComposeTestCase testCase);
+    method public androidx.ui.test.AnimationClockTestRule getClockTestRule();
+    method public androidx.ui.unit.Density getDensity();
+    method public android.util.DisplayMetrics getDisplayMetrics();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    property public abstract androidx.ui.test.AnimationClockTestRule clockTestRule;
+    property public abstract androidx.ui.unit.Density density;
+    property public abstract android.util.DisplayMetrics displayMetrics;
+  }
+
+  public final class ComposeTestRuleKt {
+    method public static androidx.ui.test.ComposeTestRule createComposeRule(androidx.compose.Recomposer? recomposer = null, boolean disableTransitions = false);
+  }
+
+  public final class DisableTransitions implements org.junit.rules.TestRule {
+    ctor public DisableTransitions();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description? description);
+  }
+
+  public final class DisableTransitions.DisableTransitionsStatement extends org.junit.runners.model.Statement {
+    ctor public DisableTransitions.DisableTransitionsStatement(org.junit.runners.model.Statement base);
+    method public void evaluate();
+  }
+
+  public final class ErrorMessagesKt {
+  }
+
+  public final class FiltersKt {
+    method public static androidx.ui.test.SemanticsMatcher hasAnyAncestorThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasAnyChildThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasAnyDescendantThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasAnySiblingThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasClickAction();
+    method public static androidx.ui.test.SemanticsMatcher hasNoClickAction();
+    method public static androidx.ui.test.SemanticsMatcher hasNoScrollAction();
+    method public static androidx.ui.test.SemanticsMatcher hasParentThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasScrollAction();
+    method public static androidx.ui.test.SemanticsMatcher hasSubstring(String substring, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsMatcher hasTestTag(String testTag);
+    method public static androidx.ui.test.SemanticsMatcher hasText(String text, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsMatcher hasValue(String value);
+    method public static androidx.ui.test.SemanticsMatcher isHidden();
+    method public static androidx.ui.test.SemanticsMatcher isInMutuallyExclusiveGroup();
+    method public static androidx.ui.test.SemanticsMatcher isNotHidden();
+    method public static androidx.ui.test.SemanticsMatcher isOff();
+    method public static androidx.ui.test.SemanticsMatcher isOn();
+    method public static androidx.ui.test.SemanticsMatcher isSelectable();
+    method public static androidx.ui.test.SemanticsMatcher isSelected();
+    method public static androidx.ui.test.SemanticsMatcher isToggleable();
+    method public static androidx.ui.test.SemanticsMatcher isUnselected();
+  }
+
+  public final class FindersKt {
+    method public static androidx.ui.test.SemanticsNodeInteraction find(androidx.ui.test.SemanticsMatcher selector);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> findAll(androidx.ui.test.SemanticsMatcher selector);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> findAllByTag(String testTag);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> findAllByText(String text, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsNodeInteraction findBySubstring(String text, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsNodeInteraction findByTag(String testTag);
+    method public static androidx.ui.test.SemanticsNodeInteraction findByText(String text, boolean ignoreCase = false);
+  }
+
+  public final class GestureScope {
+  }
+
+  public final class GestureScopeKt {
+    method public static androidx.ui.unit.PxPosition getCenter(androidx.ui.test.GestureScope);
+    method public static androidx.ui.unit.PxBounds getGlobalBounds(androidx.ui.test.GestureScope);
+    method public static androidx.ui.unit.IntPxSize getSize(androidx.ui.test.GestureScope);
+    method public static androidx.ui.unit.PxPosition localToGlobal(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendClick(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendClick(androidx.ui.test.GestureScope);
+    method public static void sendDoubleClick(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendDoubleClick(androidx.ui.test.GestureScope);
+    method public static void sendLongClick(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendLongClick(androidx.ui.test.GestureScope);
+    method public static void sendSwipe(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition start, androidx.ui.unit.PxPosition end, androidx.ui.unit.Duration duration = 200.milliseconds);
+    method public static void sendSwipeDown(androidx.ui.test.GestureScope);
+    method public static void sendSwipeLeft(androidx.ui.test.GestureScope);
+    method public static void sendSwipeRight(androidx.ui.test.GestureScope);
+    method public static void sendSwipeUp(androidx.ui.test.GestureScope);
+    method public static void sendSwipeWithVelocity(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition start, androidx.ui.unit.PxPosition end, @FloatRange(from=0.0) float endVelocity, androidx.ui.unit.Duration duration = 200.milliseconds);
+  }
+
+  public final class GoldenSemanticsKt {
+    method public static void assertEquals(androidx.ui.core.semantics.SemanticsConfiguration, androidx.ui.core.semantics.SemanticsConfiguration expected);
+    method public static androidx.ui.core.semantics.SemanticsConfiguration copyWith(androidx.ui.core.semantics.SemanticsConfiguration, kotlin.jvm.functions.Function1<? super androidx.ui.core.semantics.SemanticsConfiguration,kotlin.Unit> diff);
+    method public static androidx.ui.core.semantics.SemanticsConfiguration createFullSemantics(Boolean? isEnabled = null, String? value = null, androidx.ui.foundation.selection.ToggleableState? toggleableState = null, Boolean? inMutuallyExclusiveGroup = null, Boolean? isSelected = null);
+  }
+
+  public final class OutputKt {
+    method public static String dumpToString(androidx.ui.test.SemanticsNodeInteraction);
+    method public static String dumpToString(java.util.Collection<androidx.ui.test.SemanticsNodeInteraction>);
+  }
+
+  public final class SelectorsKt {
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> ancestors(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction child(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> children(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction parent(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction sibling(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> siblings(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class SemanticsMatcher {
+    ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>,? extends java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>> selector);
+    method public infix androidx.ui.test.SemanticsMatcher and(androidx.ui.test.SemanticsMatcher other);
+    method public String getDescription();
+    method public Iterable<androidx.ui.core.semantics.SemanticsNode> match(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
+    method public boolean matches(androidx.ui.core.semantics.SemanticsNode node);
+    method public boolean matchesAny(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
+    method public operator androidx.ui.test.SemanticsMatcher not();
+    method public infix androidx.ui.test.SemanticsMatcher or(androidx.ui.test.SemanticsMatcher other);
+    field public static final androidx.ui.test.SemanticsMatcher.Companion! Companion;
+  }
+
+  public static final class SemanticsMatcher.Companion {
+    method public <T> androidx.ui.test.SemanticsMatcher expectValue(androidx.ui.semantics.SemanticsPropertyKey<T> key, T? expectedValue);
+    method public androidx.ui.test.SemanticsMatcher fromCondition(String description, kotlin.jvm.functions.Function1<? super androidx.ui.core.semantics.SemanticsNode,java.lang.Boolean> selector);
+    method public androidx.ui.test.SemanticsMatcher getAny();
+    method public <T> androidx.ui.test.SemanticsMatcher keyIsDefined(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> androidx.ui.test.SemanticsMatcher keyNotDefined(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    property public final androidx.ui.test.SemanticsMatcher any;
+  }
+
+  public final class SemanticsMatcherKt {
+  }
+
+  public final class SemanticsNodeInteraction {
+    method public void assertDoesNotExist();
+    method public androidx.ui.test.SemanticsNodeInteraction assertExists(String? errorMessageOnFail = null);
+    method public androidx.ui.core.semantics.SemanticsNode fetchSemanticsNode(String? errorMessageOnFail = null);
+  }
+
+  public final class SemanticsNodeInteractionKt {
+  }
+
+  public final class SizesTestingKt {
+    method public static androidx.ui.layout.DpConstraints getBigTestConstraints();
+    method public static androidx.ui.test.CollectedSizes setContentAndCollectSizes(androidx.ui.test.ComposeTestRule, androidx.ui.layout.DpConstraints parentConstraints = BigTestConstraints, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static androidx.ui.unit.PxSize setContentAndGetPixelSize(androidx.ui.test.ComposeTestRule, androidx.ui.layout.DpConstraints parentConstraints = BigTestConstraints, kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> performSetContent = { setContent(it) }, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class StateRestorationTester {
+    ctor public StateRestorationTester(androidx.ui.test.ComposeTestRule composeTestRule);
+    method public void emulateSavedInstanceStateRestore();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+  public final class SynchronizationKt {
+    method public static <T> T! runOnIdleCompose(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static void waitForIdle();
+  }
+
+  public interface TestAnimationClock extends androidx.animation.AnimationClockObservable {
+    method public void advanceClock(long milliseconds);
+    method public boolean isIdle();
+    method public boolean isPaused();
+    method public void pauseClock();
+    method public void resumeClock();
+    property public abstract boolean isIdle;
+    property public abstract boolean isPaused;
+  }
+
+}
+
+package androidx.ui.test.android {
+
+  public final class AndroidComposeTestCaseRunnerKt {
+    method public static <T extends androidx.ui.test.ComposeTestCase> androidx.ui.test.ComposeBenchmarkScope<T> createAndroidComposeBenchmarkRunner(kotlin.jvm.functions.Function0<? extends T> testCaseFactory, androidx.activity.ComponentActivity activity);
+  }
+
+  public final class AndroidComposeTestCaseSetup implements androidx.ui.test.ComposeTestCaseSetup {
+    ctor public AndroidComposeTestCaseSetup(androidx.ui.test.ComposeTestCase testCase, androidx.activity.ComponentActivity activity);
+    method public void performTestWithEventsControl(kotlin.jvm.functions.Function1<? super androidx.ui.test.ComposeExecutionControl,kotlin.Unit> block);
+  }
+
+  public final class AndroidComposeTestRule<T extends androidx.activity.ComponentActivity> implements androidx.ui.test.ComposeTestRule {
+    ctor public AndroidComposeTestRule(androidx.test.rule.ActivityTestRule<T> activityTestRule, androidx.compose.Recomposer? recomposer, boolean disableTransitions);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description? description);
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public android.graphics.Bitmap captureScreenOnIdle();
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenTestCase(androidx.ui.test.ComposeTestCase testCase);
+    method public androidx.test.rule.ActivityTestRule<T> getActivityTestRule();
+    method public androidx.ui.test.AnimationClockTestRule getClockTestRule();
+    method public androidx.ui.unit.Density getDensity();
+    method public android.util.DisplayMetrics getDisplayMetrics();
+    method public androidx.compose.Recomposer? getRecomposer();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    property public androidx.ui.test.AnimationClockTestRule clockTestRule;
+    property public androidx.ui.unit.Density density;
+    property public android.util.DisplayMetrics displayMetrics;
+  }
+
+  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 AndroidComposeTestRuleKt {
+    method public static inline <reified T extends androidx.activity.ComponentActivity> androidx.ui.test.android.AndroidComposeTestRule<T> AndroidComposeTestRule(androidx.compose.Recomposer? recomposer = null, boolean disableTransitions = false);
+  }
+
+  public final class ComposeIdlingResourceKt {
+    method public static void registerComposeWithEspresso();
+    method public static void registerTestClock(androidx.ui.test.TestAnimationClock clock);
+    method public static void unregisterComposeFromEspresso();
+    method public static void unregisterTestClock(androidx.ui.test.TestAnimationClock clock);
+  }
+
+  public final class WindowCaptureKt {
+  }
+
+}
+
+package androidx.ui.test.android.fake {
+
+  public final class FakeViewStructureKt {
+  }
+
+}
+
diff --git a/ui/ui-test/api/current.txt b/ui/ui-test/api/current.txt
index e8bf9f4..dadd0a3 100644
--- a/ui/ui-test/api/current.txt
+++ b/ui/ui-test/api/current.txt
@@ -211,6 +211,15 @@
     method public static String dumpToString(java.util.Collection<androidx.ui.test.SemanticsNodeInteraction>);
   }
 
+  public final class SelectorsKt {
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> ancestors(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction child(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> children(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction parent(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction sibling(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> siblings(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
   public final class SemanticsMatcher {
     ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>,? extends java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>> selector);
     method public infix androidx.ui.test.SemanticsMatcher and(androidx.ui.test.SemanticsMatcher other);
@@ -232,6 +241,9 @@
     property public final androidx.ui.test.SemanticsMatcher any;
   }
 
+  public final class SemanticsMatcherKt {
+  }
+
   public final class SemanticsNodeInteraction {
     method public void assertDoesNotExist();
     method public androidx.ui.test.SemanticsNodeInteraction assertExists(String? errorMessageOnFail = null);
@@ -256,6 +268,7 @@
   public final class SynchronizationKt {
     method public static <T> T! runOnIdleCompose(kotlin.jvm.functions.Function0<? extends T> action);
     method public static <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static void waitForIdle();
   }
 
   public interface TestAnimationClock extends androidx.animation.AnimationClockObservable {
diff --git a/ui/ui-test/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-test/api/public_plus_experimental_0.1.0-dev10.txt
index e8bf9f4..dadd0a3 100644
--- a/ui/ui-test/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/ui/ui-test/api/public_plus_experimental_0.1.0-dev10.txt
@@ -211,6 +211,15 @@
     method public static String dumpToString(java.util.Collection<androidx.ui.test.SemanticsNodeInteraction>);
   }
 
+  public final class SelectorsKt {
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> ancestors(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction child(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> children(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction parent(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction sibling(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> siblings(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
   public final class SemanticsMatcher {
     ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>,? extends java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>> selector);
     method public infix androidx.ui.test.SemanticsMatcher and(androidx.ui.test.SemanticsMatcher other);
@@ -232,6 +241,9 @@
     property public final androidx.ui.test.SemanticsMatcher any;
   }
 
+  public final class SemanticsMatcherKt {
+  }
+
   public final class SemanticsNodeInteraction {
     method public void assertDoesNotExist();
     method public androidx.ui.test.SemanticsNodeInteraction assertExists(String? errorMessageOnFail = null);
@@ -256,6 +268,7 @@
   public final class SynchronizationKt {
     method public static <T> T! runOnIdleCompose(kotlin.jvm.functions.Function0<? extends T> action);
     method public static <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static void waitForIdle();
   }
 
   public interface TestAnimationClock extends androidx.animation.AnimationClockObservable {
diff --git a/ui/ui-test/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-test/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..dadd0a3
--- /dev/null
+++ b/ui/ui-test/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,341 @@
+// Signature format: 3.0
+package androidx.ui.test {
+
+  public final class ActionsKt {
+    method public static <T extends kotlin.Function<? extends kotlin.Unit>> void callSemanticsAction(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> invocation);
+    method public static void callSemanticsAction(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> key);
+    method public static androidx.ui.test.SemanticsNodeInteraction doClick(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction doGesture(androidx.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.ui.test.GestureScope,kotlin.Unit> block);
+    method public static androidx.ui.test.SemanticsNodeInteraction doScrollTo(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class AnimationClockTestRule implements org.junit.rules.TestRule {
+    ctor public AnimationClockTestRule();
+    method public void advanceClock(long milliseconds);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description? description);
+    method public androidx.ui.test.TestAnimationClock getClock();
+    method public boolean isPaused();
+    method public void pauseClock();
+    method public void resumeClock();
+    property public final androidx.ui.test.TestAnimationClock clock;
+    property public final boolean isPaused;
+  }
+
+  public final class AssertionsKt {
+    method public static androidx.ui.test.SemanticsNodeInteraction assert(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.test.SemanticsMatcher matcher);
+    method public static <T extends java.util.Collection<? extends androidx.ui.test.SemanticsNodeInteraction>> T assertCountEquals(T, int expectedSize);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertHasClickAction(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertHasNoClickAction(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsDisplayed(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsHidden(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsInMutuallyExclusiveGroup(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsNotDisplayed(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsNotHidden(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsOff(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsOn(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsSelectable(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsSelected(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsToggleable(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsUnselected(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertLabelEquals(androidx.ui.test.SemanticsNodeInteraction, String value);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertSemanticsIsEqualTo(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.core.semantics.SemanticsConfiguration expectedProperties);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertValueEquals(androidx.ui.test.SemanticsNodeInteraction, String value);
+  }
+
+  public final class BitmapHelpersKt {
+    method public static void assertPixelColor-9bBi3KA(android.graphics.Bitmap, long expected, int x, int y, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.Color,java.lang.String> error = { color -> "Pixel(" + x + ", " + y + ") expected to be " + expected + ", but was " + color });
+    method public static void assertPixels(android.graphics.Bitmap, androidx.ui.unit.IntPxSize? expectedSize = null, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPxPosition,androidx.ui.graphics.Color> expectedColorProvider);
+    method public static void assertShape-nbwoFSQ(android.graphics.Bitmap, androidx.ui.unit.Density density, androidx.ui.graphics.Shape shape, long shapeColor, long backgroundColor, androidx.ui.graphics.Shape backgroundShape = RectangleShape, float sizeX = width.toFloat().px, float sizeY = height.toFloat().px, float shapeSizeX = sizeX, float shapeSizeY = sizeY, float centerX = width.px / 2.0, float centerY = height.px / 2.0, float shapeOverlapPixelCount = 1.px);
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static android.graphics.Bitmap captureToBitmap(androidx.ui.test.SemanticsNodeInteraction);
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static android.graphics.Bitmap captureToBitmap(android.view.View);
+    method public static boolean contains(androidx.ui.graphics.Path, androidx.ui.geometry.Offset offset);
+  }
+
+  public final class CollectedSizes {
+    ctor public CollectedSizes(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+    method public androidx.ui.test.CollectedSizes assertHeightEqualsTo(androidx.ui.unit.Dp expectedHeight);
+    method public androidx.ui.test.CollectedSizes assertHeightEqualsTo(kotlin.jvm.functions.Function1<? super androidx.ui.unit.Density,androidx.ui.unit.IntPx> expectedHeightPx);
+    method public androidx.ui.test.CollectedSizes assertIsSquareWithSize(androidx.ui.unit.Dp expectedSize);
+    method public androidx.ui.test.CollectedSizes assertIsSquareWithSize(kotlin.jvm.functions.Function1<? super androidx.ui.unit.Density,androidx.ui.unit.IntPx> expectedSquarePx);
+    method public androidx.ui.test.CollectedSizes assertWidthEqualsTo(androidx.ui.unit.Dp expectedWidth);
+    method public androidx.ui.test.CollectedSizes assertWidthEqualsTo(kotlin.jvm.functions.Function1<? super androidx.ui.unit.Density,androidx.ui.unit.IntPx> expectedWidthPx);
+  }
+
+  public interface ComposeBenchmarkScope<T> extends androidx.ui.test.ComposeExecutionControl {
+    method public void createTestCase();
+    method public void disposeContent();
+    method public void draw();
+    method public void drawFinish();
+    method public void drawPrepare();
+    method public void emitContent();
+    method public T! getTestCase();
+    method public void invalidateViews();
+    method public void measureWithSpec(int widthSpec, int heightSpec);
+    method public void requestLayout();
+  }
+
+  public final class ComposeBenchmarkScopeKt {
+    method public static <T> void setupContent(androidx.ui.test.ComposeBenchmarkScope<T>);
+  }
+
+  public interface ComposeExecutionControl {
+    method public void capturePreviewPictureToActivity();
+    method public void doFrame();
+    method public void drawToBitmap();
+    method public boolean getDidLastRecomposeHaveChanges();
+    method public int getMeasuredHeight();
+    method public int getMeasuredWidth();
+    method public boolean hasPendingChanges();
+    method public void layout();
+    method public void measure();
+    method public void recompose();
+    property public abstract boolean didLastRecomposeHaveChanges;
+    property public abstract int measuredHeight;
+    property public abstract int measuredWidth;
+  }
+
+  public final class ComposeExecutionControlKt {
+    method public static void assertHasPendingChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertLastRecomposeHadChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertLastRecomposeHadNoChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertMeasureSizeIsPositive(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertNoPendingChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void doFramesAssertAllHadChangesExceptLastOne(androidx.ui.test.ComposeExecutionControl, int numberOfFramesToBeStable);
+    method public static int doFramesUntilNoChangesPending(androidx.ui.test.ComposeExecutionControl, int maxAmountOfFrames = 10);
+    method public static void recomposeAssertHadChanges(androidx.ui.test.ComposeExecutionControl);
+  }
+
+  public interface ComposeTestCase {
+    method public void emitContent();
+  }
+
+  public interface ComposeTestCaseSetup {
+    method public void performTestWithEventsControl(kotlin.jvm.functions.Function1<? super androidx.ui.test.ComposeExecutionControl,kotlin.Unit> block);
+  }
+
+  public interface ComposeTestRule extends org.junit.rules.TestRule {
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public android.graphics.Bitmap captureScreenOnIdle();
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenTestCase(androidx.ui.test.ComposeTestCase testCase);
+    method public androidx.ui.test.AnimationClockTestRule getClockTestRule();
+    method public androidx.ui.unit.Density getDensity();
+    method public android.util.DisplayMetrics getDisplayMetrics();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    property public abstract androidx.ui.test.AnimationClockTestRule clockTestRule;
+    property public abstract androidx.ui.unit.Density density;
+    property public abstract android.util.DisplayMetrics displayMetrics;
+  }
+
+  public final class ComposeTestRuleKt {
+    method public static androidx.ui.test.ComposeTestRule createComposeRule(androidx.compose.Recomposer? recomposer = null, boolean disableTransitions = false);
+  }
+
+  public final class DisableTransitions implements org.junit.rules.TestRule {
+    ctor public DisableTransitions();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description? description);
+  }
+
+  public final class DisableTransitions.DisableTransitionsStatement extends org.junit.runners.model.Statement {
+    ctor public DisableTransitions.DisableTransitionsStatement(org.junit.runners.model.Statement base);
+    method public void evaluate();
+  }
+
+  public final class ErrorMessagesKt {
+  }
+
+  public final class FiltersKt {
+    method public static androidx.ui.test.SemanticsMatcher hasAnyAncestorThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasAnyChildThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasAnyDescendantThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasAnySiblingThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasClickAction();
+    method public static androidx.ui.test.SemanticsMatcher hasNoClickAction();
+    method public static androidx.ui.test.SemanticsMatcher hasNoScrollAction();
+    method public static androidx.ui.test.SemanticsMatcher hasParentThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasScrollAction();
+    method public static androidx.ui.test.SemanticsMatcher hasSubstring(String substring, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsMatcher hasTestTag(String testTag);
+    method public static androidx.ui.test.SemanticsMatcher hasText(String text, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsMatcher hasValue(String value);
+    method public static androidx.ui.test.SemanticsMatcher isHidden();
+    method public static androidx.ui.test.SemanticsMatcher isInMutuallyExclusiveGroup();
+    method public static androidx.ui.test.SemanticsMatcher isNotHidden();
+    method public static androidx.ui.test.SemanticsMatcher isOff();
+    method public static androidx.ui.test.SemanticsMatcher isOn();
+    method public static androidx.ui.test.SemanticsMatcher isSelectable();
+    method public static androidx.ui.test.SemanticsMatcher isSelected();
+    method public static androidx.ui.test.SemanticsMatcher isToggleable();
+    method public static androidx.ui.test.SemanticsMatcher isUnselected();
+  }
+
+  public final class FindersKt {
+    method public static androidx.ui.test.SemanticsNodeInteraction find(androidx.ui.test.SemanticsMatcher selector);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> findAll(androidx.ui.test.SemanticsMatcher selector);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> findAllByTag(String testTag);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> findAllByText(String text, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsNodeInteraction findBySubstring(String text, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsNodeInteraction findByTag(String testTag);
+    method public static androidx.ui.test.SemanticsNodeInteraction findByText(String text, boolean ignoreCase = false);
+  }
+
+  public final class GestureScope {
+  }
+
+  public final class GestureScopeKt {
+    method public static androidx.ui.unit.PxPosition getCenter(androidx.ui.test.GestureScope);
+    method public static androidx.ui.unit.PxBounds getGlobalBounds(androidx.ui.test.GestureScope);
+    method public static androidx.ui.unit.IntPxSize getSize(androidx.ui.test.GestureScope);
+    method public static androidx.ui.unit.PxPosition localToGlobal(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendClick(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendClick(androidx.ui.test.GestureScope);
+    method public static void sendDoubleClick(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendDoubleClick(androidx.ui.test.GestureScope);
+    method public static void sendLongClick(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendLongClick(androidx.ui.test.GestureScope);
+    method public static void sendSwipe(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition start, androidx.ui.unit.PxPosition end, androidx.ui.unit.Duration duration = 200.milliseconds);
+    method public static void sendSwipeDown(androidx.ui.test.GestureScope);
+    method public static void sendSwipeLeft(androidx.ui.test.GestureScope);
+    method public static void sendSwipeRight(androidx.ui.test.GestureScope);
+    method public static void sendSwipeUp(androidx.ui.test.GestureScope);
+    method public static void sendSwipeWithVelocity(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition start, androidx.ui.unit.PxPosition end, @FloatRange(from=0.0) float endVelocity, androidx.ui.unit.Duration duration = 200.milliseconds);
+  }
+
+  public final class GoldenSemanticsKt {
+    method public static void assertEquals(androidx.ui.core.semantics.SemanticsConfiguration, androidx.ui.core.semantics.SemanticsConfiguration expected);
+    method public static androidx.ui.core.semantics.SemanticsConfiguration copyWith(androidx.ui.core.semantics.SemanticsConfiguration, kotlin.jvm.functions.Function1<? super androidx.ui.core.semantics.SemanticsConfiguration,kotlin.Unit> diff);
+    method public static androidx.ui.core.semantics.SemanticsConfiguration createFullSemantics(Boolean? isEnabled = null, String? value = null, androidx.ui.foundation.selection.ToggleableState? toggleableState = null, Boolean? inMutuallyExclusiveGroup = null, Boolean? isSelected = null);
+  }
+
+  public final class OutputKt {
+    method public static String dumpToString(androidx.ui.test.SemanticsNodeInteraction);
+    method public static String dumpToString(java.util.Collection<androidx.ui.test.SemanticsNodeInteraction>);
+  }
+
+  public final class SelectorsKt {
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> ancestors(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction child(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> children(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction parent(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction sibling(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> siblings(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class SemanticsMatcher {
+    ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>,? extends java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>> selector);
+    method public infix androidx.ui.test.SemanticsMatcher and(androidx.ui.test.SemanticsMatcher other);
+    method public String getDescription();
+    method public Iterable<androidx.ui.core.semantics.SemanticsNode> match(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
+    method public boolean matches(androidx.ui.core.semantics.SemanticsNode node);
+    method public boolean matchesAny(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
+    method public operator androidx.ui.test.SemanticsMatcher not();
+    method public infix androidx.ui.test.SemanticsMatcher or(androidx.ui.test.SemanticsMatcher other);
+    field public static final androidx.ui.test.SemanticsMatcher.Companion! Companion;
+  }
+
+  public static final class SemanticsMatcher.Companion {
+    method public <T> androidx.ui.test.SemanticsMatcher expectValue(androidx.ui.semantics.SemanticsPropertyKey<T> key, T? expectedValue);
+    method public androidx.ui.test.SemanticsMatcher fromCondition(String description, kotlin.jvm.functions.Function1<? super androidx.ui.core.semantics.SemanticsNode,java.lang.Boolean> selector);
+    method public androidx.ui.test.SemanticsMatcher getAny();
+    method public <T> androidx.ui.test.SemanticsMatcher keyIsDefined(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> androidx.ui.test.SemanticsMatcher keyNotDefined(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    property public final androidx.ui.test.SemanticsMatcher any;
+  }
+
+  public final class SemanticsMatcherKt {
+  }
+
+  public final class SemanticsNodeInteraction {
+    method public void assertDoesNotExist();
+    method public androidx.ui.test.SemanticsNodeInteraction assertExists(String? errorMessageOnFail = null);
+    method public androidx.ui.core.semantics.SemanticsNode fetchSemanticsNode(String? errorMessageOnFail = null);
+  }
+
+  public final class SemanticsNodeInteractionKt {
+  }
+
+  public final class SizesTestingKt {
+    method public static androidx.ui.layout.DpConstraints getBigTestConstraints();
+    method public static androidx.ui.test.CollectedSizes setContentAndCollectSizes(androidx.ui.test.ComposeTestRule, androidx.ui.layout.DpConstraints parentConstraints = BigTestConstraints, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static androidx.ui.unit.PxSize setContentAndGetPixelSize(androidx.ui.test.ComposeTestRule, androidx.ui.layout.DpConstraints parentConstraints = BigTestConstraints, kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> performSetContent = { setContent(it) }, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class StateRestorationTester {
+    ctor public StateRestorationTester(androidx.ui.test.ComposeTestRule composeTestRule);
+    method public void emulateSavedInstanceStateRestore();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+  public final class SynchronizationKt {
+    method public static <T> T! runOnIdleCompose(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static void waitForIdle();
+  }
+
+  public interface TestAnimationClock extends androidx.animation.AnimationClockObservable {
+    method public void advanceClock(long milliseconds);
+    method public boolean isIdle();
+    method public boolean isPaused();
+    method public void pauseClock();
+    method public void resumeClock();
+    property public abstract boolean isIdle;
+    property public abstract boolean isPaused;
+  }
+
+}
+
+package androidx.ui.test.android {
+
+  public final class AndroidComposeTestCaseRunnerKt {
+    method public static <T extends androidx.ui.test.ComposeTestCase> androidx.ui.test.ComposeBenchmarkScope<T> createAndroidComposeBenchmarkRunner(kotlin.jvm.functions.Function0<? extends T> testCaseFactory, androidx.activity.ComponentActivity activity);
+  }
+
+  public final class AndroidComposeTestCaseSetup implements androidx.ui.test.ComposeTestCaseSetup {
+    ctor public AndroidComposeTestCaseSetup(androidx.ui.test.ComposeTestCase testCase, androidx.activity.ComponentActivity activity);
+    method public void performTestWithEventsControl(kotlin.jvm.functions.Function1<? super androidx.ui.test.ComposeExecutionControl,kotlin.Unit> block);
+  }
+
+  public final class AndroidComposeTestRule<T extends androidx.activity.ComponentActivity> implements androidx.ui.test.ComposeTestRule {
+    ctor public AndroidComposeTestRule(androidx.test.rule.ActivityTestRule<T> activityTestRule, androidx.compose.Recomposer? recomposer, boolean disableTransitions);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description? description);
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public android.graphics.Bitmap captureScreenOnIdle();
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenTestCase(androidx.ui.test.ComposeTestCase testCase);
+    method public androidx.test.rule.ActivityTestRule<T> getActivityTestRule();
+    method public androidx.ui.test.AnimationClockTestRule getClockTestRule();
+    method public androidx.ui.unit.Density getDensity();
+    method public android.util.DisplayMetrics getDisplayMetrics();
+    method public androidx.compose.Recomposer? getRecomposer();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    property public androidx.ui.test.AnimationClockTestRule clockTestRule;
+    property public androidx.ui.unit.Density density;
+    property public android.util.DisplayMetrics displayMetrics;
+  }
+
+  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 AndroidComposeTestRuleKt {
+    method public static inline <reified T extends androidx.activity.ComponentActivity> androidx.ui.test.android.AndroidComposeTestRule<T> AndroidComposeTestRule(androidx.compose.Recomposer? recomposer = null, boolean disableTransitions = false);
+  }
+
+  public final class ComposeIdlingResourceKt {
+    method public static void registerComposeWithEspresso();
+    method public static void registerTestClock(androidx.ui.test.TestAnimationClock clock);
+    method public static void unregisterComposeFromEspresso();
+    method public static void unregisterTestClock(androidx.ui.test.TestAnimationClock clock);
+  }
+
+  public final class WindowCaptureKt {
+  }
+
+}
+
+package androidx.ui.test.android.fake {
+
+  public final class FakeViewStructureKt {
+  }
+
+}
+
diff --git a/ui/ui-test/api/public_plus_experimental_current.txt b/ui/ui-test/api/public_plus_experimental_current.txt
index e8bf9f4..dadd0a3 100644
--- a/ui/ui-test/api/public_plus_experimental_current.txt
+++ b/ui/ui-test/api/public_plus_experimental_current.txt
@@ -211,6 +211,15 @@
     method public static String dumpToString(java.util.Collection<androidx.ui.test.SemanticsNodeInteraction>);
   }
 
+  public final class SelectorsKt {
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> ancestors(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction child(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> children(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction parent(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction sibling(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> siblings(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
   public final class SemanticsMatcher {
     ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>,? extends java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>> selector);
     method public infix androidx.ui.test.SemanticsMatcher and(androidx.ui.test.SemanticsMatcher other);
@@ -232,6 +241,9 @@
     property public final androidx.ui.test.SemanticsMatcher any;
   }
 
+  public final class SemanticsMatcherKt {
+  }
+
   public final class SemanticsNodeInteraction {
     method public void assertDoesNotExist();
     method public androidx.ui.test.SemanticsNodeInteraction assertExists(String? errorMessageOnFail = null);
@@ -256,6 +268,7 @@
   public final class SynchronizationKt {
     method public static <T> T! runOnIdleCompose(kotlin.jvm.functions.Function0<? extends T> action);
     method public static <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static void waitForIdle();
   }
 
   public interface TestAnimationClock extends androidx.animation.AnimationClockObservable {
diff --git a/ui/ui-test/api/res-0.1.0-dev11.txt b/ui/ui-test/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-test/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-test/api/restricted_0.1.0-dev10.txt b/ui/ui-test/api/restricted_0.1.0-dev10.txt
index a01ad37..000debc 100644
--- a/ui/ui-test/api/restricted_0.1.0-dev10.txt
+++ b/ui/ui-test/api/restricted_0.1.0-dev10.txt
@@ -212,6 +212,15 @@
     method public static String dumpToString(java.util.Collection<androidx.ui.test.SemanticsNodeInteraction>);
   }
 
+  public final class SelectorsKt {
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> ancestors(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction child(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> children(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction parent(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction sibling(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> siblings(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
   public final class SemanticsMatcher {
     ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>,? extends java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>> selector);
     method public infix androidx.ui.test.SemanticsMatcher and(androidx.ui.test.SemanticsMatcher other);
@@ -233,6 +242,9 @@
     property public final androidx.ui.test.SemanticsMatcher any;
   }
 
+  public final class SemanticsMatcherKt {
+  }
+
   public final class SemanticsNodeInteraction {
     method public void assertDoesNotExist();
     method public androidx.ui.test.SemanticsNodeInteraction assertExists(String? errorMessageOnFail = null);
@@ -257,6 +269,7 @@
   public final class SynchronizationKt {
     method public static <T> T! runOnIdleCompose(kotlin.jvm.functions.Function0<? extends T> action);
     method public static <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static void waitForIdle();
   }
 
   public interface TestAnimationClock extends androidx.animation.AnimationClockObservable {
diff --git a/ui/ui-test/api/restricted_0.1.0-dev11.txt b/ui/ui-test/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..000debc
--- /dev/null
+++ b/ui/ui-test/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,342 @@
+// Signature format: 3.0
+package androidx.ui.test {
+
+  public final class ActionsKt {
+    method public static <T extends kotlin.Function<? extends kotlin.Unit>> void callSemanticsAction(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<T>> key, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> invocation);
+    method public static void callSemanticsAction(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<kotlin.Unit>>> key);
+    method public static androidx.ui.test.SemanticsNodeInteraction doClick(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction doGesture(androidx.ui.test.SemanticsNodeInteraction, kotlin.jvm.functions.Function1<? super androidx.ui.test.GestureScope,kotlin.Unit> block);
+    method public static androidx.ui.test.SemanticsNodeInteraction doScrollTo(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class AnimationClockTestRule implements org.junit.rules.TestRule {
+    ctor public AnimationClockTestRule();
+    method public void advanceClock(long milliseconds);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description? description);
+    method public androidx.ui.test.TestAnimationClock getClock();
+    method public boolean isPaused();
+    method public void pauseClock();
+    method public void resumeClock();
+    property public final androidx.ui.test.TestAnimationClock clock;
+    property public final boolean isPaused;
+  }
+
+  public final class AssertionsKt {
+    method public static androidx.ui.test.SemanticsNodeInteraction assert(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.test.SemanticsMatcher matcher);
+    method public static <T extends java.util.Collection<? extends androidx.ui.test.SemanticsNodeInteraction>> T assertCountEquals(T, int expectedSize);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertHasClickAction(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertHasNoClickAction(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsDisplayed(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsHidden(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsInMutuallyExclusiveGroup(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsNotDisplayed(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsNotHidden(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsOff(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsOn(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsSelectable(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsSelected(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsToggleable(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertIsUnselected(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertLabelEquals(androidx.ui.test.SemanticsNodeInteraction, String value);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertSemanticsIsEqualTo(androidx.ui.test.SemanticsNodeInteraction, androidx.ui.core.semantics.SemanticsConfiguration expectedProperties);
+    method public static androidx.ui.test.SemanticsNodeInteraction assertValueEquals(androidx.ui.test.SemanticsNodeInteraction, String value);
+  }
+
+  public final class BitmapHelpersKt {
+    method public static void assertPixelColor-9bBi3KA(android.graphics.Bitmap, long expected, int x, int y, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.Color,java.lang.String> error = { color -> "Pixel(" + x + ", " + y + ") expected to be " + expected + ", but was " + color });
+    method public static void assertPixels(android.graphics.Bitmap, androidx.ui.unit.IntPxSize? expectedSize = null, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPxPosition,androidx.ui.graphics.Color> expectedColorProvider);
+    method public static void assertShape-nbwoFSQ(android.graphics.Bitmap, androidx.ui.unit.Density density, androidx.ui.graphics.Shape shape, long shapeColor, long backgroundColor, androidx.ui.graphics.Shape backgroundShape = RectangleShape, float sizeX = width.toFloat().px, float sizeY = height.toFloat().px, float shapeSizeX = sizeX, float shapeSizeY = sizeY, float centerX = width.px / 2.0, float centerY = height.px / 2.0, float shapeOverlapPixelCount = 1.px);
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static android.graphics.Bitmap captureToBitmap(androidx.ui.test.SemanticsNodeInteraction);
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static android.graphics.Bitmap captureToBitmap(android.view.View);
+    method public static boolean contains(androidx.ui.graphics.Path, androidx.ui.geometry.Offset offset);
+  }
+
+  public final class CollectedSizes {
+    ctor public CollectedSizes(androidx.ui.unit.PxSize size, androidx.ui.unit.Density density);
+    method public androidx.ui.test.CollectedSizes assertHeightEqualsTo(androidx.ui.unit.Dp expectedHeight);
+    method public androidx.ui.test.CollectedSizes assertHeightEqualsTo(kotlin.jvm.functions.Function1<? super androidx.ui.unit.Density,androidx.ui.unit.IntPx> expectedHeightPx);
+    method public androidx.ui.test.CollectedSizes assertIsSquareWithSize(androidx.ui.unit.Dp expectedSize);
+    method public androidx.ui.test.CollectedSizes assertIsSquareWithSize(kotlin.jvm.functions.Function1<? super androidx.ui.unit.Density,androidx.ui.unit.IntPx> expectedSquarePx);
+    method public androidx.ui.test.CollectedSizes assertWidthEqualsTo(androidx.ui.unit.Dp expectedWidth);
+    method public androidx.ui.test.CollectedSizes assertWidthEqualsTo(kotlin.jvm.functions.Function1<? super androidx.ui.unit.Density,androidx.ui.unit.IntPx> expectedWidthPx);
+  }
+
+  public interface ComposeBenchmarkScope<T> extends androidx.ui.test.ComposeExecutionControl {
+    method public void createTestCase();
+    method public void disposeContent();
+    method public void draw();
+    method public void drawFinish();
+    method public void drawPrepare();
+    method public void emitContent();
+    method public T! getTestCase();
+    method public void invalidateViews();
+    method public void measureWithSpec(int widthSpec, int heightSpec);
+    method public void requestLayout();
+  }
+
+  public final class ComposeBenchmarkScopeKt {
+    method public static <T> void setupContent(androidx.ui.test.ComposeBenchmarkScope<T>);
+  }
+
+  public interface ComposeExecutionControl {
+    method public void capturePreviewPictureToActivity();
+    method public void doFrame();
+    method public void drawToBitmap();
+    method public boolean getDidLastRecomposeHaveChanges();
+    method public int getMeasuredHeight();
+    method public int getMeasuredWidth();
+    method public boolean hasPendingChanges();
+    method public void layout();
+    method public void measure();
+    method public void recompose();
+    property public abstract boolean didLastRecomposeHaveChanges;
+    property public abstract int measuredHeight;
+    property public abstract int measuredWidth;
+  }
+
+  public final class ComposeExecutionControlKt {
+    method public static void assertHasPendingChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertLastRecomposeHadChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertLastRecomposeHadNoChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertMeasureSizeIsPositive(androidx.ui.test.ComposeExecutionControl);
+    method public static void assertNoPendingChanges(androidx.ui.test.ComposeExecutionControl);
+    method public static void doFramesAssertAllHadChangesExceptLastOne(androidx.ui.test.ComposeExecutionControl, int numberOfFramesToBeStable);
+    method public static int doFramesUntilNoChangesPending(androidx.ui.test.ComposeExecutionControl, int maxAmountOfFrames = 10);
+    method public static void recomposeAssertHadChanges(androidx.ui.test.ComposeExecutionControl);
+  }
+
+  public interface ComposeTestCase {
+    method public void emitContent();
+  }
+
+  public interface ComposeTestCaseSetup {
+    method public void performTestWithEventsControl(kotlin.jvm.functions.Function1<? super androidx.ui.test.ComposeExecutionControl,kotlin.Unit> block);
+  }
+
+  public interface ComposeTestRule extends org.junit.rules.TestRule {
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public android.graphics.Bitmap captureScreenOnIdle();
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenTestCase(androidx.ui.test.ComposeTestCase testCase);
+    method public androidx.ui.test.AnimationClockTestRule getClockTestRule();
+    method public androidx.ui.unit.Density getDensity();
+    method public android.util.DisplayMetrics getDisplayMetrics();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    property public abstract androidx.ui.test.AnimationClockTestRule clockTestRule;
+    property public abstract androidx.ui.unit.Density density;
+    property public abstract android.util.DisplayMetrics displayMetrics;
+  }
+
+  public final class ComposeTestRuleKt {
+    method public static androidx.ui.test.ComposeTestRule createComposeRule(androidx.compose.Recomposer? recomposer = null, boolean disableTransitions = false);
+  }
+
+  public final class DisableTransitions implements org.junit.rules.TestRule {
+    ctor public DisableTransitions();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description? description);
+  }
+
+  public final class DisableTransitions.DisableTransitionsStatement extends org.junit.runners.model.Statement {
+    ctor public DisableTransitions.DisableTransitionsStatement(org.junit.runners.model.Statement base);
+    method public void evaluate();
+  }
+
+  public final class ErrorMessagesKt {
+  }
+
+  public final class FiltersKt {
+    method public static androidx.ui.test.SemanticsMatcher hasAnyAncestorThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasAnyChildThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasAnyDescendantThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasAnySiblingThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasClickAction();
+    method public static androidx.ui.test.SemanticsMatcher hasNoClickAction();
+    method public static androidx.ui.test.SemanticsMatcher hasNoScrollAction();
+    method public static androidx.ui.test.SemanticsMatcher hasParentThat(androidx.ui.test.SemanticsMatcher matcher);
+    method public static androidx.ui.test.SemanticsMatcher hasScrollAction();
+    method public static androidx.ui.test.SemanticsMatcher hasSubstring(String substring, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsMatcher hasTestTag(String testTag);
+    method public static androidx.ui.test.SemanticsMatcher hasText(String text, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsMatcher hasValue(String value);
+    method public static androidx.ui.test.SemanticsMatcher isHidden();
+    method public static androidx.ui.test.SemanticsMatcher isInMutuallyExclusiveGroup();
+    method public static androidx.ui.test.SemanticsMatcher isNotHidden();
+    method public static androidx.ui.test.SemanticsMatcher isOff();
+    method public static androidx.ui.test.SemanticsMatcher isOn();
+    method public static androidx.ui.test.SemanticsMatcher isSelectable();
+    method public static androidx.ui.test.SemanticsMatcher isSelected();
+    method public static androidx.ui.test.SemanticsMatcher isToggleable();
+    method public static androidx.ui.test.SemanticsMatcher isUnselected();
+  }
+
+  public final class FindersKt {
+    method public static androidx.ui.test.SemanticsNodeInteraction find(androidx.ui.test.SemanticsMatcher selector);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> findAll(androidx.ui.test.SemanticsMatcher selector);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> findAllByTag(String testTag);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> findAllByText(String text, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsNodeInteraction findBySubstring(String text, boolean ignoreCase = false);
+    method public static androidx.ui.test.SemanticsNodeInteraction findByTag(String testTag);
+    method public static androidx.ui.test.SemanticsNodeInteraction findByText(String text, boolean ignoreCase = false);
+  }
+
+  public final class GestureScope {
+  }
+
+  public final class GestureScopeKt {
+    method public static androidx.ui.unit.PxPosition getCenter(androidx.ui.test.GestureScope);
+    method public static androidx.ui.unit.PxBounds getGlobalBounds(androidx.ui.test.GestureScope);
+    method public static androidx.ui.unit.IntPxSize getSize(androidx.ui.test.GestureScope);
+    method public static androidx.ui.unit.PxPosition localToGlobal(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendClick(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendClick(androidx.ui.test.GestureScope);
+    method public static void sendDoubleClick(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendDoubleClick(androidx.ui.test.GestureScope);
+    method public static void sendLongClick(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+    method public static void sendLongClick(androidx.ui.test.GestureScope);
+    method public static void sendSwipe(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition start, androidx.ui.unit.PxPosition end, androidx.ui.unit.Duration duration = 200.milliseconds);
+    method public static void sendSwipeDown(androidx.ui.test.GestureScope);
+    method public static void sendSwipeLeft(androidx.ui.test.GestureScope);
+    method public static void sendSwipeRight(androidx.ui.test.GestureScope);
+    method public static void sendSwipeUp(androidx.ui.test.GestureScope);
+    method public static void sendSwipeWithVelocity(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition start, androidx.ui.unit.PxPosition end, @FloatRange(from=0.0) float endVelocity, androidx.ui.unit.Duration duration = 200.milliseconds);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static void sendTouchDown(androidx.ui.test.GestureScope, androidx.ui.unit.PxPosition position);
+  }
+
+  public final class GoldenSemanticsKt {
+    method public static void assertEquals(androidx.ui.core.semantics.SemanticsConfiguration, androidx.ui.core.semantics.SemanticsConfiguration expected);
+    method public static androidx.ui.core.semantics.SemanticsConfiguration copyWith(androidx.ui.core.semantics.SemanticsConfiguration, kotlin.jvm.functions.Function1<? super androidx.ui.core.semantics.SemanticsConfiguration,kotlin.Unit> diff);
+    method public static androidx.ui.core.semantics.SemanticsConfiguration createFullSemantics(Boolean? isEnabled = null, String? value = null, androidx.ui.foundation.selection.ToggleableState? toggleableState = null, Boolean? inMutuallyExclusiveGroup = null, Boolean? isSelected = null);
+  }
+
+  public final class OutputKt {
+    method public static String dumpToString(androidx.ui.test.SemanticsNodeInteraction);
+    method public static String dumpToString(java.util.Collection<androidx.ui.test.SemanticsNodeInteraction>);
+  }
+
+  public final class SelectorsKt {
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> ancestors(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction child(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> children(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction parent(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction sibling(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> siblings(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
+  public final class SemanticsMatcher {
+    ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>,? extends java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>> selector);
+    method public infix androidx.ui.test.SemanticsMatcher and(androidx.ui.test.SemanticsMatcher other);
+    method public String getDescription();
+    method public Iterable<androidx.ui.core.semantics.SemanticsNode> match(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
+    method public boolean matches(androidx.ui.core.semantics.SemanticsNode node);
+    method public boolean matchesAny(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
+    method public operator androidx.ui.test.SemanticsMatcher not();
+    method public infix androidx.ui.test.SemanticsMatcher or(androidx.ui.test.SemanticsMatcher other);
+    field public static final androidx.ui.test.SemanticsMatcher.Companion! Companion;
+  }
+
+  public static final class SemanticsMatcher.Companion {
+    method public <T> androidx.ui.test.SemanticsMatcher expectValue(androidx.ui.semantics.SemanticsPropertyKey<T> key, T? expectedValue);
+    method public androidx.ui.test.SemanticsMatcher fromCondition(String description, kotlin.jvm.functions.Function1<? super androidx.ui.core.semantics.SemanticsNode,java.lang.Boolean> selector);
+    method public androidx.ui.test.SemanticsMatcher getAny();
+    method public <T> androidx.ui.test.SemanticsMatcher keyIsDefined(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    method public <T> androidx.ui.test.SemanticsMatcher keyNotDefined(androidx.ui.semantics.SemanticsPropertyKey<T> key);
+    property public final androidx.ui.test.SemanticsMatcher any;
+  }
+
+  public final class SemanticsMatcherKt {
+  }
+
+  public final class SemanticsNodeInteraction {
+    method public void assertDoesNotExist();
+    method public androidx.ui.test.SemanticsNodeInteraction assertExists(String? errorMessageOnFail = null);
+    method public androidx.ui.core.semantics.SemanticsNode fetchSemanticsNode(String? errorMessageOnFail = null);
+  }
+
+  public final class SemanticsNodeInteractionKt {
+  }
+
+  public final class SizesTestingKt {
+    method public static androidx.ui.layout.DpConstraints getBigTestConstraints();
+    method public static androidx.ui.test.CollectedSizes setContentAndCollectSizes(androidx.ui.test.ComposeTestRule, androidx.ui.layout.DpConstraints parentConstraints = BigTestConstraints, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static androidx.ui.unit.PxSize setContentAndGetPixelSize(androidx.ui.test.ComposeTestRule, androidx.ui.layout.DpConstraints parentConstraints = BigTestConstraints, kotlin.jvm.functions.Function1<? super kotlin.jvm.functions.Function0<kotlin.Unit>,kotlin.Unit> performSetContent = { setContent(it) }, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+  }
+
+  public final class StateRestorationTester {
+    ctor public StateRestorationTester(androidx.ui.test.ComposeTestRule composeTestRule);
+    method public void emulateSavedInstanceStateRestore();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+  }
+
+  public final class SynchronizationKt {
+    method public static <T> T! runOnIdleCompose(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static void waitForIdle();
+  }
+
+  public interface TestAnimationClock extends androidx.animation.AnimationClockObservable {
+    method public void advanceClock(long milliseconds);
+    method public boolean isIdle();
+    method public boolean isPaused();
+    method public void pauseClock();
+    method public void resumeClock();
+    property public abstract boolean isIdle;
+    property public abstract boolean isPaused;
+  }
+
+}
+
+package androidx.ui.test.android {
+
+  public final class AndroidComposeTestCaseRunnerKt {
+    method public static <T extends androidx.ui.test.ComposeTestCase> androidx.ui.test.ComposeBenchmarkScope<T> createAndroidComposeBenchmarkRunner(kotlin.jvm.functions.Function0<? extends T> testCaseFactory, androidx.activity.ComponentActivity activity);
+  }
+
+  public final class AndroidComposeTestCaseSetup implements androidx.ui.test.ComposeTestCaseSetup {
+    ctor public AndroidComposeTestCaseSetup(androidx.ui.test.ComposeTestCase testCase, androidx.activity.ComponentActivity activity);
+    method public void performTestWithEventsControl(kotlin.jvm.functions.Function1<? super androidx.ui.test.ComposeExecutionControl,kotlin.Unit> block);
+  }
+
+  public final class AndroidComposeTestRule<T extends androidx.activity.ComponentActivity> implements androidx.ui.test.ComposeTestRule {
+    ctor public AndroidComposeTestRule(androidx.test.rule.ActivityTestRule<T> activityTestRule, androidx.compose.Recomposer? recomposer, boolean disableTransitions);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement base, org.junit.runner.Description? description);
+    method @RequiresApi(android.os.Build.VERSION_CODES.O) public android.graphics.Bitmap captureScreenOnIdle();
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    method public androidx.ui.test.ComposeTestCaseSetup forGivenTestCase(androidx.ui.test.ComposeTestCase testCase);
+    method public androidx.test.rule.ActivityTestRule<T> getActivityTestRule();
+    method public androidx.ui.test.AnimationClockTestRule getClockTestRule();
+    method public androidx.ui.unit.Density getDensity();
+    method public android.util.DisplayMetrics getDisplayMetrics();
+    method public androidx.compose.Recomposer? getRecomposer();
+    method public void setContent(kotlin.jvm.functions.Function0<kotlin.Unit> composable);
+    property public androidx.ui.test.AnimationClockTestRule clockTestRule;
+    property public androidx.ui.unit.Density density;
+    property public android.util.DisplayMetrics displayMetrics;
+  }
+
+  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 AndroidComposeTestRuleKt {
+    method public static inline <reified T extends androidx.activity.ComponentActivity> androidx.ui.test.android.AndroidComposeTestRule<T> AndroidComposeTestRule(androidx.compose.Recomposer? recomposer = null, boolean disableTransitions = false);
+  }
+
+  public final class ComposeIdlingResourceKt {
+    method public static void registerComposeWithEspresso();
+    method public static void registerTestClock(androidx.ui.test.TestAnimationClock clock);
+    method public static void unregisterComposeFromEspresso();
+    method public static void unregisterTestClock(androidx.ui.test.TestAnimationClock clock);
+  }
+
+  public final class WindowCaptureKt {
+  }
+
+}
+
+package androidx.ui.test.android.fake {
+
+  public final class FakeViewStructureKt {
+  }
+
+}
+
diff --git a/ui/ui-test/api/restricted_current.txt b/ui/ui-test/api/restricted_current.txt
index a01ad37..000debc 100644
--- a/ui/ui-test/api/restricted_current.txt
+++ b/ui/ui-test/api/restricted_current.txt
@@ -212,6 +212,15 @@
     method public static String dumpToString(java.util.Collection<androidx.ui.test.SemanticsNodeInteraction>);
   }
 
+  public final class SelectorsKt {
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> ancestors(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction child(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> children(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction parent(androidx.ui.test.SemanticsNodeInteraction);
+    method public static androidx.ui.test.SemanticsNodeInteraction sibling(androidx.ui.test.SemanticsNodeInteraction);
+    method public static java.util.List<androidx.ui.test.SemanticsNodeInteraction> siblings(androidx.ui.test.SemanticsNodeInteraction);
+  }
+
   public final class SemanticsMatcher {
     ctor public SemanticsMatcher(String description, kotlin.jvm.functions.Function1<? super java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>,? extends java.lang.Iterable<androidx.ui.core.semantics.SemanticsNode>> selector);
     method public infix androidx.ui.test.SemanticsMatcher and(androidx.ui.test.SemanticsMatcher other);
@@ -233,6 +242,9 @@
     property public final androidx.ui.test.SemanticsMatcher any;
   }
 
+  public final class SemanticsMatcherKt {
+  }
+
   public final class SemanticsNodeInteraction {
     method public void assertDoesNotExist();
     method public androidx.ui.test.SemanticsNodeInteraction assertExists(String? errorMessageOnFail = null);
@@ -257,6 +269,7 @@
   public final class SynchronizationKt {
     method public static <T> T! runOnIdleCompose(kotlin.jvm.functions.Function0<? extends T> action);
     method public static <T> T! runOnUiThread(kotlin.jvm.functions.Function0<? extends T> action);
+    method public static void waitForIdle();
   }
 
   public interface TestAnimationClock extends androidx.animation.AnimationClockObservable {
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
index e0eb4b3..124dbf8 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
@@ -28,8 +28,8 @@
 import androidx.ui.material.Surface
 import androidx.ui.semantics.Semantics
 import androidx.ui.semantics.SemanticsActions
-import androidx.ui.test.util.obfuscateNodesInfo
-import com.google.common.truth.Truth.assertThat
+import androidx.ui.test.util.expectErrorMessage
+import androidx.ui.test.util.expectErrorMessageStartsWith
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -340,28 +340,4 @@
             }
         }
     }
-
-    private fun expectErrorMessage(expectedErrorMessage: String, block: () -> Unit) {
-        try {
-            block()
-        } catch (e: AssertionError) {
-            val received = obfuscateNodesInfo(e.localizedMessage!!)
-            assertThat(received).isEqualTo(expectedErrorMessage.trim())
-            return
-        }
-
-        throw AssertionError("No AssertionError thrown!")
-    }
-
-    private fun expectErrorMessageStartsWith(expectedErrorMessage: String, block: () -> Unit) {
-        try {
-            block()
-        } catch (e: AssertionError) {
-            val received = obfuscateNodesInfo(e.localizedMessage!!)
-            assertThat(received).startsWith(expectedErrorMessage.trim())
-            return
-        }
-
-        throw AssertionError("No AssertionError thrown!")
-    }
 }
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/FirstDrawTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/FirstDrawTest.kt
index 086fe88..fa112c6 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/FirstDrawTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/FirstDrawTest.kt
@@ -55,6 +55,21 @@
     }
 
     /**
+     * Tests that the compose tree has been drawn at least once when [onIdle] finishes.
+     */
+    @Test
+    fun waitsForFirstDraw_withoutOnIdle() {
+        var drawn = false
+        testRule.setContent {
+            Canvas(Modifier.fillMaxSize()) {
+                drawn = true
+            }
+        }
+        // onIdle() shouldn't be necessary
+        assertThat(drawn).isTrue()
+    }
+
+    /**
      * Tests that [onIdle] doesn't timeout when the compose tree is completely off-screen and
      * will hence not be drawn.
      */
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyAncestorTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyAncestorTest.kt
index 20e2e22..bff8537 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyAncestorTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyAncestorTest.kt
@@ -16,11 +16,7 @@
 
 package androidx.ui.test.predicates
 
-import androidx.compose.Composable
 import androidx.test.filters.MediumTest
-import androidx.ui.layout.Column
-import androidx.ui.semantics.Semantics
-import androidx.ui.semantics.testTag
 import androidx.ui.test.assert
 import androidx.ui.test.assertCountEquals
 import androidx.ui.test.createComposeRule
@@ -28,6 +24,7 @@
 import androidx.ui.test.findAll
 import androidx.ui.test.hasAnyAncestorThat
 import androidx.ui.test.hasTestTag
+import androidx.ui.test.util.BoundaryNode
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -122,23 +119,4 @@
         find(hasAnyAncestorThat(hasTestTag("Child")))
             .assertDoesNotExist()
     }
-
-    @Composable
-    fun BoundaryNode(
-        testTag: String,
-        children: @Composable() () -> Unit
-    ) {
-        Semantics(container = true, properties = { this.testTag = testTag }) {
-            Column { children() }
-        }
-    }
-
-    @Composable
-    fun BoundaryNode(
-        testTag: String
-    ) {
-        Semantics(container = true, properties = { this.testTag = testTag }) {
-            Column {}
-        }
-    }
 }
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyChildTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyChildTest.kt
index 38b532b..eac72bf 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyChildTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyChildTest.kt
@@ -16,11 +16,7 @@
 
 package androidx.ui.test.predicates
 
-import androidx.compose.Composable
 import androidx.test.filters.MediumTest
-import androidx.ui.layout.Column
-import androidx.ui.semantics.Semantics
-import androidx.ui.semantics.testTag
 import androidx.ui.test.assert
 import androidx.ui.test.assertCountEquals
 import androidx.ui.test.createComposeRule
@@ -28,6 +24,7 @@
 import androidx.ui.test.findAll
 import androidx.ui.test.hasAnyChildThat
 import androidx.ui.test.hasTestTag
+import androidx.ui.test.util.BoundaryNode
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -118,23 +115,4 @@
         find(hasAnyChildThat(hasAnyChildThat(hasTestTag("Child"))))
             .assert(hasTestTag("Parent"))
     }
-
-    @Composable
-    fun BoundaryNode(
-        testTag: String,
-        children: @Composable() () -> Unit
-    ) {
-        Semantics(container = true, properties = { this.testTag = testTag }) {
-            Column { children() }
-        }
-    }
-
-    @Composable
-    fun BoundaryNode(
-        testTag: String
-    ) {
-        Semantics(container = true, properties = { this.testTag = testTag }) {
-            Column {}
-        }
-    }
 }
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyDescendantTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyDescendantTest.kt
index 9e37c62..0fa8b93 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyDescendantTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnyDescendantTest.kt
@@ -16,11 +16,7 @@
 
 package androidx.ui.test.predicates
 
-import androidx.compose.Composable
 import androidx.test.filters.MediumTest
-import androidx.ui.layout.Column
-import androidx.ui.semantics.Semantics
-import androidx.ui.semantics.testTag
 import androidx.ui.test.assert
 import androidx.ui.test.assertCountEquals
 import androidx.ui.test.createComposeRule
@@ -28,6 +24,7 @@
 import androidx.ui.test.findAll
 import androidx.ui.test.hasAnyDescendantThat
 import androidx.ui.test.hasTestTag
+import androidx.ui.test.util.BoundaryNode
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -95,23 +92,4 @@
         findAll(hasAnyDescendantThat(hasTestTag("Child")))
             .assertCountEquals(3) // Parent, Parent2 and root
     }
-
-    @Composable
-    fun BoundaryNode(
-        testTag: String,
-        children: @Composable() () -> Unit
-    ) {
-        Semantics(container = true, properties = { this.testTag = testTag }) {
-            Column { children() }
-        }
-    }
-
-    @Composable
-    fun BoundaryNode(
-        testTag: String
-    ) {
-        Semantics(container = true, properties = { this.testTag = testTag }) {
-            Column {}
-        }
-    }
 }
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnySiblingTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnySiblingTest.kt
index 772e0fe..c1b4a80 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnySiblingTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasAnySiblingTest.kt
@@ -16,11 +16,7 @@
 
 package androidx.ui.test.predicates
 
-import androidx.compose.Composable
 import androidx.test.filters.MediumTest
-import androidx.ui.layout.Column
-import androidx.ui.semantics.Semantics
-import androidx.ui.semantics.testTag
 import androidx.ui.test.assert
 import androidx.ui.test.assertCountEquals
 import androidx.ui.test.createComposeRule
@@ -29,6 +25,7 @@
 import androidx.ui.test.hasAnySiblingThat
 import androidx.ui.test.hasParentThat
 import androidx.ui.test.hasTestTag
+import androidx.ui.test.util.BoundaryNode
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -160,23 +157,4 @@
         find(hasParentThat(hasAnySiblingThat(hasTestTag("ParentSibling"))))
             .assert(hasTestTag("Me"))
     }
-
-    @Composable
-    fun BoundaryNode(
-        testTag: String,
-        children: @Composable() () -> Unit
-    ) {
-        Semantics(container = true, properties = { this.testTag = testTag }) {
-            Column { children() }
-        }
-    }
-
-    @Composable
-    fun BoundaryNode(
-        testTag: String
-    ) {
-        Semantics(container = true, properties = { this.testTag = testTag }) {
-            Column {}
-        }
-    }
 }
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasParentTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasParentTest.kt
index d168a63..d371c54 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasParentTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/predicates/HasParentTest.kt
@@ -16,11 +16,7 @@
 
 package androidx.ui.test.predicates
 
-import androidx.compose.Composable
 import androidx.test.filters.MediumTest
-import androidx.ui.layout.Column
-import androidx.ui.semantics.Semantics
-import androidx.ui.semantics.testTag
 import androidx.ui.test.assert
 import androidx.ui.test.assertCountEquals
 import androidx.ui.test.createComposeRule
@@ -28,6 +24,7 @@
 import androidx.ui.test.findAll
 import androidx.ui.test.hasParentThat
 import androidx.ui.test.hasTestTag
+import androidx.ui.test.util.BoundaryNode
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -114,23 +111,4 @@
         find(hasParentThat(hasParentThat(hasTestTag("Parent"))))
             .assert(hasTestTag("Child"))
     }
-
-    @Composable
-    fun BoundaryNode(
-        testTag: String,
-        children: @Composable() () -> Unit
-    ) {
-        Semantics(container = true, properties = { this.testTag = testTag }) {
-            Column { children() }
-        }
-    }
-
-    @Composable
-    fun BoundaryNode(
-        testTag: String
-    ) {
-        Semantics(container = true, properties = { this.testTag = testTag }) {
-            Column {}
-        }
-    }
 }
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/AncestorsSelectorTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/AncestorsSelectorTest.kt
new file mode 100644
index 0000000..b956867
--- /dev/null
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/AncestorsSelectorTest.kt
@@ -0,0 +1,94 @@
+/*
+ * 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.ui.test.selectors
+
+import androidx.test.filters.MediumTest
+import androidx.ui.test.ancestors
+import androidx.ui.test.assert
+import androidx.ui.test.assertCountEquals
+import androidx.ui.test.createComposeRule
+import androidx.ui.test.findByTag
+import androidx.ui.test.hasTestTag
+import androidx.ui.test.util.BoundaryNode
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@MediumTest
+@RunWith(JUnit4::class)
+class AncestorsSelectorTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun threeAncestors() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "NodeA") {
+                BoundaryNode(testTag = "NodeB") {
+                    BoundaryNode(testTag = "NodeC") {
+                        BoundaryNode(testTag = "NodeD")
+                    }
+                }
+            }
+        }
+
+        findByTag("NodeD")
+            .ancestors()
+            .assertCountEquals(3)
+            .let {
+                it[0].assert(hasTestTag("NodeC"))
+                it[1].assert(hasTestTag("NodeB"))
+                it[2].assert(hasTestTag("NodeA"))
+            }
+    }
+
+    @Test
+    fun threeAncestors_navigateUp() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "NodeA") {
+                BoundaryNode(testTag = "NodeB") {
+                    BoundaryNode(testTag = "NodeC") {
+                        BoundaryNode(testTag = "NodeD")
+                    }
+                }
+            }
+        }
+
+        findByTag("NodeD")
+            .ancestors()
+            .first()
+            .ancestors()
+            .assertCountEquals(2)
+            .let {
+                it[0].assert(hasTestTag("NodeB"))
+                it[1].assert(hasTestTag("NodeA"))
+            }
+    }
+
+    @Test
+    fun noAncestors() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Node")
+        }
+
+        findByTag("Node")
+            .ancestors()
+            .assertCountEquals(0)
+    }
+}
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/ChildSelectorTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/ChildSelectorTest.kt
new file mode 100644
index 0000000..0ae4de0
--- /dev/null
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/ChildSelectorTest.kt
@@ -0,0 +1,94 @@
+/*
+ * 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.ui.test.selectors
+
+import androidx.test.filters.MediumTest
+import androidx.ui.test.assert
+import androidx.ui.test.child
+import androidx.ui.test.createComposeRule
+import androidx.ui.test.findByTag
+import androidx.ui.test.hasTestTag
+import androidx.ui.test.util.BoundaryNode
+import androidx.ui.test.util.expectErrorMessageStartsWith
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@MediumTest
+@RunWith(JUnit4::class)
+class ChildSelectorTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun oneChild() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child")
+            }
+        }
+
+        findByTag("Parent")
+            .child()
+            .assert(hasTestTag("Child"))
+    }
+
+    @Test
+    fun noChild() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent")
+        }
+
+        findByTag("Parent")
+            .child()
+            .assertDoesNotExist()
+    }
+
+    @Test(expected = AssertionError::class)
+    fun noChild_fail() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent")
+        }
+
+        findByTag("Parent")
+            .child()
+            .assertExists()
+    }
+
+    @Test
+    fun twoChildren_fail() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child1")
+                BoundaryNode(testTag = "Child2")
+            }
+        }
+
+        expectErrorMessageStartsWith("" +
+                "Failed: assertExists.\n" +
+                "Reason: Expected exactly '1' node but found '2' nodes that satisfy: " +
+                "((TestTag = 'Parent').child)\n" +
+                "Nodes found:"
+        ) {
+            findByTag("Parent")
+                .child()
+                .assertExists()
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/ChildrenSelectorTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/ChildrenSelectorTest.kt
new file mode 100644
index 0000000..9a05692
--- /dev/null
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/ChildrenSelectorTest.kt
@@ -0,0 +1,67 @@
+/*
+ * 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.ui.test.selectors
+
+import androidx.test.filters.MediumTest
+import androidx.ui.test.assert
+import androidx.ui.test.assertCountEquals
+import androidx.ui.test.children
+import androidx.ui.test.createComposeRule
+import androidx.ui.test.findByTag
+import androidx.ui.test.hasTestTag
+import androidx.ui.test.util.BoundaryNode
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@MediumTest
+@RunWith(JUnit4::class)
+class ChildrenSelectorTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun twoChildren() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child1")
+                BoundaryNode(testTag = "Child2")
+            }
+        }
+
+        findByTag("Parent")
+            .children()
+            .assertCountEquals(2)
+            .let {
+                it[0].assert(hasTestTag("Child1"))
+                it[1].assert(hasTestTag("Child2"))
+            }
+    }
+
+    @Test
+    fun noChildren() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent")
+        }
+
+        findByTag("Parent")
+            .children()
+            .assertCountEquals(0)
+    }
+}
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/ParentSelectorTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/ParentSelectorTest.kt
new file mode 100644
index 0000000..b4a92e3
--- /dev/null
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/ParentSelectorTest.kt
@@ -0,0 +1,79 @@
+/*
+ * 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.ui.test.selectors
+
+import androidx.test.filters.MediumTest
+import androidx.ui.test.assert
+import androidx.ui.test.createComposeRule
+import androidx.ui.test.findByTag
+import androidx.ui.test.hasTestTag
+import androidx.ui.test.parent
+import androidx.ui.test.util.BoundaryNode
+import androidx.ui.test.util.expectErrorMessage
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@MediumTest
+@RunWith(JUnit4::class)
+class ParentSelectorTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun oneParent() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child")
+            }
+        }
+
+        findByTag("Child")
+            .parent()
+            .assert(hasTestTag("Parent"))
+    }
+
+    @Test()
+    fun noParent() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Node")
+        }
+
+        findByTag("Node")
+            .parent()
+            .assertDoesNotExist()
+    }
+
+    @Test
+    fun noParent_fail() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Node")
+        }
+
+        expectErrorMessage("" +
+                "Failed: assertExists.\n" +
+                "Reason: Expected exactly '1' node but could not find any node that satisfies: " +
+                "((TestTag = 'Node').parent)"
+        ) {
+            findByTag("Node")
+                .parent()
+                .assertExists()
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/SiblingSelectorTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/SiblingSelectorTest.kt
new file mode 100644
index 0000000..d4f4796
--- /dev/null
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/SiblingSelectorTest.kt
@@ -0,0 +1,101 @@
+/*
+ * 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.ui.test.selectors
+
+import androidx.test.filters.MediumTest
+import androidx.ui.test.assert
+import androidx.ui.test.createComposeRule
+import androidx.ui.test.findByTag
+import androidx.ui.test.hasTestTag
+import androidx.ui.test.sibling
+import androidx.ui.test.util.BoundaryNode
+import androidx.ui.test.util.expectErrorMessageStartsWith
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@MediumTest
+@RunWith(JUnit4::class)
+class SiblingSelectorTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun oneSibling() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child1")
+                BoundaryNode(testTag = "Child2")
+            }
+        }
+
+        findByTag("Child1")
+            .sibling()
+            .assert(hasTestTag("Child2"))
+    }
+
+    @Test
+    fun twoSiblings_fail() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child1")
+                BoundaryNode(testTag = "Child2")
+                BoundaryNode(testTag = "Child3")
+            }
+        }
+
+        expectErrorMessageStartsWith("" +
+                "Failed to assert the following: (TestTag = 'Child2')\n" +
+                "Reason: Expected exactly '1' node but found '2' nodes that satisfy: " +
+                "((TestTag = 'Child1').sibling)\n" +
+                "Nodes found:"
+
+        ) {
+            findByTag("Child1")
+                .sibling()
+                .assert(hasTestTag("Child2"))
+        }
+    }
+
+    @Test
+    fun noSibling() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child")
+            }
+        }
+
+        findByTag("Child")
+            .sibling()
+            .assertDoesNotExist()
+    }
+
+    @Test(expected = AssertionError::class)
+    fun noSibling_fail() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child")
+            }
+        }
+
+        findByTag("Child")
+            .sibling()
+            .assertExists()
+    }
+}
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/SiblingsSelectorTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/SiblingsSelectorTest.kt
new file mode 100644
index 0000000..bfd9d3a
--- /dev/null
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/selectors/SiblingsSelectorTest.kt
@@ -0,0 +1,84 @@
+/*
+ * 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.ui.test.selectors
+
+import androidx.test.filters.MediumTest
+import androidx.ui.test.assert
+import androidx.ui.test.assertCountEquals
+import androidx.ui.test.createComposeRule
+import androidx.ui.test.findByTag
+import androidx.ui.test.hasTestTag
+import androidx.ui.test.siblings
+import androidx.ui.test.util.BoundaryNode
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@MediumTest
+@RunWith(JUnit4::class)
+class SiblingsSelectorTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun siblings_noSibling() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child")
+            }
+        }
+
+        findByTag("Child")
+            .siblings()
+            .assertCountEquals(0)
+    }
+
+    @Test
+    fun siblings_oneSibling() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child1")
+                BoundaryNode(testTag = "Child2")
+            }
+        }
+
+        findByTag("Child1")
+            .siblings()
+            .assertCountEquals(1)
+    }
+
+    @Test
+    fun siblings_twoSiblings() {
+        composeTestRule.setContent {
+            BoundaryNode(testTag = "Parent") {
+                BoundaryNode(testTag = "Child1")
+                BoundaryNode(testTag = "Child2")
+                BoundaryNode(testTag = "Child3")
+            }
+        }
+
+        findByTag("Child2")
+            .siblings()
+            .assertCountEquals(2)
+            .let {
+                it[0].assert(hasTestTag("Child1"))
+                it[1].assert(hasTestTag("Child3"))
+            }
+    }
+}
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/util/BoundaryNodes.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/util/BoundaryNodes.kt
new file mode 100644
index 0000000..7214ec4
--- /dev/null
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/util/BoundaryNodes.kt
@@ -0,0 +1,41 @@
+/*
+ * 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.ui.test.util
+
+import androidx.compose.Composable
+import androidx.ui.layout.Column
+import androidx.ui.semantics.Semantics
+import androidx.ui.semantics.testTag
+
+@Composable
+fun BoundaryNode(
+    testTag: String,
+    children: @Composable() () -> Unit
+) {
+    Semantics(container = true, properties = { this.testTag = testTag }) {
+        Column { children() }
+    }
+}
+
+@Composable
+fun BoundaryNode(
+    testTag: String
+) {
+    Semantics(container = true, properties = { this.testTag = testTag }) {
+        Column {}
+    }
+}
\ No newline at end of file
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/util/Output.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/util/Output.kt
index bf6d632..fa5ac87 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/util/Output.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/util/Output.kt
@@ -16,6 +16,8 @@
 
 package androidx.ui.test.util
 
+import com.google.common.truth.Truth
+
 internal fun obfuscateNodesInfo(message: String): String {
     var result = message.trim()
     // Semantics uses a static object to generate ids. This object lives between tests. So the order
@@ -24,4 +26,28 @@
     // We also obfuscate pixel values just to reduce dependency on layout changes.
     result = result.replace("[0-9]+\\.[0-9]+\\.px".toRegex(), "X.px")
     return result
+}
+
+internal fun expectErrorMessage(expectedErrorMessage: String, block: () -> Unit) {
+    try {
+        block()
+    } catch (e: AssertionError) {
+        val received = obfuscateNodesInfo(e.localizedMessage!!)
+        Truth.assertThat(received).isEqualTo(expectedErrorMessage.trim())
+        return
+    }
+
+    throw AssertionError("No AssertionError thrown!")
+}
+
+internal fun expectErrorMessageStartsWith(expectedErrorMessage: String, block: () -> Unit) {
+    try {
+        block()
+    } catch (e: AssertionError) {
+        val received = obfuscateNodesInfo(e.localizedMessage!!)
+        Truth.assertThat(received).startsWith(expectedErrorMessage.trim())
+        return
+    }
+
+    throw AssertionError("No AssertionError thrown!")
 }
\ No newline at end of file
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/BitmapHelpers.kt b/ui/ui-test/src/main/java/androidx/ui/test/BitmapHelpers.kt
index dbeaed5..979e8c1 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/BitmapHelpers.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/BitmapHelpers.kt
@@ -26,12 +26,12 @@
 import android.view.View
 import androidx.annotation.RequiresApi
 import androidx.ui.core.semantics.SemanticsNode
-import androidx.ui.foundation.shape.RectangleShape
 import androidx.ui.geometry.Offset
 import androidx.ui.geometry.Rect
 import androidx.ui.graphics.Canvas
 import androidx.ui.graphics.Color
 import androidx.ui.graphics.Path
+import androidx.ui.graphics.RectangleShape
 import androidx.ui.graphics.Shape
 import androidx.ui.graphics.addOutline
 import androidx.ui.graphics.asAndroidPath
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/Filters.kt b/ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
index 5cf4c3f..066d46a 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
@@ -273,7 +273,7 @@
     }
 }
 
-private val SemanticsNode.ancestors: Iterable<SemanticsNode>
+internal val SemanticsNode.ancestors: Iterable<SemanticsNode>
     get() = object : Iterable<SemanticsNode> {
         override fun iterator(): Iterator<SemanticsNode> {
             return object : Iterator<SemanticsNode> {
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/Selectors.kt b/ui/ui-test/src/main/java/androidx/ui/test/Selectors.kt
new file mode 100644
index 0000000..20b7c43
--- /dev/null
+++ b/ui/ui-test/src/main/java/androidx/ui/test/Selectors.kt
@@ -0,0 +1,124 @@
+/*
+ * 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.ui.test
+
+import androidx.ui.core.semantics.SemanticsNode
+
+internal val SemanticsNode.siblings: List<SemanticsNode>
+    get() {
+        val node = this
+        return parent?.run { this.children.filter { it.id != node.id } } ?: emptyList()
+    }
+
+/**
+ * Returns a parent of this node.
+ *
+ * Any subsequent operation on its result will expect exactly one element found (unless
+ * [SemanticsNodeInteraction.assertDoesNotExist] is used) and will throw [AssertionError] if
+ * none or more than one element is found.
+ */
+fun SemanticsNodeInteraction.parent(): SemanticsNodeInteraction {
+    val node = fetchSemanticsNode("Failed to retrieve a parent.")
+
+    val parentMatcher = selector.appendSelector("parent") { listOfNotNull(node.parent) }
+    return SemanticsNodeInteraction(parentMatcher)
+}
+
+/**
+ * Returns children of this node.
+ */
+fun SemanticsNodeInteraction.children(): List<SemanticsNodeInteraction> {
+    val node = fetchSemanticsNode("Failed to retrieve children.")
+
+    val childrenMatcher = selector.appendSelector("children") { node.children }
+    return childrenMatcher.match(getAllSemanticsNodes()).map {
+        SemanticsNodeInteraction(it, childrenMatcher)
+    }
+}
+
+/**
+ * Returns exactly one child of this node.
+ *
+ * Use this only if this node has exactly one child.
+ *
+ * Any subsequent operation on its result will expect exactly one element found (unless
+ * [SemanticsNodeInteraction.assertDoesNotExist] is used) and will throw [AssertionError] if
+ * none or more than one element is found.
+ */
+fun SemanticsNodeInteraction.child(): SemanticsNodeInteraction {
+    val node = fetchSemanticsNode("Failed to retrieve a child.")
+
+    val childMatcher = selector.appendSelector("child") { node.children }
+    return SemanticsNodeInteraction(childMatcher)
+}
+
+/**
+ * Returns all siblings of this node.
+ *
+ * Example: For the following tree
+ * ```
+ * |-A
+ *   |-B1
+ *   |-B2 <- this node
+ *   |-B3
+ * Returns B1, B3
+ * ```
+ */
+fun SemanticsNodeInteraction.siblings(): List<SemanticsNodeInteraction> {
+    val node = fetchSemanticsNode("Failed to retrieve siblings.")
+
+    val siblingsMatcher = selector.appendSelector("siblings") { node.siblings }
+    return siblingsMatcher.match(getAllSemanticsNodes()).map {
+        SemanticsNodeInteraction(it, siblingsMatcher)
+    }
+}
+
+/**
+ * Returns exactly one sibling of this node.
+ *
+ * Use this only if this node has exactly one sibling.
+ *
+ * Any subsequent operation on its result will expect exactly one element found (unless
+ * [SemanticsNodeInteraction.assertDoesNotExist] is used) and will throw [AssertionError] if
+ * none or more than one element is found.
+ */
+fun SemanticsNodeInteraction.sibling(): SemanticsNodeInteraction {
+    val node = fetchSemanticsNode("Failed to retrieve a sibling.")
+
+    val siblingsMatcher = selector.appendSelector("sibling") { node.siblings }
+    return SemanticsNodeInteraction(siblingsMatcher)
+}
+
+/**
+ * Returns all the ancestors of this node.
+ *
+ * Example: For the following tree
+ * ```
+ * |-A
+ *   |-B
+ *     |-C <- this node
+ * Returns B, A
+ * ```
+ */
+fun SemanticsNodeInteraction.ancestors(): List<SemanticsNodeInteraction> {
+    val node = fetchSemanticsNode("Failed to retrieve ancestors.")
+
+    val ancestorsMatcher = selector.appendSelector("ancestors") { node.ancestors }
+    return ancestorsMatcher.match(getAllSemanticsNodes()).map {
+        SemanticsNodeInteraction(it, ancestorsMatcher)
+    }
+}
\ No newline at end of file
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/SemanticsMatcher.kt b/ui/ui-test/src/main/java/androidx/ui/test/SemanticsMatcher.kt
index 110e2d07..04e3f7f 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/SemanticsMatcher.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/SemanticsMatcher.kt
@@ -122,4 +122,11 @@
             nodes.subtract(selector(nodes))
         }
     }
+}
+
+internal fun SemanticsMatcher.appendSelector(
+    description: String,
+    selector: (Iterable<SemanticsNode>) -> Iterable<SemanticsNode>
+): SemanticsMatcher {
+    return SemanticsMatcher("(${this.description}).$description", selector)
 }
\ No newline at end of file
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/SemanticsNodeInteraction.kt b/ui/ui-test/src/main/java/androidx/ui/test/SemanticsNodeInteraction.kt
index bbb1057..4d1a82b 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/SemanticsNodeInteraction.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/SemanticsNodeInteraction.kt
@@ -27,6 +27,13 @@
     return SemanticsNodeInteraction(listOf(node), selector)
 }
 
+internal fun SemanticsNodeInteraction(
+    selector: SemanticsMatcher
+): SemanticsNodeInteraction {
+    val matchedNodes = selector.match(getAllSemanticsNodes()).toList()
+    return SemanticsNodeInteraction(matchedNodes, selector)
+}
+
 /**
  * Represents a component with which one can interact with the hierarchy.
  * Examples of interactions include [findByTag], [isToggleable], [assertIsOn], [doClick]
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/Synchronization.kt b/ui/ui-test/src/main/java/androidx/ui/test/Synchronization.kt
index 71899c0..84f894f 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/Synchronization.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/Synchronization.kt
@@ -30,7 +30,7 @@
  */
 @SuppressLint("DocumentExceptions")
 fun <T> runOnUiThread(action: () -> T): T {
-    if (Looper.myLooper() == Looper.getMainLooper()) {
+    if (isOnUiThread()) {
         return action()
     }
 
@@ -45,6 +45,13 @@
 }
 
 /**
+ * Returns if the call is made on the main thread.
+ */
+internal fun isOnUiThread(): Boolean {
+    return Looper.myLooper() == Looper.getMainLooper()
+}
+
+/**
  * Executes the given action in the same way as [runOnUiThread] but also makes sure Compose
  * is idle before executing it. This is great place for doing your assertions on shared
  * variables.
@@ -53,7 +60,19 @@
  */
 fun <T> runOnIdleCompose(action: () -> T): T {
     // Method below make sure that compose is idle.
-    SynchronizedTreeCollector.waitForIdle()
+    waitForIdle()
     // Execute the action on ui thread in a blocking way.
     return runOnUiThread(action)
-}
\ No newline at end of file
+}
+
+/**
+ * Waits for compose to be idle.
+ *
+ * This is a blocking call. Returns only after compose is idle.
+ *
+ * Can crash in case Espresso hits time out. This is not supposed to be handled as it
+ * surfaces only in incorrect tests.
+ */
+fun waitForIdle() {
+    SynchronizedTreeCollector.waitForIdle()
+}
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt b/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt
index 0807179..7ace1e4 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt
@@ -23,7 +23,6 @@
 import android.util.DisplayMetrics
 import android.util.SparseArray
 import android.view.ViewGroup
-import android.view.ViewTreeObserver
 import androidx.activity.ComponentActivity
 import androidx.annotation.RequiresApi
 import androidx.compose.Composable
@@ -36,12 +35,12 @@
 import androidx.ui.test.ComposeTestCase
 import androidx.ui.test.ComposeTestCaseSetup
 import androidx.ui.test.ComposeTestRule
+import androidx.ui.test.isOnUiThread
 import androidx.ui.test.runOnUiThread
+import androidx.ui.test.waitForIdle
 import androidx.ui.unit.Density
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 
 /**
  * Factory method to provide implementation of [AndroidComposeTestRule].
@@ -103,47 +102,36 @@
             "Cannot call setContent twice per test!"
         }
 
-        val drawLatch = CountDownLatch(1)
-        val listener = object : ViewTreeObserver.OnGlobalLayoutListener {
-            override fun onGlobalLayout() {
-                drawLatch.countDown()
-                val contentViewGroup =
-                    activityTestRule.activity.findViewById<ViewGroup>(android.R.id.content)
-                contentViewGroup.viewTreeObserver.removeOnGlobalLayoutListener(this)
+        runOnUiThread {
+            val composition = activityTestRule.activity.setContent(
+                recomposer ?: Recomposer.current(),
+                composable
+            )
+            val contentViewGroup =
+                activityTestRule.activity.findViewById<ViewGroup>(android.R.id.content)
+            // AndroidComposeView is postponing the composition till the saved state is restored.
+            // We will emulate the restoration of the empty state to trigger the real composition.
+            contentViewGroup.getChildAt(0).restoreHierarchyState(SparseArray())
+            disposeContentHook = {
+                composition.dispose()
             }
         }
-        val runnable: Runnable = object : Runnable {
-            override fun run() {
-                val composition = activityTestRule.activity.setContent(
-                    recomposer ?: Recomposer.current(),
-                    composable
-                )
-                val contentViewGroup =
-                    activityTestRule.activity.findViewById<ViewGroup>(android.R.id.content)
-                // AndroidComposeView is postponing the composition till the saved state will be restored.
-                // We will emulate the restoration of the empty state to trigger the real composition.
-                contentViewGroup.getChildAt(0).restoreHierarchyState(SparseArray())
-                contentViewGroup.viewTreeObserver.addOnGlobalLayoutListener(listener)
-                disposeContentHook = {
-                    composition.dispose()
-                }
-            }
+
+        if (!isOnUiThread()) {
+            // Only wait for idleness if not on the UI thread. If we are on the UI thread, the
+            // caller clearly wants to keep tight control over execution order, so don't go
+            // executing future tasks on the main thread.
+            waitForIdle()
         }
-        activityTestRule.runOnUiThread(runnable)
-        drawLatch.await(1, TimeUnit.SECONDS)
     }
 
     override fun forGivenContent(composable: @Composable() () -> Unit): ComposeTestCaseSetup {
-        val testCase = object : ComposeTestCase {
+        return forGivenTestCase(object : ComposeTestCase {
             @Composable
             override fun emitContent() {
                 composable()
             }
-        }
-        return AndroidComposeTestCaseSetup(
-            testCase,
-            activityTestRule.activity
-        )
+        })
     }
 
     override fun forGivenTestCase(testCase: ComposeTestCase): ComposeTestCaseSetup {
@@ -155,7 +143,7 @@
 
     @RequiresApi(Build.VERSION_CODES.O)
     override fun captureScreenOnIdle(): Bitmap {
-        SynchronizedTreeCollector.waitForIdle()
+        waitForIdle()
         val contentView = activityTestRule.activity.findViewById<ViewGroup>(android.R.id.content)
 
         val screenRect = Rect.fromLTWH(
diff --git a/ui/ui-text-android/api/0.1.0-dev11.txt b/ui/ui-text-android/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..756ead2
--- /dev/null
+++ b/ui/ui-text-android/api/0.1.0-dev11.txt
@@ -0,0 +1,18 @@
+// Signature format: 3.0
+package androidx.ui.text.platform {
+
+  public final class LayoutIntrinsicsKt {
+  }
+
+  public final class TextLayoutKt {
+  }
+
+}
+
+package androidx.ui.text.platform.style {
+
+  public final class PlaceholderSpanKt {
+  }
+
+}
+
diff --git a/ui/ui-text-android/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-text-android/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..756ead2
--- /dev/null
+++ b/ui/ui-text-android/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,18 @@
+// Signature format: 3.0
+package androidx.ui.text.platform {
+
+  public final class LayoutIntrinsicsKt {
+  }
+
+  public final class TextLayoutKt {
+  }
+
+}
+
+package androidx.ui.text.platform.style {
+
+  public final class PlaceholderSpanKt {
+  }
+
+}
+
diff --git a/ui/ui-text-android/api/res-0.1.0-dev11.txt b/ui/ui-text-android/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-text-android/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-text-android/api/restricted_0.1.0-dev11.txt b/ui/ui-text-android/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..4d862c7
--- /dev/null
+++ b/ui/ui-text-android/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,162 @@
+// Signature format: 3.0
+package androidx.ui.text.platform {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LayoutIntrinsics {
+    ctor public LayoutIntrinsics(CharSequence charSequence, android.text.TextPaint textPaint, int textDirectionHeuristic);
+    method public android.text.BoringLayout.Metrics? getBoringMetrics();
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    property public final android.text.BoringLayout.Metrics? boringMetrics;
+    property public final float maxIntrinsicWidth;
+    property public final float minIntrinsicWidth;
+  }
+
+  public final class LayoutIntrinsicsKt {
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TextLayout {
+    ctor public TextLayout(CharSequence charSequence, float width, android.text.TextPaint textPaint, int alignment, android.text.TextUtils.TruncateAt? ellipsize, int textDirectionHeuristic, float lineSpacingMultiplier, @Px float lineSpacingExtra, boolean includePadding, int maxLines, int breakStrategy, int hyphenationFrequency, int justificationMode, int[]? leftIndents, int[]? rightIndents, androidx.ui.text.platform.LayoutIntrinsics layoutIntrinsics);
+    method public boolean getDidExceedMaxLines();
+    method public int getHeight();
+    method public android.text.Layout getLayout();
+    method public androidx.ui.text.platform.LayoutIntrinsics getLayoutIntrinsics();
+    method public float getLineBaseline(int line);
+    method public float getLineBottom(int line);
+    method public int getLineCount();
+    method public int getLineEllipsisCount(int lineIndex);
+    method public int getLineEllipsisOffset(int lineIndex);
+    method public int getLineEnd(int lineIndex);
+    method public int getLineForOffset(int offset);
+    method public int getLineForVertical(int 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 line);
+    method public float getLineWidth(int lineIndex);
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    method public int getOffsetForHorizontal(int line, float horizontal);
+    method public int getParagraphDirection(int line);
+    method public float getPrimaryHorizontal(int offset);
+    method public float getSecondaryHorizontal(int offset);
+    method public void getSelectionPath(int start, int end, android.graphics.Path dest);
+    method public CharSequence getText();
+    method public boolean isEllipsisApplied(int lineIndex);
+    method public boolean isRtlCharAt(int offset);
+    method public void paint(android.graphics.Canvas canvas);
+    property public final boolean didExceedMaxLines;
+    property public final int height;
+    property public final android.text.Layout layout;
+    property public final int lineCount;
+    property public final float maxIntrinsicWidth;
+    property public final float minIntrinsicWidth;
+    property public final CharSequence text;
+  }
+
+  public final class TextLayoutKt {
+  }
+
+}
+
+package androidx.ui.text.platform.selection {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class WordBoundary {
+    ctor public WordBoundary(java.util.Locale locale, CharSequence text);
+    method public int getWordEnd(int offset);
+    method public int getWordStart(int offset);
+  }
+
+}
+
+package androidx.ui.text.platform.style {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class BaselineShiftSpan extends android.text.style.MetricAffectingSpan {
+    ctor public BaselineShiftSpan(float multiplier);
+    method public final float getMultiplier();
+    method public void updateDrawState(android.text.TextPaint textPaint);
+    method public void updateMeasureState(android.text.TextPaint textPaint);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class FontFeatureSpan extends android.text.style.MetricAffectingSpan {
+    ctor public FontFeatureSpan(String fontFeatureSettings);
+    method public String getFontFeatureSettings();
+    method public void updateDrawState(android.text.TextPaint textPaint);
+    method public void updateMeasureState(android.text.TextPaint textPaint);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LetterSpacingSpanEm extends android.text.style.MetricAffectingSpan {
+    ctor public LetterSpacingSpanEm(float letterSpacing);
+    method public float getLetterSpacing();
+    method public void updateDrawState(android.text.TextPaint textPaint);
+    method public void updateMeasureState(android.text.TextPaint textPaint);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LetterSpacingSpanPx extends android.text.style.MetricAffectingSpan {
+    ctor public LetterSpacingSpanPx(@Px float letterSpacing);
+    method public float getLetterSpacing();
+    method public void updateDrawState(android.text.TextPaint textPaint);
+    method public void updateMeasureState(android.text.TextPaint textPaint);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LineHeightSpan implements android.text.style.LineHeightSpan {
+    ctor public LineHeightSpan(int lineHeight);
+    method public void chooseHeight(CharSequence text, int start, int end, int spanstartVertical, int lineHeight, android.graphics.Paint.FontMetricsInt fontMetricsInt);
+    method public int getLineHeight();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class PlaceholderSpan extends android.text.style.ReplacementSpan {
+    ctor public PlaceholderSpan(float width, int widthUnit, float height, int heightUnit, float pxPerSp, int verticalAlign);
+    method public void draw(android.graphics.Canvas canvas, CharSequence? text, int start, int end, float x, int top, int y, int bottom, android.graphics.Paint paint);
+    method public android.graphics.Paint.FontMetricsInt getFontMetrics();
+    method public int getHeightPx();
+    method public int getSize(android.graphics.Paint paint, CharSequence? text, int start, int end, android.graphics.Paint.FontMetricsInt? fm);
+    method public int getVerticalAlign();
+    method public int getWidthPx();
+    property public final android.graphics.Paint.FontMetricsInt fontMetrics;
+    property public final int heightPx;
+    property public final int widthPx;
+    field public static final int ALIGN_ABOVE_BASELINE = 0; // 0x0
+    field public static final int ALIGN_BOTTOM = 2; // 0x2
+    field public static final int ALIGN_CENTER = 3; // 0x3
+    field public static final int ALIGN_TEXT_BOTTOM = 5; // 0x5
+    field public static final int ALIGN_TEXT_CENTER = 6; // 0x6
+    field public static final int ALIGN_TEXT_TOP = 4; // 0x4
+    field public static final int ALIGN_TOP = 1; // 0x1
+    field public static final androidx.ui.text.platform.style.PlaceholderSpan.Companion! Companion;
+    field public static final int UNIT_EM = 1; // 0x1
+    field public static final int UNIT_INHERIT = 2; // 0x2
+    field public static final int UNIT_SP = 0; // 0x0
+  }
+
+  public static final class PlaceholderSpan.Companion {
+  }
+
+  public final class PlaceholderSpanKt {
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ShadowSpan extends android.text.style.CharacterStyle {
+    ctor public ShadowSpan(int color, float offsetX, float offsetY, float radius);
+    method public int getColor();
+    method public float getOffsetX();
+    method public float getOffsetY();
+    method public float getRadius();
+    method public void updateDrawState(android.text.TextPaint tp);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class SkewXSpan extends android.text.style.MetricAffectingSpan {
+    ctor public SkewXSpan(float skewX);
+    method public final float getSkewX();
+    method public void updateDrawState(android.text.TextPaint textPaint);
+    method public void updateMeasureState(android.text.TextPaint textPaint);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TypefaceSpan extends android.text.style.MetricAffectingSpan {
+    ctor public TypefaceSpan(android.graphics.Typeface typeface);
+    method public android.graphics.Typeface getTypeface();
+    method public void updateDrawState(android.text.TextPaint ds);
+    method public void updateMeasureState(android.text.TextPaint paint);
+  }
+
+}
+
diff --git a/ui/ui-text-android/build.gradle b/ui/ui-text-android/build.gradle
index a0e1e39..5433e1d 100644
--- a/ui/ui-text-android/build.gradle
+++ b/ui/ui-text-android/build.gradle
@@ -36,7 +36,7 @@
     testImplementation(ANDROIDX_TEST_RUNNER)
     testImplementation(JUNIT)
 
-    androidTestImplementation "androidx.core:core:1.0.2"
+    androidTestImplementation "androidx.core:core:1.2.0"
     androidTestImplementation project(":ui:ui-test-font")
     androidTestImplementation(ANDROIDX_TEST_RULES)
     androidTestImplementation(ANDROIDX_TEST_RUNNER)
diff --git a/ui/ui-text-core/api/0.1.0-dev10.txt b/ui/ui-text-core/api/0.1.0-dev10.txt
index 43429b0..3f000f71 100644
--- a/ui/ui-text-core/api/0.1.0-dev10.txt
+++ b/ui/ui-text-core/api/0.1.0-dev10.txt
@@ -733,8 +733,11 @@
   }
 
   public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
     method public int compareTo(androidx.ui.text.font.FontWeight other);
+    method public int component1();
     method public androidx.ui.text.font.FontWeight copy(int weight);
+    method public int getWeight();
     field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
   }
 
diff --git a/ui/ui-text-core/api/0.1.0-dev11.txt b/ui/ui-text-core/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..3f000f71
--- /dev/null
+++ b/ui/ui-text-core/api/0.1.0-dev11.txt
@@ -0,0 +1,934 @@
+// Signature format: 3.0
+package androidx.ui.input {
+
+  public final class BackspaceKeyEditOp implements androidx.ui.input.EditOperation {
+    ctor public BackspaceKeyEditOp();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class CommitTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public CommitTextEditOp(String text, int newCursorPosition);
+    method public String component1();
+    method public int component2();
+    method public androidx.ui.input.CommitTextEditOp copy(String text, int newCursorPosition);
+    method public int getNewCursorPosition();
+    method public String getText();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class DeleteSurroundingTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
+    method public int getAfterLength();
+    method public int getBeforeLength();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.ui.input.EditOperation {
+    ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
+    method public int getAfterLength();
+    method public int getBeforeLength();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public interface EditOperation {
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class EditingBuffer {
+    ctor public EditingBuffer(String initialText, androidx.ui.text.TextRange initialSelection);
+    field public static final int NOWHERE = -1; // 0xffffffff
+  }
+
+  public final class EditorValue {
+    ctor public EditorValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
+    ctor public EditorValue();
+    method public String component1();
+    method public androidx.ui.text.TextRange component2();
+    method public androidx.ui.text.TextRange? component3();
+    method public androidx.ui.input.EditorValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
+    method public androidx.ui.text.TextRange? getComposition();
+    method public String getSelectedText();
+    method public androidx.ui.text.TextRange getSelection();
+    method public String getText();
+    method public String getTextAfterSelection(int maxChars);
+    method public String getTextBeforeSelection(int maxChars);
+  }
+
+  public final class FinishComposingTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public FinishComposingTextEditOp();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public enum ImeAction {
+    enum_constant public static final androidx.ui.input.ImeAction Done;
+    enum_constant public static final androidx.ui.input.ImeAction Go;
+    enum_constant public static final androidx.ui.input.ImeAction Next;
+    enum_constant public static final androidx.ui.input.ImeAction NoAction;
+    enum_constant public static final androidx.ui.input.ImeAction Previous;
+    enum_constant public static final androidx.ui.input.ImeAction Search;
+    enum_constant public static final androidx.ui.input.ImeAction Send;
+    enum_constant public static final androidx.ui.input.ImeAction Unspecified;
+  }
+
+  public interface InputEventListener {
+    method public void onEditOperations(java.util.List<? extends androidx.ui.input.EditOperation> editOps);
+    method public void onImeAction(androidx.ui.input.ImeAction imeAction);
+  }
+
+  public enum KeyboardType {
+    enum_constant public static final androidx.ui.input.KeyboardType Ascii;
+    enum_constant public static final androidx.ui.input.KeyboardType Email;
+    enum_constant public static final androidx.ui.input.KeyboardType Number;
+    enum_constant public static final androidx.ui.input.KeyboardType NumberPassword;
+    enum_constant public static final androidx.ui.input.KeyboardType Password;
+    enum_constant public static final androidx.ui.input.KeyboardType Phone;
+    enum_constant public static final androidx.ui.input.KeyboardType Text;
+    enum_constant public static final androidx.ui.input.KeyboardType Uri;
+  }
+
+  public final class MoveCursorEditOp implements androidx.ui.input.EditOperation {
+    ctor public MoveCursorEditOp(int amount);
+    method public int component1();
+    method public androidx.ui.input.MoveCursorEditOp copy(int amount);
+    method public int getAmount();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public interface OffsetMap {
+    method public int originalToTransformed(int offset);
+    method public int transformedToOriginal(int offset);
+    field public static final androidx.ui.input.OffsetMap.Companion! Companion;
+  }
+
+  public static final class OffsetMap.Companion {
+    method public androidx.ui.input.OffsetMap getIdentityOffsetMap();
+    property public final androidx.ui.input.OffsetMap identityOffsetMap;
+  }
+
+  public final class PasswordVisualTransformation implements androidx.ui.input.VisualTransformation {
+    ctor public PasswordVisualTransformation(char mask);
+    ctor public PasswordVisualTransformation();
+    method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
+    method public char getMask();
+  }
+
+  public interface PlatformTextInputService {
+    method public void hideSoftwareKeyboard();
+    method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
+    method public void onStateUpdated(androidx.ui.input.EditorValue model);
+    method public void showSoftwareKeyboard();
+    method public void startInput(androidx.ui.input.EditorValue initModel, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput();
+  }
+
+  public final class SetComposingRegionEditOp implements androidx.ui.input.EditOperation {
+    ctor public SetComposingRegionEditOp(int start, int end);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.SetComposingRegionEditOp copy(int start, int end);
+    method public int getEnd();
+    method public int getStart();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class SetComposingTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public SetComposingTextEditOp(String text, int newCursorPosition);
+    method public String component1();
+    method public int component2();
+    method public androidx.ui.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
+    method public int getNewCursorPosition();
+    method public String getText();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class SetSelectionEditOp implements androidx.ui.input.EditOperation {
+    ctor public SetSelectionEditOp(int start, int end);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.SetSelectionEditOp copy(int start, int end);
+    method public int getEnd();
+    method public int getStart();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public class TextInputService {
+    ctor public TextInputService(androidx.ui.input.PlatformTextInputService platformTextInputService);
+    method public void hideSoftwareKeyboard(int token);
+    method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
+    method public void onStateUpdated(int token, androidx.ui.input.EditorValue model);
+    method public void showSoftwareKeyboard(int token);
+    method public int startInput(androidx.ui.input.EditorValue initModel, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput(int token);
+  }
+
+  public final class TextInputServiceKt {
+    field public static final int INVALID_SESSION = -1; // 0xffffffff
+    field public static final int NO_SESSION = 0; // 0x0
+  }
+
+  public final class TransformedText {
+    ctor public TransformedText(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
+    method public androidx.ui.text.AnnotatedString component1();
+    method public androidx.ui.input.OffsetMap component2();
+    method public androidx.ui.input.TransformedText copy(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
+    method public androidx.ui.input.OffsetMap getOffsetMap();
+    method public androidx.ui.text.AnnotatedString getTransformedText();
+  }
+
+  public interface VisualTransformation {
+    method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
+  }
+
+}
+
+package androidx.ui.text {
+
+  public final class AnnotatedString {
+    ctor public AnnotatedString(String text, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> paragraphStyles);
+    method public String component1();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> component2();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> component3();
+    method public androidx.ui.text.AnnotatedString copy(String text, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.ui.text.AnnotatedString.Item<java.lang.String>> annotations);
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> getParagraphStyles();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> getSpanStyles();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+    method public String getText();
+    method public operator androidx.ui.text.AnnotatedString plus(androidx.ui.text.AnnotatedString other);
+  }
+
+  public static final class AnnotatedString.Builder {
+    ctor public AnnotatedString.Builder(int capacity);
+    ctor public AnnotatedString.Builder();
+    ctor public AnnotatedString.Builder(String text);
+    ctor public AnnotatedString.Builder(androidx.ui.text.AnnotatedString text);
+    method public void addAnnotationString(String scope, String annotation, int start, int end);
+    method public void addStyle(androidx.ui.text.SpanStyle style, int start, int end);
+    method public void addStyle(androidx.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.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.ui.text.SpanStyle style);
+    method public int pushStyle(androidx.ui.text.ParagraphStyle style);
+    method public androidx.ui.text.AnnotatedString toAnnotatedString();
+    property public final int length;
+  }
+
+  public static final class AnnotatedString.Item<T> {
+    ctor public AnnotatedString.Item(T! item, int start, int end, String tag);
+    ctor public AnnotatedString.Item(T! item, int start, int end);
+    method public T! component1();
+    method public int component2();
+    method public int component3();
+    method public String component4();
+    method public androidx.ui.text.AnnotatedString.Item<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();
+  }
+
+  public final class AnnotatedStringKt {
+    method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.SpanStyle spanStyle, androidx.ui.text.ParagraphStyle? paragraphStyle = null);
+    method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.ParagraphStyle paragraphStyle);
+    method public static inline androidx.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+    method public static androidx.ui.text.AnnotatedString capitalize(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static androidx.ui.text.AnnotatedString decapitalize(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static int getLength(androidx.ui.text.AnnotatedString);
+    method public static androidx.ui.text.AnnotatedString subSequence(androidx.ui.text.AnnotatedString, int start, int end);
+    method public static androidx.ui.text.AnnotatedString toLowerCase(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static androidx.ui.text.AnnotatedString toUpperCase(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+    method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+  }
+
+  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.ui.text.Locale.Companion! Companion;
+  }
+
+  public static final class Locale.Companion {
+    method public androidx.ui.text.Locale getCurrent();
+    property public final androidx.ui.text.Locale current;
+  }
+
+  public final class LocaleList implements java.util.Collection<androidx.ui.text.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+    ctor public LocaleList(java.util.List<androidx.ui.text.Locale> localeList);
+    ctor public LocaleList(String languageTags);
+    ctor public LocaleList(androidx.ui.text.Locale... locales);
+    method public java.util.List<androidx.ui.text.Locale> component1();
+    method public operator boolean contains(androidx.ui.text.Locale element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public androidx.ui.text.LocaleList copy(java.util.List<androidx.ui.text.Locale> localeList);
+    method public operator androidx.ui.text.Locale get(int i);
+    method public java.util.List<androidx.ui.text.Locale> getLocaleList();
+    method public int getSize();
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.ui.text.Locale> iterator();
+    property public int size;
+    field public static final androidx.ui.text.LocaleList.Companion! Companion;
+  }
+
+  public static final class LocaleList.Companion {
+    method public androidx.ui.text.LocaleList getCurrent();
+    property public final androidx.ui.text.LocaleList current;
+  }
+
+  public final class MultiParagraph {
+    ctor public MultiParagraph(androidx.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints);
+    ctor public MultiParagraph(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.ui.text.style.TextDirection getBidiRunDirection(int offset);
+    method public androidx.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.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.ui.text.MultiParagraphIntrinsics getIntrinsics();
+    method public float getLastBaseline();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEllipsisCount(int lineIndex);
+    method public int getLineEllipsisOffset(int lineIndex);
+    method public int getLineEnd(int lineIndex);
+    method public int getLineForOffset(int offset);
+    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(androidx.ui.unit.PxPosition position);
+    method public androidx.ui.text.style.TextDirection getParagraphDirection(int offset);
+    method public androidx.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public androidx.ui.text.TextRange getWordBoundary(int offset);
+    method public void paint(androidx.ui.graphics.Canvas canvas);
+    property public final boolean didExceedMaxLines;
+    property public final float firstBaseline;
+    property public final float height;
+    property public final float lastBaseline;
+    property public final int lineCount;
+    property public final float maxIntrinsicWidth;
+    property public final float minIntrinsicWidth;
+    property public final java.util.List<androidx.ui.geometry.Rect> placeholderRects;
+    property public final float width;
+  }
+
+  public final class MultiParagraphIntrinsics implements androidx.ui.text.ParagraphIntrinsics {
+    ctor public MultiParagraphIntrinsics(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.ui.text.AnnotatedString getAnnotatedString();
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> getPlaceholders();
+    property public float maxIntrinsicWidth;
+    property public float minIntrinsicWidth;
+  }
+
+  public final class MultiParagraphIntrinsicsKt {
+  }
+
+  public final class MultiParagraphKt {
+  }
+
+  public interface Paragraph {
+    method public androidx.ui.text.style.TextDirection getBidiRunDirection(int offset);
+    method public androidx.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.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 getLineEllipsisCount(int lineIndex);
+    method public int getLineEllipsisOffset(int lineIndex);
+    method public int getLineEnd(int lineIndex);
+    method public int getLineForOffset(int offset);
+    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(androidx.ui.unit.PxPosition position);
+    method public androidx.ui.text.style.TextDirection getParagraphDirection(int offset);
+    method public androidx.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public androidx.ui.text.TextRange getWordBoundary(int offset);
+    method public void paint(androidx.ui.graphics.Canvas canvas);
+    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.ui.geometry.Rect> placeholderRects;
+    property public abstract float width;
+  }
+
+  public final class ParagraphConstraints {
+    ctor public ParagraphConstraints(float width);
+    method public float component1();
+    method public androidx.ui.text.ParagraphConstraints copy(float width);
+    method public float getWidth();
+  }
+
+  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.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+  }
+
+  public final class ParagraphKt {
+    method public static androidx.ui.text.Paragraph Paragraph(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public static androidx.ui.text.Paragraph Paragraph(androidx.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints);
+  }
+
+  public final class ParagraphStyle {
+    method public androidx.ui.text.style.TextAlign? component1();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? component2();
+    method public long component3();
+    method public androidx.ui.text.style.TextIndent? component4();
+    method public androidx.ui.text.ParagraphStyle copy-ffQossE(androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirectionAlgorithm? textDirectionAlgorithm, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+    method public long getLineHeight();
+    method public androidx.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? getTextDirectionAlgorithm();
+    method public androidx.ui.text.style.TextIndent? getTextIndent();
+    method public androidx.ui.text.ParagraphStyle merge(androidx.ui.text.ParagraphStyle? other = null);
+  }
+
+  public final class ParagraphStyleKt {
+    method public static androidx.ui.text.ParagraphStyle lerp(androidx.ui.text.ParagraphStyle start, androidx.ui.text.ParagraphStyle stop, float fraction);
+  }
+
+  public final class Placeholder {
+    method public long component1();
+    method public long component2();
+    method public androidx.ui.text.PlaceholderVerticalAlign component3();
+    method public androidx.ui.text.Placeholder copy-eLqjHCw(long width, long height, androidx.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+    method public long getHeight();
+    method public androidx.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+    method public long getWidth();
+  }
+
+  public enum PlaceholderVerticalAlign {
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextBottom;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextCenter;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextTop;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Top;
+  }
+
+  public final class SpanStyle {
+    method public long component1();
+    method public androidx.ui.text.style.TextGeometricTransform? component10();
+    method public androidx.ui.text.LocaleList? component11();
+    method public long component12();
+    method public androidx.ui.text.style.TextDecoration? component13();
+    method public androidx.ui.graphics.Shadow? component14();
+    method public long component2();
+    method public androidx.ui.text.font.FontWeight? component3();
+    method public androidx.ui.text.font.FontStyle? component4();
+    method public androidx.ui.text.font.FontSynthesis? component5();
+    method public androidx.ui.text.font.FontFamily? component6();
+    method public String? component7();
+    method public long component8();
+    method public androidx.ui.text.style.BaselineShift? component9();
+    method public androidx.ui.text.SpanStyle copy-kRoccyE(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
+    method public long getBackground();
+    method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+    method public long getColor();
+    method public androidx.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize();
+    method public androidx.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing();
+    method public androidx.ui.text.LocaleList? getLocaleList();
+    method public androidx.ui.graphics.Shadow? getShadow();
+    method public androidx.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method public androidx.ui.text.SpanStyle merge(androidx.ui.text.SpanStyle? other = null);
+  }
+
+  public final class SpanStyleKt {
+    method public static androidx.ui.text.SpanStyle lerp(androidx.ui.text.SpanStyle start, androidx.ui.text.SpanStyle stop, float fraction);
+  }
+
+  public final class StringKt {
+    method public static String capitalize(String, androidx.ui.text.Locale locale);
+    method public static String capitalize(String, androidx.ui.text.LocaleList localeList);
+    method public static String decapitalize(String, androidx.ui.text.Locale locale);
+    method public static String decapitalize(String, androidx.ui.text.LocaleList localeList);
+    method public static String toLowerCase(String, androidx.ui.text.Locale locale);
+    method public static String toLowerCase(String, androidx.ui.text.LocaleList localeList);
+    method public static String toUpperCase(String, androidx.ui.text.Locale locale);
+    method public static String toUpperCase(String, androidx.ui.text.LocaleList localeList);
+  }
+
+  public final class TextLayoutHelperKt {
+  }
+
+  public final class TextLayoutInput {
+    ctor public TextLayoutInput(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.text.AnnotatedString component1();
+    method public androidx.ui.core.Constraints component10();
+    method public androidx.ui.text.TextStyle component2();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> component3();
+    method public int component4();
+    method public boolean component5();
+    method public androidx.ui.text.style.TextOverflow component6();
+    method public androidx.ui.unit.Density component7();
+    method public androidx.ui.core.LayoutDirection component8();
+    method public androidx.ui.text.font.Font.ResourceLoader component9();
+    method public androidx.ui.text.TextLayoutInput copy(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.Constraints getConstraints();
+    method public androidx.ui.unit.Density getDensity();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public int getMaxLines();
+    method public androidx.ui.text.style.TextOverflow getOverflow();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> getPlaceholders();
+    method public androidx.ui.text.font.Font.ResourceLoader getResourceLoader();
+    method public boolean getSoftWrap();
+    method public androidx.ui.text.TextStyle getStyle();
+    method public androidx.ui.text.AnnotatedString getText();
+  }
+
+  public final class TextLayoutResult {
+    method public androidx.ui.text.TextLayoutInput component1();
+    method public androidx.ui.unit.IntPxSize component3();
+    method public androidx.ui.text.TextLayoutResult copy(androidx.ui.text.TextLayoutInput layoutInput, androidx.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntPxSize size);
+    method public androidx.ui.text.style.TextDirection getBidiRunDirection(int offset);
+    method public androidx.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.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.ui.text.TextLayoutInput getLayoutInput();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineEnd(int lineIndex);
+    method public int getLineForOffset(int offset);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public int getOffsetForPosition(androidx.ui.unit.PxPosition position);
+    method public androidx.ui.text.style.TextDirection getParagraphDirection(int offset);
+    method public androidx.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
+    method public androidx.ui.unit.IntPxSize getSize();
+    method public androidx.ui.text.TextRange getWordBoundary(int offset);
+    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 java.util.List<androidx.ui.geometry.Rect> placeholderRects;
+  }
+
+  public final class TextPainter {
+    method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
+    field public static final androidx.ui.text.TextPainter! INSTANCE;
+  }
+
+  public final class TextRange {
+    ctor public TextRange(int start, int end);
+    method public int component1();
+    method public int component2();
+    method public operator boolean contains(androidx.ui.text.TextRange other);
+    method public operator boolean contains(int offset);
+    method public androidx.ui.text.TextRange copy(int start, int end);
+    method public boolean getCollapsed();
+    method public int getEnd();
+    method public int getLength();
+    method public int getMax();
+    method public int getMin();
+    method public int getStart();
+    method public boolean intersects(androidx.ui.text.TextRange other);
+    property public final boolean collapsed;
+    property public final int length;
+    property public final int max;
+    property public final int min;
+  }
+
+  public final class TextRangeKt {
+    method public static String substring(CharSequence, androidx.ui.text.TextRange range);
+  }
+
+  public final class TextStyle {
+    method public long component1();
+    method public androidx.ui.text.style.TextGeometricTransform? component10();
+    method public androidx.ui.text.LocaleList? component11();
+    method public long component12();
+    method public androidx.ui.text.style.TextDecoration? component13();
+    method public androidx.ui.graphics.Shadow? component14();
+    method public androidx.ui.text.style.TextAlign? component15();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? component16();
+    method public long component17();
+    method public androidx.ui.text.style.TextIndent? component18();
+    method public long component2();
+    method public androidx.ui.text.font.FontWeight? component3();
+    method public androidx.ui.text.font.FontStyle? component4();
+    method public androidx.ui.text.font.FontSynthesis? component5();
+    method public androidx.ui.text.font.FontFamily? component6();
+    method public String? component7();
+    method public long component8();
+    method public androidx.ui.text.style.BaselineShift? component9();
+    method public androidx.ui.text.TextStyle copy-4Bo2vQE(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirectionAlgorithm? textDirectionAlgorithm, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+    method public long getBackground();
+    method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+    method public long getColor();
+    method public androidx.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize();
+    method public androidx.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing();
+    method public long getLineHeight();
+    method public androidx.ui.text.LocaleList? getLocaleList();
+    method public androidx.ui.graphics.Shadow? getShadow();
+    method public androidx.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? getTextDirectionAlgorithm();
+    method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method public androidx.ui.text.style.TextIndent? getTextIndent();
+    method public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
+    method public androidx.ui.text.TextStyle merge(androidx.ui.text.SpanStyle other);
+    method public androidx.ui.text.TextStyle merge(androidx.ui.text.ParagraphStyle other);
+    method public androidx.ui.text.ParagraphStyle toParagraphStyle();
+    method public androidx.ui.text.SpanStyle toSpanStyle();
+    field public static final androidx.ui.text.TextStyle.Companion! Companion;
+  }
+
+  public static final class TextStyle.Companion {
+    method public androidx.ui.text.TextStyle getDefault();
+    property public final androidx.ui.text.TextStyle Default;
+  }
+
+  public final class TextStyleKt {
+    method public static androidx.ui.text.TextStyle lerp(androidx.ui.text.TextStyle start, androidx.ui.text.TextStyle stop, float fraction);
+    method public static androidx.ui.text.TextStyle resolveDefaults(androidx.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
+  }
+
+  public interface Typeface {
+    method public androidx.ui.text.font.FontFamily getFontFamily();
+    property public abstract androidx.ui.text.font.FontFamily fontFamily;
+  }
+
+  public final class TypefaceKt {
+    method public static androidx.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.ui.text.font.FontWeight,? extends androidx.ui.text.font.FontStyle>>? necessaryStyles = null);
+  }
+
+}
+
+package androidx.ui.text.font {
+
+  public abstract sealed class FileBasedFontFamily extends androidx.ui.text.font.FontFamily {
+  }
+
+  public interface Font {
+    method public androidx.ui.text.font.FontStyle getStyle();
+    method public androidx.ui.text.font.FontWeight getWeight();
+    property public abstract androidx.ui.text.font.FontStyle style;
+    property public abstract androidx.ui.text.font.FontWeight weight;
+  }
+
+  public static interface Font.ResourceLoader {
+    method public Object load(androidx.ui.text.font.Font font);
+  }
+
+  public abstract sealed class FontFamily {
+    method public final boolean getCanLoadSynchronously();
+    field public static final androidx.ui.text.font.FontFamily.Companion! Companion;
+  }
+
+  public static final class FontFamily.Companion {
+    method public androidx.ui.text.font.GenericFontFamily getCursive();
+    method public androidx.ui.text.font.SystemFontFamily getDefault();
+    method public androidx.ui.text.font.GenericFontFamily getMonospace();
+    method public androidx.ui.text.font.GenericFontFamily getSansSerif();
+    method public androidx.ui.text.font.GenericFontFamily getSerif();
+    property public final androidx.ui.text.font.GenericFontFamily Cursive;
+    property public final androidx.ui.text.font.SystemFontFamily Default;
+    property public final androidx.ui.text.font.GenericFontFamily Monospace;
+    property public final androidx.ui.text.font.GenericFontFamily SansSerif;
+    property public final androidx.ui.text.font.GenericFontFamily Serif;
+  }
+
+  public final class FontFamilyKt {
+    method public static androidx.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
+    method public static androidx.ui.text.font.FontListFontFamily fontFamily(androidx.ui.text.font.Font... fonts);
+    method public static androidx.ui.text.font.LoadedFontFamily fontFamily(androidx.ui.text.Typeface typeface);
+  }
+
+  public final class FontKt {
+    method public static androidx.ui.text.font.FontListFontFamily asFontFamily(androidx.ui.text.font.Font);
+    method public static androidx.ui.text.font.Font font(int resId, androidx.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.ui.text.font.FontStyle style = androidx.ui.text.font.FontStyle.Normal);
+  }
+
+  public final class FontListFontFamily extends androidx.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.ui.text.font.Font> {
+    ctor public FontListFontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
+    method public java.util.List<androidx.ui.text.font.Font> component1();
+    method public boolean contains(androidx.ui.text.font.Font element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public androidx.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.ui.text.font.Font> fonts);
+    method public androidx.ui.text.font.Font get(int index);
+    method public java.util.List<androidx.ui.text.font.Font> getFonts();
+    method public int getSize();
+    method public int indexOf(androidx.ui.text.font.Font element);
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.ui.text.font.Font> iterator();
+    method public int lastIndexOf(androidx.ui.text.font.Font element);
+    method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator();
+    method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator(int index);
+    method public java.util.List<androidx.ui.text.font.Font> subList(int fromIndex, int toIndex);
+  }
+
+  public enum FontStyle {
+    enum_constant public static final androidx.ui.text.font.FontStyle Italic;
+    enum_constant public static final androidx.ui.text.font.FontStyle Normal;
+  }
+
+  public enum FontSynthesis {
+    enum_constant public static final androidx.ui.text.font.FontSynthesis All;
+    enum_constant public static final androidx.ui.text.font.FontSynthesis None;
+    enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
+    enum_constant public static final androidx.ui.text.font.FontSynthesis Weight;
+  }
+
+  public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
+    method public int compareTo(androidx.ui.text.font.FontWeight other);
+    method public int component1();
+    method public androidx.ui.text.font.FontWeight copy(int weight);
+    method public int getWeight();
+    field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
+  }
+
+  public static final class FontWeight.Companion {
+    method public androidx.ui.text.font.FontWeight getBlack();
+    method public androidx.ui.text.font.FontWeight getBold();
+    method public androidx.ui.text.font.FontWeight getExtraBold();
+    method public androidx.ui.text.font.FontWeight getExtraLight();
+    method public androidx.ui.text.font.FontWeight getLight();
+    method public androidx.ui.text.font.FontWeight getMedium();
+    method public androidx.ui.text.font.FontWeight getNormal();
+    method public androidx.ui.text.font.FontWeight getSemiBold();
+    method public androidx.ui.text.font.FontWeight getThin();
+    method public androidx.ui.text.font.FontWeight getW100();
+    method public androidx.ui.text.font.FontWeight getW200();
+    method public androidx.ui.text.font.FontWeight getW300();
+    method public androidx.ui.text.font.FontWeight getW400();
+    method public androidx.ui.text.font.FontWeight getW500();
+    method public androidx.ui.text.font.FontWeight getW600();
+    method public androidx.ui.text.font.FontWeight getW700();
+    method public androidx.ui.text.font.FontWeight getW800();
+    method public androidx.ui.text.font.FontWeight getW900();
+    property public final androidx.ui.text.font.FontWeight Black;
+    property public final androidx.ui.text.font.FontWeight Bold;
+    property public final androidx.ui.text.font.FontWeight ExtraBold;
+    property public final androidx.ui.text.font.FontWeight ExtraLight;
+    property public final androidx.ui.text.font.FontWeight Light;
+    property public final androidx.ui.text.font.FontWeight Medium;
+    property public final androidx.ui.text.font.FontWeight Normal;
+    property public final androidx.ui.text.font.FontWeight SemiBold;
+    property public final androidx.ui.text.font.FontWeight Thin;
+    property public final androidx.ui.text.font.FontWeight W100;
+    property public final androidx.ui.text.font.FontWeight W200;
+    property public final androidx.ui.text.font.FontWeight W300;
+    property public final androidx.ui.text.font.FontWeight W400;
+    property public final androidx.ui.text.font.FontWeight W500;
+    property public final androidx.ui.text.font.FontWeight W600;
+    property public final androidx.ui.text.font.FontWeight W700;
+    property public final androidx.ui.text.font.FontWeight W800;
+    property public final androidx.ui.text.font.FontWeight W900;
+  }
+
+  public final class FontWeightKt {
+    method public static androidx.ui.text.font.FontWeight lerp(androidx.ui.text.font.FontWeight start, androidx.ui.text.font.FontWeight stop, float fraction);
+  }
+
+  public final class GenericFontFamily extends androidx.ui.text.font.SystemFontFamily {
+    method public String getName();
+  }
+
+  public final class LoadedFontFamily extends androidx.ui.text.font.FontFamily {
+    ctor public LoadedFontFamily(androidx.ui.text.Typeface typeface);
+    method public androidx.ui.text.Typeface component1();
+    method public androidx.ui.text.font.LoadedFontFamily copy(androidx.ui.text.Typeface typeface);
+    method public androidx.ui.text.Typeface getTypeface();
+  }
+
+  public final class ResourceFont implements androidx.ui.text.font.Font {
+    ctor public ResourceFont(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+    method public int component1();
+    method public androidx.ui.text.font.FontWeight component2();
+    method public androidx.ui.text.font.FontStyle component3();
+    method public androidx.ui.text.font.ResourceFont copy(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+    method public int getResId();
+    method public androidx.ui.text.font.FontStyle getStyle();
+    method public androidx.ui.text.font.FontWeight getWeight();
+  }
+
+  public abstract sealed class SystemFontFamily extends androidx.ui.text.font.FontFamily {
+  }
+
+}
+
+package androidx.ui.text.platform {
+
+  public final class AndroidParagraphHelperKt {
+  }
+
+  public final class AndroidParagraphKt {
+  }
+
+  public final class PlatformLocaleKt {
+  }
+
+}
+
+package androidx.ui.text.style {
+
+  public final inline class BaselineShift {
+    ctor public BaselineShift();
+    method public static float constructor-impl(float multiplier);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getMultiplier();
+    method public static int hashCode-impl(float p);
+    method public static String toString-impl(float p);
+    field public static final androidx.ui.text.style.BaselineShift.Companion! Companion;
+  }
+
+  public static final class BaselineShift.Companion {
+    method public float getNone();
+    method public float getSubscript();
+    method public float getSuperscript();
+    property public final float None;
+    property public final float Subscript;
+    property public final float Superscript;
+  }
+
+  public final class BaselineShiftKt {
+    method public static float lerp-7csQwvo(float start, float stop, float fraction);
+  }
+
+  public enum TextAlign {
+    enum_constant public static final androidx.ui.text.style.TextAlign Center;
+    enum_constant public static final androidx.ui.text.style.TextAlign End;
+    enum_constant public static final androidx.ui.text.style.TextAlign Justify;
+    enum_constant public static final androidx.ui.text.style.TextAlign Left;
+    enum_constant public static final androidx.ui.text.style.TextAlign Right;
+    enum_constant public static final androidx.ui.text.style.TextAlign Start;
+  }
+
+  public final class TextDecoration {
+    method public int component1();
+    method public boolean contains(androidx.ui.text.style.TextDecoration other);
+    method public androidx.ui.text.style.TextDecoration copy(int mask);
+    method public int getMask();
+    field public static final androidx.ui.text.style.TextDecoration.Companion! Companion;
+  }
+
+  public static final class TextDecoration.Companion {
+    method public androidx.ui.text.style.TextDecoration combine(java.util.List<androidx.ui.text.style.TextDecoration> decorations);
+    method public androidx.ui.text.style.TextDecoration getLineThrough();
+    method public androidx.ui.text.style.TextDecoration getNone();
+    method public androidx.ui.text.style.TextDecoration getUnderline();
+    property public final androidx.ui.text.style.TextDecoration LineThrough;
+    property public final androidx.ui.text.style.TextDecoration None;
+    property public final androidx.ui.text.style.TextDecoration Underline;
+  }
+
+  public enum TextDirection {
+    enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
+    enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
+  }
+
+  public enum TextDirectionAlgorithm {
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrLtr;
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrRtl;
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceLtr;
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceRtl;
+  }
+
+  public final class TextGeometricTransform {
+    ctor public TextGeometricTransform(float scaleX, float skewX);
+    ctor public TextGeometricTransform();
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
+    method public float getScaleX();
+    method public float getSkewX();
+    field public static final androidx.ui.text.style.TextGeometricTransform.Companion! Companion;
+  }
+
+  public static final class TextGeometricTransform.Companion {
+  }
+
+  public final class TextGeometricTransformKt {
+    method public static androidx.ui.text.style.TextGeometricTransform lerp(androidx.ui.text.style.TextGeometricTransform start, androidx.ui.text.style.TextGeometricTransform stop, float fraction);
+  }
+
+  public final class TextIndent {
+    method public long component1();
+    method public long component2();
+    method public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
+    method public long getFirstLine();
+    method public long getRestLine();
+    field public static final androidx.ui.text.style.TextIndent.Companion! Companion;
+  }
+
+  public static final class TextIndent.Companion {
+    method public androidx.ui.text.style.TextIndent getNone();
+    property public final androidx.ui.text.style.TextIndent None;
+  }
+
+  public final class TextIndentKt {
+    method public static androidx.ui.text.style.TextIndent lerp(androidx.ui.text.style.TextIndent start, androidx.ui.text.style.TextIndent stop, float fraction);
+  }
+
+  public enum TextOverflow {
+    enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
+    enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
+  }
+
+}
+
diff --git a/ui/ui-text-core/api/current.txt b/ui/ui-text-core/api/current.txt
index 43429b0..3f000f71 100644
--- a/ui/ui-text-core/api/current.txt
+++ b/ui/ui-text-core/api/current.txt
@@ -733,8 +733,11 @@
   }
 
   public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
     method public int compareTo(androidx.ui.text.font.FontWeight other);
+    method public int component1();
     method public androidx.ui.text.font.FontWeight copy(int weight);
+    method public int getWeight();
     field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
   }
 
diff --git a/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev10.txt
index 43429b0..3f000f71 100644
--- a/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev10.txt
@@ -733,8 +733,11 @@
   }
 
   public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
     method public int compareTo(androidx.ui.text.font.FontWeight other);
+    method public int component1();
     method public androidx.ui.text.font.FontWeight copy(int weight);
+    method public int getWeight();
     field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
   }
 
diff --git a/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..3f000f71
--- /dev/null
+++ b/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,934 @@
+// Signature format: 3.0
+package androidx.ui.input {
+
+  public final class BackspaceKeyEditOp implements androidx.ui.input.EditOperation {
+    ctor public BackspaceKeyEditOp();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class CommitTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public CommitTextEditOp(String text, int newCursorPosition);
+    method public String component1();
+    method public int component2();
+    method public androidx.ui.input.CommitTextEditOp copy(String text, int newCursorPosition);
+    method public int getNewCursorPosition();
+    method public String getText();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class DeleteSurroundingTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
+    method public int getAfterLength();
+    method public int getBeforeLength();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.ui.input.EditOperation {
+    ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
+    method public int getAfterLength();
+    method public int getBeforeLength();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public interface EditOperation {
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class EditingBuffer {
+    ctor public EditingBuffer(String initialText, androidx.ui.text.TextRange initialSelection);
+    field public static final int NOWHERE = -1; // 0xffffffff
+  }
+
+  public final class EditorValue {
+    ctor public EditorValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
+    ctor public EditorValue();
+    method public String component1();
+    method public androidx.ui.text.TextRange component2();
+    method public androidx.ui.text.TextRange? component3();
+    method public androidx.ui.input.EditorValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
+    method public androidx.ui.text.TextRange? getComposition();
+    method public String getSelectedText();
+    method public androidx.ui.text.TextRange getSelection();
+    method public String getText();
+    method public String getTextAfterSelection(int maxChars);
+    method public String getTextBeforeSelection(int maxChars);
+  }
+
+  public final class FinishComposingTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public FinishComposingTextEditOp();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public enum ImeAction {
+    enum_constant public static final androidx.ui.input.ImeAction Done;
+    enum_constant public static final androidx.ui.input.ImeAction Go;
+    enum_constant public static final androidx.ui.input.ImeAction Next;
+    enum_constant public static final androidx.ui.input.ImeAction NoAction;
+    enum_constant public static final androidx.ui.input.ImeAction Previous;
+    enum_constant public static final androidx.ui.input.ImeAction Search;
+    enum_constant public static final androidx.ui.input.ImeAction Send;
+    enum_constant public static final androidx.ui.input.ImeAction Unspecified;
+  }
+
+  public interface InputEventListener {
+    method public void onEditOperations(java.util.List<? extends androidx.ui.input.EditOperation> editOps);
+    method public void onImeAction(androidx.ui.input.ImeAction imeAction);
+  }
+
+  public enum KeyboardType {
+    enum_constant public static final androidx.ui.input.KeyboardType Ascii;
+    enum_constant public static final androidx.ui.input.KeyboardType Email;
+    enum_constant public static final androidx.ui.input.KeyboardType Number;
+    enum_constant public static final androidx.ui.input.KeyboardType NumberPassword;
+    enum_constant public static final androidx.ui.input.KeyboardType Password;
+    enum_constant public static final androidx.ui.input.KeyboardType Phone;
+    enum_constant public static final androidx.ui.input.KeyboardType Text;
+    enum_constant public static final androidx.ui.input.KeyboardType Uri;
+  }
+
+  public final class MoveCursorEditOp implements androidx.ui.input.EditOperation {
+    ctor public MoveCursorEditOp(int amount);
+    method public int component1();
+    method public androidx.ui.input.MoveCursorEditOp copy(int amount);
+    method public int getAmount();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public interface OffsetMap {
+    method public int originalToTransformed(int offset);
+    method public int transformedToOriginal(int offset);
+    field public static final androidx.ui.input.OffsetMap.Companion! Companion;
+  }
+
+  public static final class OffsetMap.Companion {
+    method public androidx.ui.input.OffsetMap getIdentityOffsetMap();
+    property public final androidx.ui.input.OffsetMap identityOffsetMap;
+  }
+
+  public final class PasswordVisualTransformation implements androidx.ui.input.VisualTransformation {
+    ctor public PasswordVisualTransformation(char mask);
+    ctor public PasswordVisualTransformation();
+    method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
+    method public char getMask();
+  }
+
+  public interface PlatformTextInputService {
+    method public void hideSoftwareKeyboard();
+    method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
+    method public void onStateUpdated(androidx.ui.input.EditorValue model);
+    method public void showSoftwareKeyboard();
+    method public void startInput(androidx.ui.input.EditorValue initModel, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput();
+  }
+
+  public final class SetComposingRegionEditOp implements androidx.ui.input.EditOperation {
+    ctor public SetComposingRegionEditOp(int start, int end);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.SetComposingRegionEditOp copy(int start, int end);
+    method public int getEnd();
+    method public int getStart();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class SetComposingTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public SetComposingTextEditOp(String text, int newCursorPosition);
+    method public String component1();
+    method public int component2();
+    method public androidx.ui.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
+    method public int getNewCursorPosition();
+    method public String getText();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class SetSelectionEditOp implements androidx.ui.input.EditOperation {
+    ctor public SetSelectionEditOp(int start, int end);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.SetSelectionEditOp copy(int start, int end);
+    method public int getEnd();
+    method public int getStart();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public class TextInputService {
+    ctor public TextInputService(androidx.ui.input.PlatformTextInputService platformTextInputService);
+    method public void hideSoftwareKeyboard(int token);
+    method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
+    method public void onStateUpdated(int token, androidx.ui.input.EditorValue model);
+    method public void showSoftwareKeyboard(int token);
+    method public int startInput(androidx.ui.input.EditorValue initModel, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput(int token);
+  }
+
+  public final class TextInputServiceKt {
+    field public static final int INVALID_SESSION = -1; // 0xffffffff
+    field public static final int NO_SESSION = 0; // 0x0
+  }
+
+  public final class TransformedText {
+    ctor public TransformedText(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
+    method public androidx.ui.text.AnnotatedString component1();
+    method public androidx.ui.input.OffsetMap component2();
+    method public androidx.ui.input.TransformedText copy(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
+    method public androidx.ui.input.OffsetMap getOffsetMap();
+    method public androidx.ui.text.AnnotatedString getTransformedText();
+  }
+
+  public interface VisualTransformation {
+    method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
+  }
+
+}
+
+package androidx.ui.text {
+
+  public final class AnnotatedString {
+    ctor public AnnotatedString(String text, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> paragraphStyles);
+    method public String component1();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> component2();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> component3();
+    method public androidx.ui.text.AnnotatedString copy(String text, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.ui.text.AnnotatedString.Item<java.lang.String>> annotations);
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> getParagraphStyles();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> getSpanStyles();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+    method public String getText();
+    method public operator androidx.ui.text.AnnotatedString plus(androidx.ui.text.AnnotatedString other);
+  }
+
+  public static final class AnnotatedString.Builder {
+    ctor public AnnotatedString.Builder(int capacity);
+    ctor public AnnotatedString.Builder();
+    ctor public AnnotatedString.Builder(String text);
+    ctor public AnnotatedString.Builder(androidx.ui.text.AnnotatedString text);
+    method public void addAnnotationString(String scope, String annotation, int start, int end);
+    method public void addStyle(androidx.ui.text.SpanStyle style, int start, int end);
+    method public void addStyle(androidx.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.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.ui.text.SpanStyle style);
+    method public int pushStyle(androidx.ui.text.ParagraphStyle style);
+    method public androidx.ui.text.AnnotatedString toAnnotatedString();
+    property public final int length;
+  }
+
+  public static final class AnnotatedString.Item<T> {
+    ctor public AnnotatedString.Item(T! item, int start, int end, String tag);
+    ctor public AnnotatedString.Item(T! item, int start, int end);
+    method public T! component1();
+    method public int component2();
+    method public int component3();
+    method public String component4();
+    method public androidx.ui.text.AnnotatedString.Item<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();
+  }
+
+  public final class AnnotatedStringKt {
+    method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.SpanStyle spanStyle, androidx.ui.text.ParagraphStyle? paragraphStyle = null);
+    method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.ParagraphStyle paragraphStyle);
+    method public static inline androidx.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+    method public static androidx.ui.text.AnnotatedString capitalize(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static androidx.ui.text.AnnotatedString decapitalize(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static int getLength(androidx.ui.text.AnnotatedString);
+    method public static androidx.ui.text.AnnotatedString subSequence(androidx.ui.text.AnnotatedString, int start, int end);
+    method public static androidx.ui.text.AnnotatedString toLowerCase(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static androidx.ui.text.AnnotatedString toUpperCase(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+    method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+  }
+
+  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.ui.text.Locale.Companion! Companion;
+  }
+
+  public static final class Locale.Companion {
+    method public androidx.ui.text.Locale getCurrent();
+    property public final androidx.ui.text.Locale current;
+  }
+
+  public final class LocaleList implements java.util.Collection<androidx.ui.text.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+    ctor public LocaleList(java.util.List<androidx.ui.text.Locale> localeList);
+    ctor public LocaleList(String languageTags);
+    ctor public LocaleList(androidx.ui.text.Locale... locales);
+    method public java.util.List<androidx.ui.text.Locale> component1();
+    method public operator boolean contains(androidx.ui.text.Locale element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public androidx.ui.text.LocaleList copy(java.util.List<androidx.ui.text.Locale> localeList);
+    method public operator androidx.ui.text.Locale get(int i);
+    method public java.util.List<androidx.ui.text.Locale> getLocaleList();
+    method public int getSize();
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.ui.text.Locale> iterator();
+    property public int size;
+    field public static final androidx.ui.text.LocaleList.Companion! Companion;
+  }
+
+  public static final class LocaleList.Companion {
+    method public androidx.ui.text.LocaleList getCurrent();
+    property public final androidx.ui.text.LocaleList current;
+  }
+
+  public final class MultiParagraph {
+    ctor public MultiParagraph(androidx.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints);
+    ctor public MultiParagraph(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.ui.text.style.TextDirection getBidiRunDirection(int offset);
+    method public androidx.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.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.ui.text.MultiParagraphIntrinsics getIntrinsics();
+    method public float getLastBaseline();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEllipsisCount(int lineIndex);
+    method public int getLineEllipsisOffset(int lineIndex);
+    method public int getLineEnd(int lineIndex);
+    method public int getLineForOffset(int offset);
+    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(androidx.ui.unit.PxPosition position);
+    method public androidx.ui.text.style.TextDirection getParagraphDirection(int offset);
+    method public androidx.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public androidx.ui.text.TextRange getWordBoundary(int offset);
+    method public void paint(androidx.ui.graphics.Canvas canvas);
+    property public final boolean didExceedMaxLines;
+    property public final float firstBaseline;
+    property public final float height;
+    property public final float lastBaseline;
+    property public final int lineCount;
+    property public final float maxIntrinsicWidth;
+    property public final float minIntrinsicWidth;
+    property public final java.util.List<androidx.ui.geometry.Rect> placeholderRects;
+    property public final float width;
+  }
+
+  public final class MultiParagraphIntrinsics implements androidx.ui.text.ParagraphIntrinsics {
+    ctor public MultiParagraphIntrinsics(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.ui.text.AnnotatedString getAnnotatedString();
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> getPlaceholders();
+    property public float maxIntrinsicWidth;
+    property public float minIntrinsicWidth;
+  }
+
+  public final class MultiParagraphIntrinsicsKt {
+  }
+
+  public final class MultiParagraphKt {
+  }
+
+  public interface Paragraph {
+    method public androidx.ui.text.style.TextDirection getBidiRunDirection(int offset);
+    method public androidx.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.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 getLineEllipsisCount(int lineIndex);
+    method public int getLineEllipsisOffset(int lineIndex);
+    method public int getLineEnd(int lineIndex);
+    method public int getLineForOffset(int offset);
+    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(androidx.ui.unit.PxPosition position);
+    method public androidx.ui.text.style.TextDirection getParagraphDirection(int offset);
+    method public androidx.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public androidx.ui.text.TextRange getWordBoundary(int offset);
+    method public void paint(androidx.ui.graphics.Canvas canvas);
+    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.ui.geometry.Rect> placeholderRects;
+    property public abstract float width;
+  }
+
+  public final class ParagraphConstraints {
+    ctor public ParagraphConstraints(float width);
+    method public float component1();
+    method public androidx.ui.text.ParagraphConstraints copy(float width);
+    method public float getWidth();
+  }
+
+  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.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+  }
+
+  public final class ParagraphKt {
+    method public static androidx.ui.text.Paragraph Paragraph(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public static androidx.ui.text.Paragraph Paragraph(androidx.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints);
+  }
+
+  public final class ParagraphStyle {
+    method public androidx.ui.text.style.TextAlign? component1();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? component2();
+    method public long component3();
+    method public androidx.ui.text.style.TextIndent? component4();
+    method public androidx.ui.text.ParagraphStyle copy-ffQossE(androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirectionAlgorithm? textDirectionAlgorithm, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+    method public long getLineHeight();
+    method public androidx.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? getTextDirectionAlgorithm();
+    method public androidx.ui.text.style.TextIndent? getTextIndent();
+    method public androidx.ui.text.ParagraphStyle merge(androidx.ui.text.ParagraphStyle? other = null);
+  }
+
+  public final class ParagraphStyleKt {
+    method public static androidx.ui.text.ParagraphStyle lerp(androidx.ui.text.ParagraphStyle start, androidx.ui.text.ParagraphStyle stop, float fraction);
+  }
+
+  public final class Placeholder {
+    method public long component1();
+    method public long component2();
+    method public androidx.ui.text.PlaceholderVerticalAlign component3();
+    method public androidx.ui.text.Placeholder copy-eLqjHCw(long width, long height, androidx.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+    method public long getHeight();
+    method public androidx.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+    method public long getWidth();
+  }
+
+  public enum PlaceholderVerticalAlign {
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextBottom;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextCenter;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextTop;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Top;
+  }
+
+  public final class SpanStyle {
+    method public long component1();
+    method public androidx.ui.text.style.TextGeometricTransform? component10();
+    method public androidx.ui.text.LocaleList? component11();
+    method public long component12();
+    method public androidx.ui.text.style.TextDecoration? component13();
+    method public androidx.ui.graphics.Shadow? component14();
+    method public long component2();
+    method public androidx.ui.text.font.FontWeight? component3();
+    method public androidx.ui.text.font.FontStyle? component4();
+    method public androidx.ui.text.font.FontSynthesis? component5();
+    method public androidx.ui.text.font.FontFamily? component6();
+    method public String? component7();
+    method public long component8();
+    method public androidx.ui.text.style.BaselineShift? component9();
+    method public androidx.ui.text.SpanStyle copy-kRoccyE(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
+    method public long getBackground();
+    method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+    method public long getColor();
+    method public androidx.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize();
+    method public androidx.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing();
+    method public androidx.ui.text.LocaleList? getLocaleList();
+    method public androidx.ui.graphics.Shadow? getShadow();
+    method public androidx.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method public androidx.ui.text.SpanStyle merge(androidx.ui.text.SpanStyle? other = null);
+  }
+
+  public final class SpanStyleKt {
+    method public static androidx.ui.text.SpanStyle lerp(androidx.ui.text.SpanStyle start, androidx.ui.text.SpanStyle stop, float fraction);
+  }
+
+  public final class StringKt {
+    method public static String capitalize(String, androidx.ui.text.Locale locale);
+    method public static String capitalize(String, androidx.ui.text.LocaleList localeList);
+    method public static String decapitalize(String, androidx.ui.text.Locale locale);
+    method public static String decapitalize(String, androidx.ui.text.LocaleList localeList);
+    method public static String toLowerCase(String, androidx.ui.text.Locale locale);
+    method public static String toLowerCase(String, androidx.ui.text.LocaleList localeList);
+    method public static String toUpperCase(String, androidx.ui.text.Locale locale);
+    method public static String toUpperCase(String, androidx.ui.text.LocaleList localeList);
+  }
+
+  public final class TextLayoutHelperKt {
+  }
+
+  public final class TextLayoutInput {
+    ctor public TextLayoutInput(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.text.AnnotatedString component1();
+    method public androidx.ui.core.Constraints component10();
+    method public androidx.ui.text.TextStyle component2();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> component3();
+    method public int component4();
+    method public boolean component5();
+    method public androidx.ui.text.style.TextOverflow component6();
+    method public androidx.ui.unit.Density component7();
+    method public androidx.ui.core.LayoutDirection component8();
+    method public androidx.ui.text.font.Font.ResourceLoader component9();
+    method public androidx.ui.text.TextLayoutInput copy(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.Constraints getConstraints();
+    method public androidx.ui.unit.Density getDensity();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public int getMaxLines();
+    method public androidx.ui.text.style.TextOverflow getOverflow();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> getPlaceholders();
+    method public androidx.ui.text.font.Font.ResourceLoader getResourceLoader();
+    method public boolean getSoftWrap();
+    method public androidx.ui.text.TextStyle getStyle();
+    method public androidx.ui.text.AnnotatedString getText();
+  }
+
+  public final class TextLayoutResult {
+    method public androidx.ui.text.TextLayoutInput component1();
+    method public androidx.ui.unit.IntPxSize component3();
+    method public androidx.ui.text.TextLayoutResult copy(androidx.ui.text.TextLayoutInput layoutInput, androidx.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntPxSize size);
+    method public androidx.ui.text.style.TextDirection getBidiRunDirection(int offset);
+    method public androidx.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.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.ui.text.TextLayoutInput getLayoutInput();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineEnd(int lineIndex);
+    method public int getLineForOffset(int offset);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public int getOffsetForPosition(androidx.ui.unit.PxPosition position);
+    method public androidx.ui.text.style.TextDirection getParagraphDirection(int offset);
+    method public androidx.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
+    method public androidx.ui.unit.IntPxSize getSize();
+    method public androidx.ui.text.TextRange getWordBoundary(int offset);
+    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 java.util.List<androidx.ui.geometry.Rect> placeholderRects;
+  }
+
+  public final class TextPainter {
+    method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
+    field public static final androidx.ui.text.TextPainter! INSTANCE;
+  }
+
+  public final class TextRange {
+    ctor public TextRange(int start, int end);
+    method public int component1();
+    method public int component2();
+    method public operator boolean contains(androidx.ui.text.TextRange other);
+    method public operator boolean contains(int offset);
+    method public androidx.ui.text.TextRange copy(int start, int end);
+    method public boolean getCollapsed();
+    method public int getEnd();
+    method public int getLength();
+    method public int getMax();
+    method public int getMin();
+    method public int getStart();
+    method public boolean intersects(androidx.ui.text.TextRange other);
+    property public final boolean collapsed;
+    property public final int length;
+    property public final int max;
+    property public final int min;
+  }
+
+  public final class TextRangeKt {
+    method public static String substring(CharSequence, androidx.ui.text.TextRange range);
+  }
+
+  public final class TextStyle {
+    method public long component1();
+    method public androidx.ui.text.style.TextGeometricTransform? component10();
+    method public androidx.ui.text.LocaleList? component11();
+    method public long component12();
+    method public androidx.ui.text.style.TextDecoration? component13();
+    method public androidx.ui.graphics.Shadow? component14();
+    method public androidx.ui.text.style.TextAlign? component15();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? component16();
+    method public long component17();
+    method public androidx.ui.text.style.TextIndent? component18();
+    method public long component2();
+    method public androidx.ui.text.font.FontWeight? component3();
+    method public androidx.ui.text.font.FontStyle? component4();
+    method public androidx.ui.text.font.FontSynthesis? component5();
+    method public androidx.ui.text.font.FontFamily? component6();
+    method public String? component7();
+    method public long component8();
+    method public androidx.ui.text.style.BaselineShift? component9();
+    method public androidx.ui.text.TextStyle copy-4Bo2vQE(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirectionAlgorithm? textDirectionAlgorithm, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+    method public long getBackground();
+    method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+    method public long getColor();
+    method public androidx.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize();
+    method public androidx.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing();
+    method public long getLineHeight();
+    method public androidx.ui.text.LocaleList? getLocaleList();
+    method public androidx.ui.graphics.Shadow? getShadow();
+    method public androidx.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? getTextDirectionAlgorithm();
+    method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method public androidx.ui.text.style.TextIndent? getTextIndent();
+    method public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
+    method public androidx.ui.text.TextStyle merge(androidx.ui.text.SpanStyle other);
+    method public androidx.ui.text.TextStyle merge(androidx.ui.text.ParagraphStyle other);
+    method public androidx.ui.text.ParagraphStyle toParagraphStyle();
+    method public androidx.ui.text.SpanStyle toSpanStyle();
+    field public static final androidx.ui.text.TextStyle.Companion! Companion;
+  }
+
+  public static final class TextStyle.Companion {
+    method public androidx.ui.text.TextStyle getDefault();
+    property public final androidx.ui.text.TextStyle Default;
+  }
+
+  public final class TextStyleKt {
+    method public static androidx.ui.text.TextStyle lerp(androidx.ui.text.TextStyle start, androidx.ui.text.TextStyle stop, float fraction);
+    method public static androidx.ui.text.TextStyle resolveDefaults(androidx.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
+  }
+
+  public interface Typeface {
+    method public androidx.ui.text.font.FontFamily getFontFamily();
+    property public abstract androidx.ui.text.font.FontFamily fontFamily;
+  }
+
+  public final class TypefaceKt {
+    method public static androidx.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.ui.text.font.FontWeight,? extends androidx.ui.text.font.FontStyle>>? necessaryStyles = null);
+  }
+
+}
+
+package androidx.ui.text.font {
+
+  public abstract sealed class FileBasedFontFamily extends androidx.ui.text.font.FontFamily {
+  }
+
+  public interface Font {
+    method public androidx.ui.text.font.FontStyle getStyle();
+    method public androidx.ui.text.font.FontWeight getWeight();
+    property public abstract androidx.ui.text.font.FontStyle style;
+    property public abstract androidx.ui.text.font.FontWeight weight;
+  }
+
+  public static interface Font.ResourceLoader {
+    method public Object load(androidx.ui.text.font.Font font);
+  }
+
+  public abstract sealed class FontFamily {
+    method public final boolean getCanLoadSynchronously();
+    field public static final androidx.ui.text.font.FontFamily.Companion! Companion;
+  }
+
+  public static final class FontFamily.Companion {
+    method public androidx.ui.text.font.GenericFontFamily getCursive();
+    method public androidx.ui.text.font.SystemFontFamily getDefault();
+    method public androidx.ui.text.font.GenericFontFamily getMonospace();
+    method public androidx.ui.text.font.GenericFontFamily getSansSerif();
+    method public androidx.ui.text.font.GenericFontFamily getSerif();
+    property public final androidx.ui.text.font.GenericFontFamily Cursive;
+    property public final androidx.ui.text.font.SystemFontFamily Default;
+    property public final androidx.ui.text.font.GenericFontFamily Monospace;
+    property public final androidx.ui.text.font.GenericFontFamily SansSerif;
+    property public final androidx.ui.text.font.GenericFontFamily Serif;
+  }
+
+  public final class FontFamilyKt {
+    method public static androidx.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
+    method public static androidx.ui.text.font.FontListFontFamily fontFamily(androidx.ui.text.font.Font... fonts);
+    method public static androidx.ui.text.font.LoadedFontFamily fontFamily(androidx.ui.text.Typeface typeface);
+  }
+
+  public final class FontKt {
+    method public static androidx.ui.text.font.FontListFontFamily asFontFamily(androidx.ui.text.font.Font);
+    method public static androidx.ui.text.font.Font font(int resId, androidx.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.ui.text.font.FontStyle style = androidx.ui.text.font.FontStyle.Normal);
+  }
+
+  public final class FontListFontFamily extends androidx.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.ui.text.font.Font> {
+    ctor public FontListFontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
+    method public java.util.List<androidx.ui.text.font.Font> component1();
+    method public boolean contains(androidx.ui.text.font.Font element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public androidx.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.ui.text.font.Font> fonts);
+    method public androidx.ui.text.font.Font get(int index);
+    method public java.util.List<androidx.ui.text.font.Font> getFonts();
+    method public int getSize();
+    method public int indexOf(androidx.ui.text.font.Font element);
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.ui.text.font.Font> iterator();
+    method public int lastIndexOf(androidx.ui.text.font.Font element);
+    method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator();
+    method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator(int index);
+    method public java.util.List<androidx.ui.text.font.Font> subList(int fromIndex, int toIndex);
+  }
+
+  public enum FontStyle {
+    enum_constant public static final androidx.ui.text.font.FontStyle Italic;
+    enum_constant public static final androidx.ui.text.font.FontStyle Normal;
+  }
+
+  public enum FontSynthesis {
+    enum_constant public static final androidx.ui.text.font.FontSynthesis All;
+    enum_constant public static final androidx.ui.text.font.FontSynthesis None;
+    enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
+    enum_constant public static final androidx.ui.text.font.FontSynthesis Weight;
+  }
+
+  public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
+    method public int compareTo(androidx.ui.text.font.FontWeight other);
+    method public int component1();
+    method public androidx.ui.text.font.FontWeight copy(int weight);
+    method public int getWeight();
+    field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
+  }
+
+  public static final class FontWeight.Companion {
+    method public androidx.ui.text.font.FontWeight getBlack();
+    method public androidx.ui.text.font.FontWeight getBold();
+    method public androidx.ui.text.font.FontWeight getExtraBold();
+    method public androidx.ui.text.font.FontWeight getExtraLight();
+    method public androidx.ui.text.font.FontWeight getLight();
+    method public androidx.ui.text.font.FontWeight getMedium();
+    method public androidx.ui.text.font.FontWeight getNormal();
+    method public androidx.ui.text.font.FontWeight getSemiBold();
+    method public androidx.ui.text.font.FontWeight getThin();
+    method public androidx.ui.text.font.FontWeight getW100();
+    method public androidx.ui.text.font.FontWeight getW200();
+    method public androidx.ui.text.font.FontWeight getW300();
+    method public androidx.ui.text.font.FontWeight getW400();
+    method public androidx.ui.text.font.FontWeight getW500();
+    method public androidx.ui.text.font.FontWeight getW600();
+    method public androidx.ui.text.font.FontWeight getW700();
+    method public androidx.ui.text.font.FontWeight getW800();
+    method public androidx.ui.text.font.FontWeight getW900();
+    property public final androidx.ui.text.font.FontWeight Black;
+    property public final androidx.ui.text.font.FontWeight Bold;
+    property public final androidx.ui.text.font.FontWeight ExtraBold;
+    property public final androidx.ui.text.font.FontWeight ExtraLight;
+    property public final androidx.ui.text.font.FontWeight Light;
+    property public final androidx.ui.text.font.FontWeight Medium;
+    property public final androidx.ui.text.font.FontWeight Normal;
+    property public final androidx.ui.text.font.FontWeight SemiBold;
+    property public final androidx.ui.text.font.FontWeight Thin;
+    property public final androidx.ui.text.font.FontWeight W100;
+    property public final androidx.ui.text.font.FontWeight W200;
+    property public final androidx.ui.text.font.FontWeight W300;
+    property public final androidx.ui.text.font.FontWeight W400;
+    property public final androidx.ui.text.font.FontWeight W500;
+    property public final androidx.ui.text.font.FontWeight W600;
+    property public final androidx.ui.text.font.FontWeight W700;
+    property public final androidx.ui.text.font.FontWeight W800;
+    property public final androidx.ui.text.font.FontWeight W900;
+  }
+
+  public final class FontWeightKt {
+    method public static androidx.ui.text.font.FontWeight lerp(androidx.ui.text.font.FontWeight start, androidx.ui.text.font.FontWeight stop, float fraction);
+  }
+
+  public final class GenericFontFamily extends androidx.ui.text.font.SystemFontFamily {
+    method public String getName();
+  }
+
+  public final class LoadedFontFamily extends androidx.ui.text.font.FontFamily {
+    ctor public LoadedFontFamily(androidx.ui.text.Typeface typeface);
+    method public androidx.ui.text.Typeface component1();
+    method public androidx.ui.text.font.LoadedFontFamily copy(androidx.ui.text.Typeface typeface);
+    method public androidx.ui.text.Typeface getTypeface();
+  }
+
+  public final class ResourceFont implements androidx.ui.text.font.Font {
+    ctor public ResourceFont(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+    method public int component1();
+    method public androidx.ui.text.font.FontWeight component2();
+    method public androidx.ui.text.font.FontStyle component3();
+    method public androidx.ui.text.font.ResourceFont copy(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+    method public int getResId();
+    method public androidx.ui.text.font.FontStyle getStyle();
+    method public androidx.ui.text.font.FontWeight getWeight();
+  }
+
+  public abstract sealed class SystemFontFamily extends androidx.ui.text.font.FontFamily {
+  }
+
+}
+
+package androidx.ui.text.platform {
+
+  public final class AndroidParagraphHelperKt {
+  }
+
+  public final class AndroidParagraphKt {
+  }
+
+  public final class PlatformLocaleKt {
+  }
+
+}
+
+package androidx.ui.text.style {
+
+  public final inline class BaselineShift {
+    ctor public BaselineShift();
+    method public static float constructor-impl(float multiplier);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getMultiplier();
+    method public static int hashCode-impl(float p);
+    method public static String toString-impl(float p);
+    field public static final androidx.ui.text.style.BaselineShift.Companion! Companion;
+  }
+
+  public static final class BaselineShift.Companion {
+    method public float getNone();
+    method public float getSubscript();
+    method public float getSuperscript();
+    property public final float None;
+    property public final float Subscript;
+    property public final float Superscript;
+  }
+
+  public final class BaselineShiftKt {
+    method public static float lerp-7csQwvo(float start, float stop, float fraction);
+  }
+
+  public enum TextAlign {
+    enum_constant public static final androidx.ui.text.style.TextAlign Center;
+    enum_constant public static final androidx.ui.text.style.TextAlign End;
+    enum_constant public static final androidx.ui.text.style.TextAlign Justify;
+    enum_constant public static final androidx.ui.text.style.TextAlign Left;
+    enum_constant public static final androidx.ui.text.style.TextAlign Right;
+    enum_constant public static final androidx.ui.text.style.TextAlign Start;
+  }
+
+  public final class TextDecoration {
+    method public int component1();
+    method public boolean contains(androidx.ui.text.style.TextDecoration other);
+    method public androidx.ui.text.style.TextDecoration copy(int mask);
+    method public int getMask();
+    field public static final androidx.ui.text.style.TextDecoration.Companion! Companion;
+  }
+
+  public static final class TextDecoration.Companion {
+    method public androidx.ui.text.style.TextDecoration combine(java.util.List<androidx.ui.text.style.TextDecoration> decorations);
+    method public androidx.ui.text.style.TextDecoration getLineThrough();
+    method public androidx.ui.text.style.TextDecoration getNone();
+    method public androidx.ui.text.style.TextDecoration getUnderline();
+    property public final androidx.ui.text.style.TextDecoration LineThrough;
+    property public final androidx.ui.text.style.TextDecoration None;
+    property public final androidx.ui.text.style.TextDecoration Underline;
+  }
+
+  public enum TextDirection {
+    enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
+    enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
+  }
+
+  public enum TextDirectionAlgorithm {
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrLtr;
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrRtl;
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceLtr;
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceRtl;
+  }
+
+  public final class TextGeometricTransform {
+    ctor public TextGeometricTransform(float scaleX, float skewX);
+    ctor public TextGeometricTransform();
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
+    method public float getScaleX();
+    method public float getSkewX();
+    field public static final androidx.ui.text.style.TextGeometricTransform.Companion! Companion;
+  }
+
+  public static final class TextGeometricTransform.Companion {
+  }
+
+  public final class TextGeometricTransformKt {
+    method public static androidx.ui.text.style.TextGeometricTransform lerp(androidx.ui.text.style.TextGeometricTransform start, androidx.ui.text.style.TextGeometricTransform stop, float fraction);
+  }
+
+  public final class TextIndent {
+    method public long component1();
+    method public long component2();
+    method public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
+    method public long getFirstLine();
+    method public long getRestLine();
+    field public static final androidx.ui.text.style.TextIndent.Companion! Companion;
+  }
+
+  public static final class TextIndent.Companion {
+    method public androidx.ui.text.style.TextIndent getNone();
+    property public final androidx.ui.text.style.TextIndent None;
+  }
+
+  public final class TextIndentKt {
+    method public static androidx.ui.text.style.TextIndent lerp(androidx.ui.text.style.TextIndent start, androidx.ui.text.style.TextIndent stop, float fraction);
+  }
+
+  public enum TextOverflow {
+    enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
+    enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
+  }
+
+}
+
diff --git a/ui/ui-text-core/api/public_plus_experimental_current.txt b/ui/ui-text-core/api/public_plus_experimental_current.txt
index 43429b0..3f000f71 100644
--- a/ui/ui-text-core/api/public_plus_experimental_current.txt
+++ b/ui/ui-text-core/api/public_plus_experimental_current.txt
@@ -733,8 +733,11 @@
   }
 
   public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
     method public int compareTo(androidx.ui.text.font.FontWeight other);
+    method public int component1();
     method public androidx.ui.text.font.FontWeight copy(int weight);
+    method public int getWeight();
     field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
   }
 
diff --git a/ui/ui-text-core/api/res-0.1.0-dev11.txt b/ui/ui-text-core/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-text-core/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-text-core/api/restricted_0.1.0-dev10.txt b/ui/ui-text-core/api/restricted_0.1.0-dev10.txt
index 6cea96e..fa9595d 100644
--- a/ui/ui-text-core/api/restricted_0.1.0-dev10.txt
+++ b/ui/ui-text-core/api/restricted_0.1.0-dev10.txt
@@ -762,8 +762,11 @@
   }
 
   public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
     method public int compareTo(androidx.ui.text.font.FontWeight other);
+    method public int component1();
     method public androidx.ui.text.font.FontWeight copy(int weight);
+    method public int getWeight();
     field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
   }
 
diff --git a/ui/ui-text-core/api/restricted_0.1.0-dev11.txt b/ui/ui-text-core/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..fa9595d
--- /dev/null
+++ b/ui/ui-text-core/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,963 @@
+// Signature format: 3.0
+package androidx.ui.input {
+
+  public final class BackspaceKeyEditOp implements androidx.ui.input.EditOperation {
+    ctor public BackspaceKeyEditOp();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class CommitTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public CommitTextEditOp(String text, int newCursorPosition);
+    method public String component1();
+    method public int component2();
+    method public androidx.ui.input.CommitTextEditOp copy(String text, int newCursorPosition);
+    method public int getNewCursorPosition();
+    method public String getText();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class DeleteSurroundingTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
+    method public int getAfterLength();
+    method public int getBeforeLength();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.ui.input.EditOperation {
+    ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
+    method public int getAfterLength();
+    method public int getBeforeLength();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public interface EditOperation {
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class EditProcessor {
+    method public androidx.ui.input.EditorValue onEditCommands(java.util.List<? extends androidx.ui.input.EditOperation> ops);
+    method public void onNewState(androidx.ui.input.EditorValue model, androidx.ui.input.TextInputService? textInputService, int token);
+  }
+
+  public final class EditingBuffer {
+    ctor public EditingBuffer(String initialText, androidx.ui.text.TextRange initialSelection);
+    field public static final int NOWHERE = -1; // 0xffffffff
+  }
+
+  public final class EditorValue {
+    ctor public EditorValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
+    ctor public EditorValue();
+    method public String component1();
+    method public androidx.ui.text.TextRange component2();
+    method public androidx.ui.text.TextRange? component3();
+    method public androidx.ui.input.EditorValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
+    method public androidx.ui.text.TextRange? getComposition();
+    method public String getSelectedText();
+    method public androidx.ui.text.TextRange getSelection();
+    method public String getText();
+    method public String getTextAfterSelection(int maxChars);
+    method public String getTextBeforeSelection(int maxChars);
+  }
+
+  public final class FinishComposingTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public FinishComposingTextEditOp();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public enum ImeAction {
+    enum_constant public static final androidx.ui.input.ImeAction Done;
+    enum_constant public static final androidx.ui.input.ImeAction Go;
+    enum_constant public static final androidx.ui.input.ImeAction Next;
+    enum_constant public static final androidx.ui.input.ImeAction NoAction;
+    enum_constant public static final androidx.ui.input.ImeAction Previous;
+    enum_constant public static final androidx.ui.input.ImeAction Search;
+    enum_constant public static final androidx.ui.input.ImeAction Send;
+    enum_constant public static final androidx.ui.input.ImeAction Unspecified;
+  }
+
+  public interface InputEventListener {
+    method public void onEditOperations(java.util.List<? extends androidx.ui.input.EditOperation> editOps);
+    method public void onImeAction(androidx.ui.input.ImeAction imeAction);
+  }
+
+  public enum KeyboardType {
+    enum_constant public static final androidx.ui.input.KeyboardType Ascii;
+    enum_constant public static final androidx.ui.input.KeyboardType Email;
+    enum_constant public static final androidx.ui.input.KeyboardType Number;
+    enum_constant public static final androidx.ui.input.KeyboardType NumberPassword;
+    enum_constant public static final androidx.ui.input.KeyboardType Password;
+    enum_constant public static final androidx.ui.input.KeyboardType Phone;
+    enum_constant public static final androidx.ui.input.KeyboardType Text;
+    enum_constant public static final androidx.ui.input.KeyboardType Uri;
+  }
+
+  public final class MoveCursorEditOp implements androidx.ui.input.EditOperation {
+    ctor public MoveCursorEditOp(int amount);
+    method public int component1();
+    method public androidx.ui.input.MoveCursorEditOp copy(int amount);
+    method public int getAmount();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public interface OffsetMap {
+    method public int originalToTransformed(int offset);
+    method public int transformedToOriginal(int offset);
+    field public static final androidx.ui.input.OffsetMap.Companion! Companion;
+  }
+
+  public static final class OffsetMap.Companion {
+    method public androidx.ui.input.OffsetMap getIdentityOffsetMap();
+    property public final androidx.ui.input.OffsetMap identityOffsetMap;
+  }
+
+  public final class PasswordVisualTransformation implements androidx.ui.input.VisualTransformation {
+    ctor public PasswordVisualTransformation(char mask);
+    ctor public PasswordVisualTransformation();
+    method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
+    method public char getMask();
+  }
+
+  public interface PlatformTextInputService {
+    method public void hideSoftwareKeyboard();
+    method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
+    method public void onStateUpdated(androidx.ui.input.EditorValue model);
+    method public void showSoftwareKeyboard();
+    method public void startInput(androidx.ui.input.EditorValue initModel, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput();
+  }
+
+  public final class SetComposingRegionEditOp implements androidx.ui.input.EditOperation {
+    ctor public SetComposingRegionEditOp(int start, int end);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.SetComposingRegionEditOp copy(int start, int end);
+    method public int getEnd();
+    method public int getStart();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class SetComposingTextEditOp implements androidx.ui.input.EditOperation {
+    ctor public SetComposingTextEditOp(String text, int newCursorPosition);
+    method public String component1();
+    method public int component2();
+    method public androidx.ui.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
+    method public int getNewCursorPosition();
+    method public String getText();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public final class SetSelectionEditOp implements androidx.ui.input.EditOperation {
+    ctor public SetSelectionEditOp(int start, int end);
+    method public int component1();
+    method public int component2();
+    method public androidx.ui.input.SetSelectionEditOp copy(int start, int end);
+    method public int getEnd();
+    method public int getStart();
+    method public void process(androidx.ui.input.EditingBuffer buffer);
+  }
+
+  public class TextInputService {
+    ctor public TextInputService(androidx.ui.input.PlatformTextInputService platformTextInputService);
+    method public void hideSoftwareKeyboard(int token);
+    method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
+    method public void onStateUpdated(int token, androidx.ui.input.EditorValue model);
+    method public void showSoftwareKeyboard(int token);
+    method public int startInput(androidx.ui.input.EditorValue initModel, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+    method public void stopInput(int token);
+  }
+
+  public final class TextInputServiceKt {
+    field public static final int INVALID_SESSION = -1; // 0xffffffff
+    field public static final int NO_SESSION = 0; // 0x0
+  }
+
+  public final class TransformedText {
+    ctor public TransformedText(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
+    method public androidx.ui.text.AnnotatedString component1();
+    method public androidx.ui.input.OffsetMap component2();
+    method public androidx.ui.input.TransformedText copy(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
+    method public androidx.ui.input.OffsetMap getOffsetMap();
+    method public androidx.ui.text.AnnotatedString getTransformedText();
+  }
+
+  public interface VisualTransformation {
+    method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
+  }
+
+}
+
+package androidx.ui.text {
+
+  public final class AnnotatedString {
+    ctor public AnnotatedString(String text, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> paragraphStyles);
+    method public String component1();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> component2();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> component3();
+    method public androidx.ui.text.AnnotatedString copy(String text, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.ui.text.AnnotatedString.Item<java.lang.String>> annotations);
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.ParagraphStyle>> getParagraphStyles();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> getSpanStyles();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+    method public String getText();
+    method public operator androidx.ui.text.AnnotatedString plus(androidx.ui.text.AnnotatedString other);
+  }
+
+  public static final class AnnotatedString.Builder {
+    ctor public AnnotatedString.Builder(int capacity);
+    ctor public AnnotatedString.Builder();
+    ctor public AnnotatedString.Builder(String text);
+    ctor public AnnotatedString.Builder(androidx.ui.text.AnnotatedString text);
+    method public void addAnnotationString(String scope, String annotation, int start, int end);
+    method public void addStyle(androidx.ui.text.SpanStyle style, int start, int end);
+    method public void addStyle(androidx.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.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.ui.text.SpanStyle style);
+    method public int pushStyle(androidx.ui.text.ParagraphStyle style);
+    method public androidx.ui.text.AnnotatedString toAnnotatedString();
+    property public final int length;
+  }
+
+  public static final class AnnotatedString.Item<T> {
+    ctor public AnnotatedString.Item(T! item, int start, int end, String tag);
+    ctor public AnnotatedString.Item(T! item, int start, int end);
+    method public T! component1();
+    method public int component2();
+    method public int component3();
+    method public String component4();
+    method public androidx.ui.text.AnnotatedString.Item<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();
+  }
+
+  public final class AnnotatedStringKt {
+    method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.SpanStyle spanStyle, androidx.ui.text.ParagraphStyle? paragraphStyle = null);
+    method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.ParagraphStyle paragraphStyle);
+    method public static inline androidx.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+    method public static androidx.ui.text.AnnotatedString capitalize(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static androidx.ui.text.AnnotatedString decapitalize(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static int getLength(androidx.ui.text.AnnotatedString);
+    method public static androidx.ui.text.AnnotatedString subSequence(androidx.ui.text.AnnotatedString, int start, int end);
+    method public static androidx.ui.text.AnnotatedString toLowerCase(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static androidx.ui.text.AnnotatedString toUpperCase(androidx.ui.text.AnnotatedString, androidx.ui.text.LocaleList localeList = LocaleList.current);
+    method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+    method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+  }
+
+  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.ui.text.Locale.Companion! Companion;
+  }
+
+  public static final class Locale.Companion {
+    method public androidx.ui.text.Locale getCurrent();
+    property public final androidx.ui.text.Locale current;
+  }
+
+  public final class LocaleList implements java.util.Collection<androidx.ui.text.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+    ctor public LocaleList(java.util.List<androidx.ui.text.Locale> localeList);
+    ctor public LocaleList(String languageTags);
+    ctor public LocaleList(androidx.ui.text.Locale... locales);
+    method public java.util.List<androidx.ui.text.Locale> component1();
+    method public operator boolean contains(androidx.ui.text.Locale element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public androidx.ui.text.LocaleList copy(java.util.List<androidx.ui.text.Locale> localeList);
+    method public operator androidx.ui.text.Locale get(int i);
+    method public java.util.List<androidx.ui.text.Locale> getLocaleList();
+    method public int getSize();
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.ui.text.Locale> iterator();
+    property public int size;
+    field public static final androidx.ui.text.LocaleList.Companion! Companion;
+  }
+
+  public static final class LocaleList.Companion {
+    method public androidx.ui.text.LocaleList getCurrent();
+    property public final androidx.ui.text.LocaleList current;
+  }
+
+  public final class MultiParagraph {
+    ctor public MultiParagraph(androidx.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints);
+    ctor public MultiParagraph(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.ui.text.style.TextDirection getBidiRunDirection(int offset);
+    method public androidx.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.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.ui.text.MultiParagraphIntrinsics getIntrinsics();
+    method public float getLastBaseline();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineCount();
+    method public int getLineEllipsisCount(int lineIndex);
+    method public int getLineEllipsisOffset(int lineIndex);
+    method public int getLineEnd(int lineIndex);
+    method public int getLineForOffset(int offset);
+    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(androidx.ui.unit.PxPosition position);
+    method public androidx.ui.text.style.TextDirection getParagraphDirection(int offset);
+    method public androidx.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public androidx.ui.text.TextRange getWordBoundary(int offset);
+    method public void paint(androidx.ui.graphics.Canvas canvas);
+    property public final boolean didExceedMaxLines;
+    property public final float firstBaseline;
+    property public final float height;
+    property public final float lastBaseline;
+    property public final int lineCount;
+    property public final float maxIntrinsicWidth;
+    property public final float minIntrinsicWidth;
+    property public final java.util.List<androidx.ui.geometry.Rect> placeholderRects;
+    property public final float width;
+  }
+
+  public final class MultiParagraphIntrinsics implements androidx.ui.text.ParagraphIntrinsics {
+    ctor public MultiParagraphIntrinsics(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public androidx.ui.text.AnnotatedString getAnnotatedString();
+    method public float getMaxIntrinsicWidth();
+    method public float getMinIntrinsicWidth();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> getPlaceholders();
+    property public float maxIntrinsicWidth;
+    property public float minIntrinsicWidth;
+  }
+
+  public final class MultiParagraphIntrinsicsKt {
+  }
+
+  public final class MultiParagraphKt {
+  }
+
+  public interface Paragraph {
+    method public androidx.ui.text.style.TextDirection getBidiRunDirection(int offset);
+    method public androidx.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.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 getLineEllipsisCount(int lineIndex);
+    method public int getLineEllipsisOffset(int lineIndex);
+    method public int getLineEnd(int lineIndex);
+    method public int getLineForOffset(int offset);
+    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(androidx.ui.unit.PxPosition position);
+    method public androidx.ui.text.style.TextDirection getParagraphDirection(int offset);
+    method public androidx.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
+    method public float getWidth();
+    method public androidx.ui.text.TextRange getWordBoundary(int offset);
+    method public void paint(androidx.ui.graphics.Canvas canvas);
+    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.ui.geometry.Rect> placeholderRects;
+    property public abstract float width;
+  }
+
+  public final class ParagraphConstraints {
+    ctor public ParagraphConstraints(float width);
+    method public float component1();
+    method public androidx.ui.text.ParagraphConstraints copy(float width);
+    method public float getWidth();
+  }
+
+  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.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+  }
+
+  public final class ParagraphKt {
+    method public static androidx.ui.text.Paragraph Paragraph(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+    method public static androidx.ui.text.Paragraph Paragraph(androidx.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints);
+  }
+
+  public final class ParagraphStyle {
+    method public androidx.ui.text.style.TextAlign? component1();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? component2();
+    method public long component3();
+    method public androidx.ui.text.style.TextIndent? component4();
+    method public androidx.ui.text.ParagraphStyle copy-ffQossE(androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirectionAlgorithm? textDirectionAlgorithm, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+    method public long getLineHeight();
+    method public androidx.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? getTextDirectionAlgorithm();
+    method public androidx.ui.text.style.TextIndent? getTextIndent();
+    method public androidx.ui.text.ParagraphStyle merge(androidx.ui.text.ParagraphStyle? other = null);
+  }
+
+  public final class ParagraphStyleKt {
+    method public static androidx.ui.text.ParagraphStyle lerp(androidx.ui.text.ParagraphStyle start, androidx.ui.text.ParagraphStyle stop, float fraction);
+  }
+
+  public final class Placeholder {
+    method public long component1();
+    method public long component2();
+    method public androidx.ui.text.PlaceholderVerticalAlign component3();
+    method public androidx.ui.text.Placeholder copy-eLqjHCw(long width, long height, androidx.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+    method public long getHeight();
+    method public androidx.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+    method public long getWidth();
+  }
+
+  public enum PlaceholderVerticalAlign {
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextBottom;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextCenter;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextTop;
+    enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Top;
+  }
+
+  public final class SpanStyle {
+    method public long component1();
+    method public androidx.ui.text.style.TextGeometricTransform? component10();
+    method public androidx.ui.text.LocaleList? component11();
+    method public long component12();
+    method public androidx.ui.text.style.TextDecoration? component13();
+    method public androidx.ui.graphics.Shadow? component14();
+    method public long component2();
+    method public androidx.ui.text.font.FontWeight? component3();
+    method public androidx.ui.text.font.FontStyle? component4();
+    method public androidx.ui.text.font.FontSynthesis? component5();
+    method public androidx.ui.text.font.FontFamily? component6();
+    method public String? component7();
+    method public long component8();
+    method public androidx.ui.text.style.BaselineShift? component9();
+    method public androidx.ui.text.SpanStyle copy-kRoccyE(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
+    method public long getBackground();
+    method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+    method public long getColor();
+    method public androidx.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize();
+    method public androidx.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing();
+    method public androidx.ui.text.LocaleList? getLocaleList();
+    method public androidx.ui.graphics.Shadow? getShadow();
+    method public androidx.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method public androidx.ui.text.SpanStyle merge(androidx.ui.text.SpanStyle? other = null);
+  }
+
+  public final class SpanStyleKt {
+    method public static androidx.ui.text.SpanStyle lerp(androidx.ui.text.SpanStyle start, androidx.ui.text.SpanStyle stop, float fraction);
+  }
+
+  public final class StringKt {
+    method public static String capitalize(String, androidx.ui.text.Locale locale);
+    method public static String capitalize(String, androidx.ui.text.LocaleList localeList);
+    method public static String decapitalize(String, androidx.ui.text.Locale locale);
+    method public static String decapitalize(String, androidx.ui.text.LocaleList localeList);
+    method public static String toLowerCase(String, androidx.ui.text.Locale locale);
+    method public static String toLowerCase(String, androidx.ui.text.LocaleList localeList);
+    method public static String toUpperCase(String, androidx.ui.text.Locale locale);
+    method public static String toUpperCase(String, androidx.ui.text.LocaleList localeList);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TextDelegate {
+    ctor public TextDelegate(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders);
+    method public androidx.ui.unit.Density getDensity();
+    method public int getMaxIntrinsicWidth();
+    method public int getMaxLines();
+    method public int getMinIntrinsicWidth();
+    method public androidx.ui.text.style.TextOverflow getOverflow();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> getPlaceholders();
+    method public androidx.ui.text.font.Font.ResourceLoader getResourceLoader();
+    method public boolean getSoftWrap();
+    method public androidx.ui.text.TextStyle getStyle();
+    method public androidx.ui.text.AnnotatedString getText();
+    method public androidx.ui.text.TextLayoutResult layout(androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.TextLayoutResult? prevResult = null);
+    method public void layoutIntrinsics(androidx.ui.core.LayoutDirection layoutDirection);
+    property public final int maxIntrinsicWidth;
+    property public final int minIntrinsicWidth;
+    field public static final androidx.ui.text.TextDelegate.Companion! Companion;
+  }
+
+  public static final class TextDelegate.Companion {
+    method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
+    method public void paintBackground-ZIA4ZIk(int start, int end, long color, androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
+  }
+
+  public final class TextLayoutHelperKt {
+  }
+
+  public final class TextLayoutInput {
+    ctor public TextLayoutInput(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.text.AnnotatedString component1();
+    method public androidx.ui.core.Constraints component10();
+    method public androidx.ui.text.TextStyle component2();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> component3();
+    method public int component4();
+    method public boolean component5();
+    method public androidx.ui.text.style.TextOverflow component6();
+    method public androidx.ui.unit.Density component7();
+    method public androidx.ui.core.LayoutDirection component8();
+    method public androidx.ui.text.font.Font.ResourceLoader component9();
+    method public androidx.ui.text.TextLayoutInput copy(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+    method public androidx.ui.core.Constraints getConstraints();
+    method public androidx.ui.unit.Density getDensity();
+    method public androidx.ui.core.LayoutDirection getLayoutDirection();
+    method public int getMaxLines();
+    method public androidx.ui.text.style.TextOverflow getOverflow();
+    method public java.util.List<androidx.ui.text.AnnotatedString.Item<androidx.ui.text.Placeholder>> getPlaceholders();
+    method public androidx.ui.text.font.Font.ResourceLoader getResourceLoader();
+    method public boolean getSoftWrap();
+    method public androidx.ui.text.TextStyle getStyle();
+    method public androidx.ui.text.AnnotatedString getText();
+  }
+
+  public final class TextLayoutResult {
+    method public androidx.ui.text.TextLayoutInput component1();
+    method public androidx.ui.unit.IntPxSize component3();
+    method public androidx.ui.text.TextLayoutResult copy(androidx.ui.text.TextLayoutInput layoutInput, androidx.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntPxSize size);
+    method public androidx.ui.text.style.TextDirection getBidiRunDirection(int offset);
+    method public androidx.ui.geometry.Rect getBoundingBox(int offset);
+    method public androidx.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.ui.text.TextLayoutInput getLayoutInput();
+    method public float getLineBottom(int lineIndex);
+    method public int getLineEnd(int lineIndex);
+    method public int getLineForOffset(int offset);
+    method public int getLineStart(int lineIndex);
+    method public float getLineTop(int lineIndex);
+    method public int getOffsetForPosition(androidx.ui.unit.PxPosition position);
+    method public androidx.ui.text.style.TextDirection getParagraphDirection(int offset);
+    method public androidx.ui.graphics.Path getPathForRange(int start, int end);
+    method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
+    method public androidx.ui.unit.IntPxSize getSize();
+    method public androidx.ui.text.TextRange getWordBoundary(int offset);
+    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 java.util.List<androidx.ui.geometry.Rect> placeholderRects;
+  }
+
+  public final class TextPainter {
+    method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
+    field public static final androidx.ui.text.TextPainter! INSTANCE;
+  }
+
+  public final class TextRange {
+    ctor public TextRange(int start, int end);
+    method public int component1();
+    method public int component2();
+    method public operator boolean contains(androidx.ui.text.TextRange other);
+    method public operator boolean contains(int offset);
+    method public androidx.ui.text.TextRange copy(int start, int end);
+    method public boolean getCollapsed();
+    method public int getEnd();
+    method public int getLength();
+    method public int getMax();
+    method public int getMin();
+    method public int getStart();
+    method public boolean intersects(androidx.ui.text.TextRange other);
+    property public final boolean collapsed;
+    property public final int length;
+    property public final int max;
+    property public final int min;
+  }
+
+  public final class TextRangeKt {
+    method public static String substring(CharSequence, androidx.ui.text.TextRange range);
+  }
+
+  public final class TextStyle {
+    method public long component1();
+    method public androidx.ui.text.style.TextGeometricTransform? component10();
+    method public androidx.ui.text.LocaleList? component11();
+    method public long component12();
+    method public androidx.ui.text.style.TextDecoration? component13();
+    method public androidx.ui.graphics.Shadow? component14();
+    method public androidx.ui.text.style.TextAlign? component15();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? component16();
+    method public long component17();
+    method public androidx.ui.text.style.TextIndent? component18();
+    method public long component2();
+    method public androidx.ui.text.font.FontWeight? component3();
+    method public androidx.ui.text.font.FontStyle? component4();
+    method public androidx.ui.text.font.FontSynthesis? component5();
+    method public androidx.ui.text.font.FontFamily? component6();
+    method public String? component7();
+    method public long component8();
+    method public androidx.ui.text.style.BaselineShift? component9();
+    method public androidx.ui.text.TextStyle copy-4Bo2vQE(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirectionAlgorithm? textDirectionAlgorithm, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+    method public long getBackground();
+    method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+    method public long getColor();
+    method public androidx.ui.text.font.FontFamily? getFontFamily();
+    method public String? getFontFeatureSettings();
+    method public long getFontSize();
+    method public androidx.ui.text.font.FontStyle? getFontStyle();
+    method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
+    method public androidx.ui.text.font.FontWeight? getFontWeight();
+    method public long getLetterSpacing();
+    method public long getLineHeight();
+    method public androidx.ui.text.LocaleList? getLocaleList();
+    method public androidx.ui.graphics.Shadow? getShadow();
+    method public androidx.ui.text.style.TextAlign? getTextAlign();
+    method public androidx.ui.text.style.TextDecoration? getTextDecoration();
+    method public androidx.ui.text.style.TextDirectionAlgorithm? getTextDirectionAlgorithm();
+    method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+    method public androidx.ui.text.style.TextIndent? getTextIndent();
+    method public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
+    method public androidx.ui.text.TextStyle merge(androidx.ui.text.SpanStyle other);
+    method public androidx.ui.text.TextStyle merge(androidx.ui.text.ParagraphStyle other);
+    method public androidx.ui.text.ParagraphStyle toParagraphStyle();
+    method public androidx.ui.text.SpanStyle toSpanStyle();
+    field public static final androidx.ui.text.TextStyle.Companion! Companion;
+  }
+
+  public static final class TextStyle.Companion {
+    method public androidx.ui.text.TextStyle getDefault();
+    property public final androidx.ui.text.TextStyle Default;
+  }
+
+  public final class TextStyleKt {
+    method public static androidx.ui.text.TextStyle lerp(androidx.ui.text.TextStyle start, androidx.ui.text.TextStyle stop, float fraction);
+    method public static androidx.ui.text.TextStyle resolveDefaults(androidx.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
+  }
+
+  public interface Typeface {
+    method public androidx.ui.text.font.FontFamily getFontFamily();
+    property public abstract androidx.ui.text.font.FontFamily fontFamily;
+  }
+
+  public final class TypefaceKt {
+    method public static androidx.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.ui.text.font.FontWeight,? extends androidx.ui.text.font.FontStyle>>? necessaryStyles = null);
+  }
+
+}
+
+package androidx.ui.text.font {
+
+  public abstract sealed class FileBasedFontFamily extends androidx.ui.text.font.FontFamily {
+  }
+
+  public interface Font {
+    method public androidx.ui.text.font.FontStyle getStyle();
+    method public androidx.ui.text.font.FontWeight getWeight();
+    property public abstract androidx.ui.text.font.FontStyle style;
+    property public abstract androidx.ui.text.font.FontWeight weight;
+  }
+
+  public static interface Font.ResourceLoader {
+    method public Object load(androidx.ui.text.font.Font font);
+  }
+
+  public abstract sealed class FontFamily {
+    method public final boolean getCanLoadSynchronously();
+    field public static final androidx.ui.text.font.FontFamily.Companion! Companion;
+  }
+
+  public static final class FontFamily.Companion {
+    method public androidx.ui.text.font.GenericFontFamily getCursive();
+    method public androidx.ui.text.font.SystemFontFamily getDefault();
+    method public androidx.ui.text.font.GenericFontFamily getMonospace();
+    method public androidx.ui.text.font.GenericFontFamily getSansSerif();
+    method public androidx.ui.text.font.GenericFontFamily getSerif();
+    property public final androidx.ui.text.font.GenericFontFamily Cursive;
+    property public final androidx.ui.text.font.SystemFontFamily Default;
+    property public final androidx.ui.text.font.GenericFontFamily Monospace;
+    property public final androidx.ui.text.font.GenericFontFamily SansSerif;
+    property public final androidx.ui.text.font.GenericFontFamily Serif;
+  }
+
+  public final class FontFamilyKt {
+    method public static androidx.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
+    method public static androidx.ui.text.font.FontListFontFamily fontFamily(androidx.ui.text.font.Font... fonts);
+    method public static androidx.ui.text.font.LoadedFontFamily fontFamily(androidx.ui.text.Typeface typeface);
+  }
+
+  public final class FontKt {
+    method public static androidx.ui.text.font.FontListFontFamily asFontFamily(androidx.ui.text.font.Font);
+    method public static androidx.ui.text.font.Font font(int resId, androidx.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.ui.text.font.FontStyle style = androidx.ui.text.font.FontStyle.Normal);
+  }
+
+  public final class FontListFontFamily extends androidx.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.ui.text.font.Font> {
+    ctor public FontListFontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
+    method public java.util.List<androidx.ui.text.font.Font> component1();
+    method public boolean contains(androidx.ui.text.font.Font element);
+    method public boolean containsAll(java.util.Collection<?> elements);
+    method public androidx.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.ui.text.font.Font> fonts);
+    method public androidx.ui.text.font.Font get(int index);
+    method public java.util.List<androidx.ui.text.font.Font> getFonts();
+    method public int getSize();
+    method public int indexOf(androidx.ui.text.font.Font element);
+    method public boolean isEmpty();
+    method public java.util.Iterator<androidx.ui.text.font.Font> iterator();
+    method public int lastIndexOf(androidx.ui.text.font.Font element);
+    method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator();
+    method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator(int index);
+    method public java.util.List<androidx.ui.text.font.Font> subList(int fromIndex, int toIndex);
+  }
+
+  public enum FontStyle {
+    enum_constant public static final androidx.ui.text.font.FontStyle Italic;
+    enum_constant public static final androidx.ui.text.font.FontStyle Normal;
+  }
+
+  public enum FontSynthesis {
+    enum_constant public static final androidx.ui.text.font.FontSynthesis All;
+    enum_constant public static final androidx.ui.text.font.FontSynthesis None;
+    enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
+    enum_constant public static final androidx.ui.text.font.FontSynthesis Weight;
+  }
+
+  public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
+    method public int compareTo(androidx.ui.text.font.FontWeight other);
+    method public int component1();
+    method public androidx.ui.text.font.FontWeight copy(int weight);
+    method public int getWeight();
+    field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
+  }
+
+  public static final class FontWeight.Companion {
+    method public androidx.ui.text.font.FontWeight getBlack();
+    method public androidx.ui.text.font.FontWeight getBold();
+    method public androidx.ui.text.font.FontWeight getExtraBold();
+    method public androidx.ui.text.font.FontWeight getExtraLight();
+    method public androidx.ui.text.font.FontWeight getLight();
+    method public androidx.ui.text.font.FontWeight getMedium();
+    method public androidx.ui.text.font.FontWeight getNormal();
+    method public androidx.ui.text.font.FontWeight getSemiBold();
+    method public androidx.ui.text.font.FontWeight getThin();
+    method public androidx.ui.text.font.FontWeight getW100();
+    method public androidx.ui.text.font.FontWeight getW200();
+    method public androidx.ui.text.font.FontWeight getW300();
+    method public androidx.ui.text.font.FontWeight getW400();
+    method public androidx.ui.text.font.FontWeight getW500();
+    method public androidx.ui.text.font.FontWeight getW600();
+    method public androidx.ui.text.font.FontWeight getW700();
+    method public androidx.ui.text.font.FontWeight getW800();
+    method public androidx.ui.text.font.FontWeight getW900();
+    property public final androidx.ui.text.font.FontWeight Black;
+    property public final androidx.ui.text.font.FontWeight Bold;
+    property public final androidx.ui.text.font.FontWeight ExtraBold;
+    property public final androidx.ui.text.font.FontWeight ExtraLight;
+    property public final androidx.ui.text.font.FontWeight Light;
+    property public final androidx.ui.text.font.FontWeight Medium;
+    property public final androidx.ui.text.font.FontWeight Normal;
+    property public final androidx.ui.text.font.FontWeight SemiBold;
+    property public final androidx.ui.text.font.FontWeight Thin;
+    property public final androidx.ui.text.font.FontWeight W100;
+    property public final androidx.ui.text.font.FontWeight W200;
+    property public final androidx.ui.text.font.FontWeight W300;
+    property public final androidx.ui.text.font.FontWeight W400;
+    property public final androidx.ui.text.font.FontWeight W500;
+    property public final androidx.ui.text.font.FontWeight W600;
+    property public final androidx.ui.text.font.FontWeight W700;
+    property public final androidx.ui.text.font.FontWeight W800;
+    property public final androidx.ui.text.font.FontWeight W900;
+  }
+
+  public final class FontWeightKt {
+    method public static androidx.ui.text.font.FontWeight lerp(androidx.ui.text.font.FontWeight start, androidx.ui.text.font.FontWeight stop, float fraction);
+  }
+
+  public final class GenericFontFamily extends androidx.ui.text.font.SystemFontFamily {
+    method public String getName();
+  }
+
+  public final class LoadedFontFamily extends androidx.ui.text.font.FontFamily {
+    ctor public LoadedFontFamily(androidx.ui.text.Typeface typeface);
+    method public androidx.ui.text.Typeface component1();
+    method public androidx.ui.text.font.LoadedFontFamily copy(androidx.ui.text.Typeface typeface);
+    method public androidx.ui.text.Typeface getTypeface();
+  }
+
+  public final class ResourceFont implements androidx.ui.text.font.Font {
+    ctor public ResourceFont(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+    method public int component1();
+    method public androidx.ui.text.font.FontWeight component2();
+    method public androidx.ui.text.font.FontStyle component3();
+    method public androidx.ui.text.font.ResourceFont copy(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+    method public int getResId();
+    method public androidx.ui.text.font.FontStyle getStyle();
+    method public androidx.ui.text.font.FontWeight getWeight();
+  }
+
+  public abstract sealed class SystemFontFamily extends androidx.ui.text.font.FontFamily {
+  }
+
+}
+
+package androidx.ui.text.platform {
+
+  public final class AndroidParagraphHelperKt {
+  }
+
+  public final class AndroidParagraphKt {
+  }
+
+  public final class PlatformLocaleKt {
+  }
+
+}
+
+package androidx.ui.text.style {
+
+  public final inline class BaselineShift {
+    ctor public BaselineShift();
+    method public static float constructor-impl(float multiplier);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getMultiplier();
+    method public static int hashCode-impl(float p);
+    method public static String toString-impl(float p);
+    field public static final androidx.ui.text.style.BaselineShift.Companion! Companion;
+  }
+
+  public static final class BaselineShift.Companion {
+    method public float getNone();
+    method public float getSubscript();
+    method public float getSuperscript();
+    property public final float None;
+    property public final float Subscript;
+    property public final float Superscript;
+  }
+
+  public final class BaselineShiftKt {
+    method public static float lerp-7csQwvo(float start, float stop, float fraction);
+  }
+
+  public enum TextAlign {
+    enum_constant public static final androidx.ui.text.style.TextAlign Center;
+    enum_constant public static final androidx.ui.text.style.TextAlign End;
+    enum_constant public static final androidx.ui.text.style.TextAlign Justify;
+    enum_constant public static final androidx.ui.text.style.TextAlign Left;
+    enum_constant public static final androidx.ui.text.style.TextAlign Right;
+    enum_constant public static final androidx.ui.text.style.TextAlign Start;
+  }
+
+  public final class TextDecoration {
+    method public int component1();
+    method public boolean contains(androidx.ui.text.style.TextDecoration other);
+    method public androidx.ui.text.style.TextDecoration copy(int mask);
+    method public int getMask();
+    field public static final androidx.ui.text.style.TextDecoration.Companion! Companion;
+  }
+
+  public static final class TextDecoration.Companion {
+    method public androidx.ui.text.style.TextDecoration combine(java.util.List<androidx.ui.text.style.TextDecoration> decorations);
+    method public androidx.ui.text.style.TextDecoration getLineThrough();
+    method public androidx.ui.text.style.TextDecoration getNone();
+    method public androidx.ui.text.style.TextDecoration getUnderline();
+    property public final androidx.ui.text.style.TextDecoration LineThrough;
+    property public final androidx.ui.text.style.TextDecoration None;
+    property public final androidx.ui.text.style.TextDecoration Underline;
+  }
+
+  public enum TextDirection {
+    enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
+    enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
+  }
+
+  public enum TextDirectionAlgorithm {
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrLtr;
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrRtl;
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceLtr;
+    enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceRtl;
+  }
+
+  public final class TextGeometricTransform {
+    ctor public TextGeometricTransform(float scaleX, float skewX);
+    ctor public TextGeometricTransform();
+    method public float component1();
+    method public float component2();
+    method public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
+    method public float getScaleX();
+    method public float getSkewX();
+    field public static final androidx.ui.text.style.TextGeometricTransform.Companion! Companion;
+  }
+
+  public static final class TextGeometricTransform.Companion {
+  }
+
+  public final class TextGeometricTransformKt {
+    method public static androidx.ui.text.style.TextGeometricTransform lerp(androidx.ui.text.style.TextGeometricTransform start, androidx.ui.text.style.TextGeometricTransform stop, float fraction);
+  }
+
+  public final class TextIndent {
+    method public long component1();
+    method public long component2();
+    method public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
+    method public long getFirstLine();
+    method public long getRestLine();
+    field public static final androidx.ui.text.style.TextIndent.Companion! Companion;
+  }
+
+  public static final class TextIndent.Companion {
+    method public androidx.ui.text.style.TextIndent getNone();
+    property public final androidx.ui.text.style.TextIndent None;
+  }
+
+  public final class TextIndentKt {
+    method public static androidx.ui.text.style.TextIndent lerp(androidx.ui.text.style.TextIndent start, androidx.ui.text.style.TextIndent stop, float fraction);
+  }
+
+  public enum TextOverflow {
+    enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
+    enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
+  }
+
+}
+
diff --git a/ui/ui-text-core/api/restricted_current.txt b/ui/ui-text-core/api/restricted_current.txt
index 6cea96e..fa9595d 100644
--- a/ui/ui-text-core/api/restricted_current.txt
+++ b/ui/ui-text-core/api/restricted_current.txt
@@ -762,8 +762,11 @@
   }
 
   public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+    ctor public FontWeight(int weight);
     method public int compareTo(androidx.ui.text.font.FontWeight other);
+    method public int component1();
     method public androidx.ui.text.font.FontWeight copy(int weight);
+    method public int getWeight();
     field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
   }
 
diff --git a/ui/ui-text-core/build.gradle b/ui/ui-text-core/build.gradle
index 6abae17..afaa9b7 100644
--- a/ui/ui-text-core/build.gradle
+++ b/ui/ui-text-core/build.gradle
@@ -34,7 +34,7 @@
     // TODO: Non-Kotlin dependency, move to Android-specific code
     implementation "androidx.collection:collection:1.1.0"
     // TODO: Non-Kotlin dependency, move to Android-specific code
-    implementation "androidx.core:core:1.0.2"
+    implementation "androidx.core:core:1.2.0"
 
     implementation project(":compose:compose-runtime")
     implementation project(":ui:ui-util")
diff --git a/ui/ui-text-core/src/androidTest/java/androidx/ui/text/ParagraphPlaceholderIntegrationTest.kt b/ui/ui-text-core/src/androidTest/java/androidx/ui/text/ParagraphPlaceholderIntegrationTest.kt
index 9075031..0fef88c 100644
--- a/ui/ui-text-core/src/androidTest/java/androidx/ui/text/ParagraphPlaceholderIntegrationTest.kt
+++ b/ui/ui-text-core/src/androidTest/java/androidx/ui/text/ParagraphPlaceholderIntegrationTest.kt
@@ -46,7 +46,7 @@
         // Height won't be increased. Notice: in fontFamilyMeasureFont lineHeight = 1.2 * fontSize
         assertThat(paragraph.getLineHeight(0)).isEqualTo(fontSize * 1.2f)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         assertThat(bound.bottom).isEqualTo(paragraph.firstBaseline)
         assertThat(bound.top).isEqualTo(paragraph.firstBaseline - height.value * fontSize)
         // There is one character to the left of this placeholder.
@@ -77,7 +77,7 @@
         assertThat(paragraph.getLineHeight(0))
             .isEqualTo(0.2f * fontSize + fontSize * height.value)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         assertThat(bound.bottom).isEqualTo(paragraph.firstBaseline)
         assertThat(bound.top).isEqualTo(paragraph.firstBaseline - height.value * fontSize)
         // There is one character to the left of this placeholder.
@@ -104,7 +104,7 @@
 
         assertThat(paragraph.getLineHeight(0)).isEqualTo(1.2f * fontSize)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         assertThat(bound.bottom).isEqualTo(paragraph.getLineBottom(0))
         assertThat(bound.top)
             .isEqualTo(paragraph.getLineBottom(0) - height.value * fontSize)
@@ -132,7 +132,7 @@
 
         assertThat(paragraph.getLineHeight(0)).isEqualTo(height.value * fontSize)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         assertThat(bound.bottom).isEqualTo(paragraph.getLineBottom(0))
         assertThat(bound.top)
             .isEqualTo(paragraph.getLineBottom(0) - height.value * fontSize)
@@ -160,7 +160,7 @@
 
         assertThat(paragraph.getLineHeight(0)).isEqualTo(1.2f * fontSize)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         // TODO(haoyuchang): use getLineTop instead
         assertThat(bound.top).isEqualTo(paragraph.getLineBottom(-1))
         assertThat(bound.bottom)
@@ -189,7 +189,7 @@
 
         assertThat(paragraph.getLineHeight(0)).isEqualTo(height.value * fontSize)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         // TODO(haoyuchang): use getLineTop instead
         assertThat(bound.top).isEqualTo(paragraph.getLineBottom(-1))
         assertThat(bound.bottom)
@@ -218,7 +218,7 @@
 
         assertThat(paragraph.getLineHeight(0)).isEqualTo(fontSize * 1.2f)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         // TODO(haoyuchang): We need getLineTop(0).
         val lineCenter = (paragraph.getLineBottom(-1) + paragraph.getLineBottom(0)) / 2
 
@@ -249,7 +249,7 @@
 
         assertThat(paragraph.getLineHeight(0)).isEqualTo(fontSize * height.value)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         // TODO(haoyuchang): We need getLineTop(0).
         val lineCenter = (paragraph.getLineBottom(-1) + paragraph.getLineBottom(0)) / 2
 
@@ -282,7 +282,7 @@
         val placeholderRects = paragraph.placeholderRects
         assertThat(placeholderRects.size).isEqualTo(1)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         // TextTop aligns the inline element to top of the proceeding text.
         // In the measurement font, the top equals to fontSize pixels above baseline.
         val expectedTop = paragraph.firstBaseline - fontSize
@@ -314,7 +314,7 @@
         val placeholderRects = paragraph.placeholderRects
         assertThat(placeholderRects.size).isEqualTo(1)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         // TextBottom aligns the inline element to bottom of the proceeding text.
         // In the measurement font, the bottom equals to fontSize * 0.2 pixels below baseline.
         val expectedBottom = paragraph.firstBaseline + fontSize * 0.2f
@@ -346,7 +346,7 @@
         val placeholderRects = paragraph.placeholderRects
         assertThat(placeholderRects.size).isEqualTo(1)
 
-        val bound = placeholderRects[0]
+        val bound = placeholderRects[0]!!
         // TextCenter aligns the inline element to center of the proceeding text.
         // In the measurement font, the center equals to fontSize * 0.3 pixels above baseline.
         val expectedCenter = paragraph.firstBaseline - fontSize * 0.4f
@@ -358,6 +358,31 @@
         assertThat(bound.right).isEqualTo(fontSize + fontSize * width.value)
     }
 
+    @Test
+    fun placeHolderRects_ellipsized() {
+        val text = "ABC"
+        val fontSize = 20f
+
+        val placeholder = Placeholder(1.em, 1.em, PlaceholderVerticalAlign.TextCenter)
+        val placeholders = listOf(
+            AnnotatedString.Item(placeholder, 0, 1),
+            AnnotatedString.Item(placeholder, 2, 3)
+        )
+        val paragraph = simpleParagraph(
+            text = text,
+            placeholders = placeholders,
+            fontSize = fontSize.sp,
+            width = 2 * fontSize,
+            maxLines = 1,
+            ellipsis = true
+        )
+        val placeholderRects = paragraph.placeholderRects
+        assertThat(placeholderRects.size).isEqualTo(placeholders.size)
+        assertThat(placeholderRects[0]).isNotNull()
+        // The second placeholder should be ellipsized.
+        assertThat(placeholderRects[1]).isNull()
+    }
+
     private val fontFamilyMeasureFont = FontTestData.BASIC_MEASURE_FONT.asFontFamily()
     private val defaultDensity = Density(density = 1f, fontScale = 1f)
     private val context = InstrumentationRegistry.getInstrumentation().context
@@ -367,7 +392,9 @@
         fontSize: TextUnit = TextUnit.Inherit,
         spanStyles: List<AnnotatedString.Item<SpanStyle>> = listOf(),
         placeholders: List<AnnotatedString.Item<Placeholder>> = listOf(),
-        width: Float = Float.MAX_VALUE
+        width: Float = Float.MAX_VALUE,
+        maxLines: Int = Int.MAX_VALUE,
+        ellipsis: Boolean = false
     ): Paragraph {
         return Paragraph(
             text = text,
@@ -378,7 +405,8 @@
             ),
             spanStyles = spanStyles,
             placeholders = placeholders,
-            maxLines = Int.MAX_VALUE,
+            maxLines = maxLines,
+            ellipsis = ellipsis,
             constraints = ParagraphConstraints(width = width),
             density = defaultDensity,
             resourceLoader = TestFontResourceLoader(context)
diff --git a/ui/ui-text-core/src/androidTest/java/androidx/ui/text/matchers/TypefaceSubject.kt b/ui/ui-text-core/src/androidTest/java/androidx/ui/text/matchers/TypefaceSubject.kt
index 3a3edbb..88f9d90 100644
--- a/ui/ui-text-core/src/androidTest/java/androidx/ui/text/matchers/TypefaceSubject.kt
+++ b/ui/ui-text-core/src/androidTest/java/androidx/ui/text/matchers/TypefaceSubject.kt
@@ -17,7 +17,6 @@
 package androidx.ui.text.matchers
 
 import android.graphics.Typeface
-import android.os.Build
 import android.text.TextPaint
 import androidx.ui.text.FontTestData
 import androidx.ui.text.font.FontStyle
@@ -110,16 +109,7 @@
         }!!
 
         val isSelectedFont = isSelectedFont(typeface, charInfo.character)
-
-        if (Build.VERSION.SDK_INT >= 28) {
-            check("sameTypeface()")
-                .that(isSelectedFont && typeface.weight == fontWeight.weight).isTrue()
-            // cannot check typeface.isItalic == (fontStyle == FontStyle.Italic) since it is for
-            // fake italic, and for cases where synthesis is disable this does not give correct
-            // signal
-        } else {
-            check("sameTypeface()").that(isSelectedFont).isTrue()
-        }
+        check("sameTypeface()").that(isSelectedFont).isTrue()
     }
 
     override fun actualCustomStringRepresentation(): String {
diff --git a/ui/ui-text-core/src/androidTest/java/androidx/ui/text/platform/AndroidTypefaceTest.kt b/ui/ui-text-core/src/androidTest/java/androidx/ui/text/platform/AndroidTypefaceTest.kt
index 6adbe70..7a0025a 100644
--- a/ui/ui-text-core/src/androidTest/java/androidx/ui/text/platform/AndroidTypefaceTest.kt
+++ b/ui/ui-text-core/src/androidTest/java/androidx/ui/text/platform/AndroidTypefaceTest.kt
@@ -23,6 +23,7 @@
 import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.ui.text.FontTestData
+import androidx.ui.text.core.test.R
 import androidx.ui.text.font.FontFamily
 import androidx.ui.text.font.FontMatcher
 import androidx.ui.text.font.FontStyle
@@ -32,7 +33,6 @@
 import androidx.ui.text.font.font
 import androidx.ui.text.font.fontFamily
 import androidx.ui.text.matchers.assertThat
-import androidx.ui.text.core.test.R
 import androidx.ui.text.typefaceFromFontFamily
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.any
@@ -471,20 +471,17 @@
     }
 
     @Test
-    fun fontSynthesisAll_doesNotSynthesizeIfFontIsTheSame_beforeApi28() {
+    fun fontSynthesisAll_doesNotSynthesizeIfFontIsTheSame() {
         val fontFamily = FontTestData.FONT_700_ITALIC.asFontFamily()
 
         val typeface = androidTypefaceFromFontFamily(context, fontFamily)
             .getNativeTypeface(FontWeight.W700, FontStyle.Italic, FontSynthesis.All)
         assertThat(typeface.isItalic).isFalse()
 
-        if (Build.VERSION.SDK_INT < 23) {
-            assertThat(typeface.isBold).isFalse()
-        } else if (Build.VERSION.SDK_INT < 28) {
-            assertThat(typeface.isBold).isTrue()
-        } else {
-            assertThat(typeface.isBold).isTrue()
-            assertThat(typeface.weight).isEqualTo(700)
+        when {
+            Build.VERSION.SDK_INT < 23 -> assertThat(typeface.isBold).isFalse()
+            Build.VERSION.SDK_INT <= 28 -> assertThat(typeface.isBold).isTrue()
+            else -> assertThat(typeface.isBold).isFalse()
         }
     }
 
diff --git a/ui/ui-text-core/src/androidTest/java/androidx/ui/text/platform/TypefaceAdapterTest.kt b/ui/ui-text-core/src/androidTest/java/androidx/ui/text/platform/TypefaceAdapterTest.kt
index 419d336..07690dc 100644
--- a/ui/ui-text-core/src/androidTest/java/androidx/ui/text/platform/TypefaceAdapterTest.kt
+++ b/ui/ui-text-core/src/androidTest/java/androidx/ui/text/platform/TypefaceAdapterTest.kt
@@ -39,16 +39,16 @@
 import androidx.ui.text.FontTestData.Companion.FONT_900_ITALIC
 import androidx.ui.text.FontTestData.Companion.FONT_900_REGULAR
 import androidx.ui.text.TestFontResourceLoader
+import androidx.ui.text.core.test.R
 import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.font
-import androidx.ui.text.font.fontFamily
 import androidx.ui.text.font.FontMatcher
 import androidx.ui.text.font.FontStyle
 import androidx.ui.text.font.FontSynthesis
 import androidx.ui.text.font.FontWeight
 import androidx.ui.text.font.asFontFamily
+import androidx.ui.text.font.font
+import androidx.ui.text.font.fontFamily
 import androidx.ui.text.matchers.assertThat
-import androidx.ui.text.core.test.R
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.eq
@@ -469,7 +469,7 @@
     }
 
     @Test
-    fun fontSynthesisAll_doesNotSynthesizeIfFontIsTheSame_beforeApi28() {
+    fun fontSynthesisAll_doesNotSynthesizeIfFontIsTheSame() {
         val fontFamily = FONT_700_ITALIC.asFontFamily()
 
         val typeface = TypefaceAdapter().create(
@@ -480,13 +480,10 @@
         )
         assertThat(typeface.isItalic).isFalse()
 
-        if (Build.VERSION.SDK_INT < 23) {
-            assertThat(typeface.isBold).isFalse()
-        } else if (Build.VERSION.SDK_INT < 28) {
-            assertThat(typeface.isBold).isTrue()
-        } else {
-            assertThat(typeface.isBold).isTrue()
-            assertThat(typeface.weight).isEqualTo(700)
+        when {
+            Build.VERSION.SDK_INT < 23 -> assertThat(typeface.isBold).isFalse()
+            Build.VERSION.SDK_INT <= 28 -> assertThat(typeface.isBold).isTrue()
+            else -> assertThat(typeface.isBold).isFalse()
         }
     }
 
diff --git a/ui/ui-text-core/src/main/java/androidx/ui/text/MultiParagraph.kt b/ui/ui-text-core/src/main/java/androidx/ui/text/MultiParagraph.kt
index a056f6d..1a761ac 100644
--- a/ui/ui-text-core/src/main/java/androidx/ui/text/MultiParagraph.kt
+++ b/ui/ui-text-core/src/main/java/androidx/ui/text/MultiParagraph.kt
@@ -155,8 +155,10 @@
      * The bounding boxes reserved for the input placeholders in this MultiParagraph. Their
      * locations are relative to this MultiParagraph's coordinate. The order of this list
      * corresponds to that of input placeholders.
+     * Notice that [Rect] in [placeholderRects] is nullable. When [Rect] is null, it indicates
+     * that the corresponding [Placeholder] is ellipsized.
      */
-    val placeholderRects: List<Rect>
+    val placeholderRects: List<Rect?>
 
     /* This is internal for testing purpose. */
     internal val paragraphInfoList: List<ParagraphInfo>
@@ -210,7 +212,16 @@
         this.width = constraints.width
         this.placeholderRects = paragraphInfoList.flatMap { paragraphInfo ->
             with(paragraphInfo) {
-                paragraph.placeholderRects.map { it.toGlobal() }
+                paragraph.placeholderRects.map { it?.toGlobal() }
+            }
+        }.let {
+            // When paragraphs get ellipsized, the size of this list will be smaller than
+            // the input placeholders. In this case, fill this list with null so that it has the
+            // same size as the input placeholders.
+            if (it.size < intrinsics.placeholders.size) {
+                it + List(intrinsics.placeholders.size - it.size) { null }
+            } else {
+                it
             }
         }
     }
diff --git a/ui/ui-text-core/src/main/java/androidx/ui/text/Paragraph.kt b/ui/ui-text-core/src/main/java/androidx/ui/text/Paragraph.kt
index 253dd6c8..4a9bf47 100644
--- a/ui/ui-text-core/src/main/java/androidx/ui/text/Paragraph.kt
+++ b/ui/ui-text-core/src/main/java/androidx/ui/text/Paragraph.kt
@@ -98,8 +98,10 @@
      * The bounding boxes reserved for the input placeholders in this Paragraphs. Their locations
      * are relative to this Paragraph's coordinate. The order of this list corresponds to that of
      * input placeholders.
+     * Notice that [Rect] in [placeholderRects] is nullable. When [Rect] is null, it indicates
+     * that the corresponding [Placeholder] is ellipsized.
      */
-    val placeholderRects: List<Rect>
+    val placeholderRects: List<Rect?>
 
     /** Returns path that enclose the given text range. */
     fun getPathForRange(start: Int, end: Int): Path
diff --git a/ui/ui-text-core/src/main/java/androidx/ui/text/SpanStyle.kt b/ui/ui-text-core/src/main/java/androidx/ui/text/SpanStyle.kt
index f0bf683..6b63b54 100644
--- a/ui/ui-text-core/src/main/java/androidx/ui/text/SpanStyle.kt
+++ b/ui/ui-text-core/src/main/java/androidx/ui/text/SpanStyle.kt
@@ -146,8 +146,7 @@
  */
 fun lerp(start: SpanStyle, stop: SpanStyle, fraction: Float): SpanStyle {
     return SpanStyle(
-        color = lerp(start.color.useOrElse { Color.Black }, stop.color.useOrElse { Color.Black },
-            fraction),
+        color = lerp(start.color, stop.color, fraction),
         fontFamily = lerpDiscrete(
             start.fontFamily,
             stop.fontFamily,
@@ -191,8 +190,8 @@
         ),
         localeList = lerpDiscrete(start.localeList, stop.localeList, fraction),
         background = lerp(
-            start.background.useOrElse { Color.Transparent },
-            stop.background.useOrElse { Color.Transparent },
+            start.background,
+            stop.background,
             fraction
         ),
         textDecoration = lerpDiscrete(
diff --git a/ui/ui-text-core/src/main/java/androidx/ui/text/TextLayoutResult.kt b/ui/ui-text-core/src/main/java/androidx/ui/text/TextLayoutResult.kt
index b702b0f..9f6e9d8 100644
--- a/ui/ui-text-core/src/main/java/androidx/ui/text/TextLayoutResult.kt
+++ b/ui/ui-text-core/src/main/java/androidx/ui/text/TextLayoutResult.kt
@@ -147,7 +147,7 @@
      * @see TextLayoutInput.placeholders
      * @see Placeholder
      */
-    val placeholderRects: List<Rect> = multiParagraph.placeholderRects
+    val placeholderRects: List<Rect?> = multiParagraph.placeholderRects
 
     /**
      * Returns the end offset of the given line, inclusive.
diff --git a/ui/ui-text-core/src/main/java/androidx/ui/text/TextStyle.kt b/ui/ui-text-core/src/main/java/androidx/ui/text/TextStyle.kt
index 6dbf752..fca6e0a 100644
--- a/ui/ui-text-core/src/main/java/androidx/ui/text/TextStyle.kt
+++ b/ui/ui-text-core/src/main/java/androidx/ui/text/TextStyle.kt
@@ -39,8 +39,8 @@
 private val DefaultFontSize = 14.sp
 private val DefaultLetterSpacing = 0.sp
 private val DefaultBackgroundColor = Color.Transparent
-// FIXME: Introduce TextUnit.Original for representing "do not change the original result". Need to
-// distinguish from Inherit.
+// TODO(nona): Introduce TextUnit.Original for representing "do not change the original result".
+//  Need to distinguish from Inherit.
 private val DefaultLineHeight = TextUnit.Inherit
 private val DefaultColor = Color.Black
 
diff --git a/ui/ui-text-core/src/main/java/androidx/ui/text/font/FontWeight.kt b/ui/ui-text-core/src/main/java/androidx/ui/text/font/FontWeight.kt
index 7de5b65..f3c6e12 100644
--- a/ui/ui-text-core/src/main/java/androidx/ui/text/font/FontWeight.kt
+++ b/ui/ui-text-core/src/main/java/androidx/ui/text/font/FontWeight.kt
@@ -21,16 +21,19 @@
 /**
  * The thickness of the glyphs, in a range of [1, 1000].
  *
+ * @param weight Font weight value in the range of [1, 1000]
+ *
  * @see Font
  * @see FontFamily
  */
 @Immutable
-/* inline */ data class FontWeight private constructor(
-    /**
-     * Can be in the range of [1,1000]
-     */
-    internal val weight: Int
-) : Comparable<FontWeight> {
+/* inline */ data class FontWeight(val weight: Int) : Comparable<FontWeight> {
+
+    init {
+        require(weight in 1..1000) {
+            "Font weight can be in range [1, 1000]. Current value: $weight"
+        }
+    }
 
     companion object {
         /** [Thin] */
@@ -87,33 +90,13 @@
         )
     }
 
-    internal val index: Int get() = weight / 100 - 1
-
     override fun compareTo(other: FontWeight): Int {
         return weight.compareTo(other.weight)
     }
-
-    override fun toString(): String {
-        return when (index) {
-            0 -> "FontWeight.W100"
-            1 -> "FontWeight.W200"
-            2 -> "FontWeight.W300"
-            3 -> "FontWeight.W400"
-            4 -> "FontWeight.W500"
-            5 -> "FontWeight.W600"
-            6 -> "FontWeight.W700"
-            7 -> "FontWeight.W800"
-            8 -> "FontWeight.W900"
-            else -> "FontWeight Unknown"
-        }
-    }
 }
 
 /**
- * Linearly interpolate between two font weights
- *
- * Rather than using fractional weights, the interpolation rounds to the
- * nearest weight.
+ * Linearly interpolate between two font weights.
  *
  * The [fraction] argument represents position on the timeline, with 0.0 meaning
  * that the interpolation has not started, returning [start] (or something
@@ -128,8 +111,6 @@
  * an `AnimationController`.
  */
 fun lerp(start: FontWeight, stop: FontWeight, fraction: Float): FontWeight {
-    val index = lerp(start.index, stop.index, fraction)
-        .coerceIn(0, FontWeight.values.size - 1)
-
-    return FontWeight.values[index]
-}
\ No newline at end of file
+    val weight = lerp(start.weight, stop.weight, fraction).coerceIn(1, 1000)
+    return FontWeight(weight)
+}
diff --git a/ui/ui-text-core/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt b/ui/ui-text-core/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
index fcc317de..5759ec3 100644
--- a/ui/ui-text-core/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
+++ b/ui/ui-text-core/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
@@ -148,13 +148,18 @@
     override val lineCount: Int
         get() = layout.lineCount
 
-    override val placeholderRects: List<Rect> =
+    override val placeholderRects: List<Rect?> =
         with(paragraphIntrinsics.charSequence) {
             if (this !is Spanned) return@with listOf()
             getSpans(0, length, PlaceholderSpan::class.java).map { span ->
                 val start = getSpanStart(span)
                 val end = getSpanEnd(span)
                 val line = layout.getLineForOffset(start)
+                // This Placeholder is ellipsized, return null instead.
+                if (layout.getLineEllipsisCount(line) > 0 &&
+                    end > layout.getLineEllipsisOffset(line)) {
+                    return@map null
+                }
 
                 val left = getHorizontalPosition(start, true)
                 val right = getHorizontalPosition(end, true)
@@ -293,6 +298,7 @@
     /**
      * @return true if the given line is ellipsized, else false.
      */
+    @VisibleForTesting
     internal fun isEllipsisApplied(lineIndex: Int): Boolean =
         layout.isEllipsisApplied(lineIndex)
 
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/SpanStyleTest.kt b/ui/ui-text-core/src/test/java/androidx/ui/text/SpanStyleTest.kt
index 3c47328..4f16b10 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/SpanStyleTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/ui/text/SpanStyleTest.kt
@@ -393,6 +393,29 @@
     }
 
     @Test
+    fun `lerp color with a and b are Unset`() {
+        val style1 = SpanStyle(color = Color.Unset)
+        val style2 = SpanStyle(color = Color.Unset)
+
+        val newSpanStyle = lerp(start = style1, stop = style2, fraction = 0.3f)
+
+        assertThat(newSpanStyle.color).isEqualTo(Color.Unset)
+    }
+
+    @Test
+    fun `lerp color with a is set, and b is Unset`() {
+        val t = 0.3f
+        val color1 = Color.Red
+        val color2 = Color.Unset
+        val style1 = SpanStyle(color = color1)
+        val style2 = SpanStyle(color = color2)
+
+        val newSpanStyle = lerp(start = style1, stop = style2, fraction = t)
+
+        assertThat(newSpanStyle.color).isEqualTo(lerp(start = color1, stop = color2, fraction = t))
+    }
+
+    @Test
     fun `lerp fontFamily with a and b are not Null and t is smaller than half`() {
         val fontFamily1 = FontFamily.SansSerif
         val fontFamily2 = FontFamily.Serif
@@ -594,19 +617,20 @@
 
         val newSpanStyle = lerp(start = style1, stop = style2, fraction = 0.1f)
 
-        assertThat(newSpanStyle.background).isEqualTo(Color.Transparent)
+        assertThat(newSpanStyle.background).isEqualTo(Color.Unset)
     }
 
     @Test
     fun `lerp background with a is Null and b is not Null`() {
         val t = 0.1f
-        val style1 = SpanStyle(background = Color.Unset)
+        val color1 = Color.Unset
+        val style1 = SpanStyle(background = color1)
         val color2 = Color.Red
         val style2 = SpanStyle(background = color2)
 
         val newSpanStyle = lerp(start = style1, stop = style2, fraction = t)
 
-        assertThat(newSpanStyle.background).isEqualTo(lerp(Color.Transparent, color2, t))
+        assertThat(newSpanStyle.background).isEqualTo(lerp(color1, color2, t))
     }
 
     @Test
@@ -618,7 +642,7 @@
 
         val newSpanStyle = lerp(start = style1, stop = style2, fraction = t)
 
-        assertThat(newSpanStyle.background).isEqualTo(lerp(color1, Color.Transparent, t))
+        assertThat(newSpanStyle.background).isEqualTo(lerp(color1, Color.Unset, t))
     }
 
     @Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/TextStyleTest.kt b/ui/ui-text-core/src/test/java/androidx/ui/text/TextStyleTest.kt
index 13b48f8..2e4e9d8 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/TextStyleTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/ui/text/TextStyleTest.kt
@@ -713,7 +713,7 @@
 
         val newStyle = lerp(start = style1, stop = style2, fraction = 0.1f)
 
-        assertThat(newStyle.background).isEqualTo(Color.Transparent)
+        assertThat(newStyle.background).isEqualTo(Color.Unset)
     }
 
     @Test
@@ -725,7 +725,7 @@
 
         val newStyle = lerp(start = style1, stop = style2, fraction = t)
 
-        assertThat(newStyle.background).isEqualTo(lerp(Color.Transparent, color2, t))
+        assertThat(newStyle.background).isEqualTo(lerp(Color.Unset, color2, t))
     }
 
     @Test
@@ -737,7 +737,7 @@
 
         val newStyle = lerp(start = style1, stop = style2, fraction = t)
 
-        assertThat(newStyle.background).isEqualTo(lerp(color1, Color.Transparent, t))
+        assertThat(newStyle.background).isEqualTo(lerp(color1, Color.Unset, t))
     }
 
     @Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontWeightTest.kt b/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontWeightTest.kt
index b0d0b6d..831fe5d 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontWeightTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontWeightTest.kt
@@ -23,6 +23,26 @@
 @RunWith(JUnit4::class)
 class FontWeightTest {
     @Test
+    fun `constructor accept 1000`() {
+        assertThat(FontWeight(1000).weight).isEqualTo(1000)
+    }
+
+    @Test
+    fun `constructor accept 1`() {
+        assertThat(FontWeight(1).weight).isEqualTo(1)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun `constructor does not accept greater than 1000`() {
+        FontWeight(1001)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun `constructor does not accept less than 1`() {
+        FontWeight(0)
+    }
+
+    @Test
     fun `lerp at start returns start value`() {
         assertThat(
             lerp(
@@ -34,6 +54,12 @@
     }
 
     @Test
+    fun `lerp at start returns font weight 1`() {
+        val start = FontWeight(1)
+        assertThat(lerp(start, FontWeight.W400, 0.0f)).isEqualTo(start)
+    }
+
+    @Test
     fun `lerp at end returns end value`() {
         assertThat(
             lerp(
@@ -57,19 +83,15 @@
 
     @Test
     fun `lerp in the mid-time with odd distance should be rounded to up`() {
+        val start = FontWeight.W200
+        val stop = FontWeight.W900
         assertThat(
             lerp(
-                FontWeight.W200,
-                FontWeight.W900,
+                start,
+                stop,
                 0.5f
             )
-        ).isEqualTo(FontWeight.W600)
-    }
-
-    @Test
-    fun `toString return FontsWeight`() {
-        assertThat(FontWeight.W100.toString()).isEqualTo("FontWeight.W100")
-        assertThat(FontWeight.W900.toString()).isEqualTo("FontWeight.W900")
+        ).isEqualTo(FontWeight(((stop.weight + start.weight) * 0.5).toInt()))
     }
 
     @Test
diff --git a/ui/ui-text/api/0.1.0-dev11.txt b/ui/ui-text/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..90dc2cc
--- /dev/null
+++ b/ui/ui-text/api/0.1.0-dev11.txt
@@ -0,0 +1,25 @@
+// Signature format: 3.0
+package androidx.ui.text {
+
+  public final class CoreTextFieldKt {
+    method public static void CoreTextField(androidx.ui.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.EditorValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+  }
+
+  public final class CoreTextKt {
+    method public static void CoreText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, int maxLines, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
+    method public static androidx.ui.core.HorizontalAlignmentLine getFirstBaseline();
+    method public static androidx.ui.core.HorizontalAlignmentLine getLastBaseline();
+  }
+
+  public final class TextFieldDelegateKt {
+  }
+
+}
+
+package androidx.ui.text.selection {
+
+  public final class TextSelectionDelegateKt {
+  }
+
+}
+
diff --git a/ui/ui-text/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-text/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..90dc2cc
--- /dev/null
+++ b/ui/ui-text/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,25 @@
+// Signature format: 3.0
+package androidx.ui.text {
+
+  public final class CoreTextFieldKt {
+    method public static void CoreTextField(androidx.ui.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.EditorValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+  }
+
+  public final class CoreTextKt {
+    method public static void CoreText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, int maxLines, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
+    method public static androidx.ui.core.HorizontalAlignmentLine getFirstBaseline();
+    method public static androidx.ui.core.HorizontalAlignmentLine getLastBaseline();
+  }
+
+  public final class TextFieldDelegateKt {
+  }
+
+}
+
+package androidx.ui.text.selection {
+
+  public final class TextSelectionDelegateKt {
+  }
+
+}
+
diff --git a/ui/ui-text/api/res-0.1.0-dev11.txt b/ui/ui-text/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-text/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-text/api/restricted_0.1.0-dev11.txt b/ui/ui-text/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..90dc2cc
--- /dev/null
+++ b/ui/ui-text/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,25 @@
+// Signature format: 3.0
+package androidx.ui.text {
+
+  public final class CoreTextFieldKt {
+    method public static void CoreTextField(androidx.ui.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.EditorValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onFocusChange = {}, String? focusIdentifier = null, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed = {}, androidx.ui.input.VisualTransformation? visualTransformation = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout = {});
+  }
+
+  public final class CoreTextKt {
+    method public static void CoreText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, int maxLines, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
+    method public static androidx.ui.core.HorizontalAlignmentLine getFirstBaseline();
+    method public static androidx.ui.core.HorizontalAlignmentLine getLastBaseline();
+  }
+
+  public final class TextFieldDelegateKt {
+  }
+
+}
+
+package androidx.ui.text.selection {
+
+  public final class TextSelectionDelegateKt {
+  }
+
+}
+
diff --git a/ui/ui-tooling/api/0.1.0-dev11.txt b/ui/ui-tooling/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..2f3c00f
--- /dev/null
+++ b/ui/ui-tooling/api/0.1.0-dev11.txt
@@ -0,0 +1,98 @@
+// Signature format: 3.0
+package androidx.ui.tooling {
+
+  public final class CallGroup extends androidx.ui.tooling.Group {
+    ctor public CallGroup(Object? key, androidx.ui.unit.IntPxBounds box, java.util.Collection<?> data, java.util.Collection<? extends androidx.ui.tooling.Group> children);
+  }
+
+  public abstract sealed class Group {
+    method public final androidx.ui.unit.IntPxBounds getBox();
+    method public final java.util.Collection<androidx.ui.tooling.Group> getChildren();
+    method public final java.util.Collection<java.lang.Object> getData();
+    method public final Object? getKey();
+    method public final java.util.List<androidx.ui.core.ModifierInfo> getModifierInfo();
+  }
+
+  public final class InspectableKt {
+    method public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Inspectable(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static java.util.Set<androidx.compose.SlotTable>! getTables();
+  }
+
+  public final class JoinedKey {
+    ctor public JoinedKey(Object? left, Object? right);
+    method public Object? component1();
+    method public Object? component2();
+    method public androidx.ui.tooling.JoinedKey copy(Object? left, Object? right);
+    method public Object? getLeft();
+    method public Object? getRight();
+  }
+
+  public final class NodeGroup extends androidx.ui.tooling.Group {
+    ctor public NodeGroup(Object? key, Object node, androidx.ui.unit.IntPxBounds box, java.util.Collection<?> data, java.util.List<androidx.ui.core.ModifierInfo> modifierInfo, java.util.Collection<? extends androidx.ui.tooling.Group> children);
+    method public Object getNode();
+  }
+
+  public final class SlotTreeKt {
+    method public static androidx.ui.tooling.Group asTree(androidx.compose.SlotTable);
+    method public static String? getPosition(androidx.ui.tooling.Group);
+  }
+
+}
+
+package androidx.ui.tooling.preview {
+
+  public final class ComposeViewAdapterKt {
+    field public static final String TOOLS_NS_URI = "http://schemas.android.com/tools";
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.FUNCTION) public @interface Preview {
+    method public abstract int apiLevel() default -1;
+    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 showDecoration() default false;
+    method public abstract String theme() default "";
+    method public abstract int widthDp() default -1;
+  }
+
+  @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.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.ui.tooling.preview.datasource {
+
+  public class CollectionPreviewParameterProvider<T> implements androidx.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.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 {
+  }
+
+}
+
diff --git a/ui/ui-tooling/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-tooling/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..2f3c00f
--- /dev/null
+++ b/ui/ui-tooling/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,98 @@
+// Signature format: 3.0
+package androidx.ui.tooling {
+
+  public final class CallGroup extends androidx.ui.tooling.Group {
+    ctor public CallGroup(Object? key, androidx.ui.unit.IntPxBounds box, java.util.Collection<?> data, java.util.Collection<? extends androidx.ui.tooling.Group> children);
+  }
+
+  public abstract sealed class Group {
+    method public final androidx.ui.unit.IntPxBounds getBox();
+    method public final java.util.Collection<androidx.ui.tooling.Group> getChildren();
+    method public final java.util.Collection<java.lang.Object> getData();
+    method public final Object? getKey();
+    method public final java.util.List<androidx.ui.core.ModifierInfo> getModifierInfo();
+  }
+
+  public final class InspectableKt {
+    method public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Inspectable(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static java.util.Set<androidx.compose.SlotTable>! getTables();
+  }
+
+  public final class JoinedKey {
+    ctor public JoinedKey(Object? left, Object? right);
+    method public Object? component1();
+    method public Object? component2();
+    method public androidx.ui.tooling.JoinedKey copy(Object? left, Object? right);
+    method public Object? getLeft();
+    method public Object? getRight();
+  }
+
+  public final class NodeGroup extends androidx.ui.tooling.Group {
+    ctor public NodeGroup(Object? key, Object node, androidx.ui.unit.IntPxBounds box, java.util.Collection<?> data, java.util.List<androidx.ui.core.ModifierInfo> modifierInfo, java.util.Collection<? extends androidx.ui.tooling.Group> children);
+    method public Object getNode();
+  }
+
+  public final class SlotTreeKt {
+    method public static androidx.ui.tooling.Group asTree(androidx.compose.SlotTable);
+    method public static String? getPosition(androidx.ui.tooling.Group);
+  }
+
+}
+
+package androidx.ui.tooling.preview {
+
+  public final class ComposeViewAdapterKt {
+    field public static final String TOOLS_NS_URI = "http://schemas.android.com/tools";
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.FUNCTION) public @interface Preview {
+    method public abstract int apiLevel() default -1;
+    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 showDecoration() default false;
+    method public abstract String theme() default "";
+    method public abstract int widthDp() default -1;
+  }
+
+  @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.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.ui.tooling.preview.datasource {
+
+  public class CollectionPreviewParameterProvider<T> implements androidx.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.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 {
+  }
+
+}
+
diff --git a/ui/ui-tooling/api/res-0.1.0-dev11.txt b/ui/ui-tooling/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-tooling/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-tooling/api/restricted_0.1.0-dev11.txt b/ui/ui-tooling/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..2f3c00f
--- /dev/null
+++ b/ui/ui-tooling/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,98 @@
+// Signature format: 3.0
+package androidx.ui.tooling {
+
+  public final class CallGroup extends androidx.ui.tooling.Group {
+    ctor public CallGroup(Object? key, androidx.ui.unit.IntPxBounds box, java.util.Collection<?> data, java.util.Collection<? extends androidx.ui.tooling.Group> children);
+  }
+
+  public abstract sealed class Group {
+    method public final androidx.ui.unit.IntPxBounds getBox();
+    method public final java.util.Collection<androidx.ui.tooling.Group> getChildren();
+    method public final java.util.Collection<java.lang.Object> getData();
+    method public final Object? getKey();
+    method public final java.util.List<androidx.ui.core.ModifierInfo> getModifierInfo();
+  }
+
+  public final class InspectableKt {
+    method public static void InInspectionModeOnly(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static void Inspectable(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public static java.util.Set<androidx.compose.SlotTable>! getTables();
+  }
+
+  public final class JoinedKey {
+    ctor public JoinedKey(Object? left, Object? right);
+    method public Object? component1();
+    method public Object? component2();
+    method public androidx.ui.tooling.JoinedKey copy(Object? left, Object? right);
+    method public Object? getLeft();
+    method public Object? getRight();
+  }
+
+  public final class NodeGroup extends androidx.ui.tooling.Group {
+    ctor public NodeGroup(Object? key, Object node, androidx.ui.unit.IntPxBounds box, java.util.Collection<?> data, java.util.List<androidx.ui.core.ModifierInfo> modifierInfo, java.util.Collection<? extends androidx.ui.tooling.Group> children);
+    method public Object getNode();
+  }
+
+  public final class SlotTreeKt {
+    method public static androidx.ui.tooling.Group asTree(androidx.compose.SlotTable);
+    method public static String? getPosition(androidx.ui.tooling.Group);
+  }
+
+}
+
+package androidx.ui.tooling.preview {
+
+  public final class ComposeViewAdapterKt {
+    field public static final String TOOLS_NS_URI = "http://schemas.android.com/tools";
+  }
+
+  @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.FUNCTION) public @interface Preview {
+    method public abstract int apiLevel() default -1;
+    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 showDecoration() default false;
+    method public abstract String theme() default "";
+    method public abstract int widthDp() default -1;
+  }
+
+  @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.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.ui.tooling.preview.datasource {
+
+  public class CollectionPreviewParameterProvider<T> implements androidx.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.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 {
+  }
+
+}
+
diff --git a/ui/ui-unit/api/0.1.0-dev11.txt b/ui/ui-unit/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..2f30c03
--- /dev/null
+++ b/ui/ui-unit/api/0.1.0-dev11.txt
@@ -0,0 +1,652 @@
+// Signature format: 3.0
+package androidx.ui.unit {
+
+  public final class Bounds {
+    ctor public Bounds(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.unit.Bounds copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getLeft();
+    method public androidx.ui.unit.Dp getRight();
+    method public androidx.ui.unit.Dp getTop();
+  }
+
+  public interface Density {
+    method public float getDensity();
+    method public float getFontScale();
+    method public default androidx.ui.unit.Dp toDp(float);
+    method public default androidx.ui.unit.Dp toDp(int);
+    method public default androidx.ui.unit.Dp toDp-NgWp0Z8(float);
+    method public default androidx.ui.unit.Dp toDp-gshw56o(int);
+    method public default androidx.ui.unit.Dp toDp-vVlMl6k(long);
+    method public default int toIntPx(androidx.ui.unit.Dp);
+    method public default int toIntPx-vVlMl6k(long);
+    method public default float toPx(androidx.ui.unit.Dp);
+    method public default androidx.ui.unit.PxSize toPx-kAYDl8w(long);
+    method public default float toPx-vVlMl6k(long);
+    method public default androidx.ui.geometry.Rect toRect(androidx.ui.unit.Bounds);
+    method public default long toSp(androidx.ui.unit.Dp);
+    method public default long toSp(float);
+    method public default long toSp(int);
+    method public default long toSp-NgWp0Z8(float);
+    method public default long toSp-gshw56o(int);
+    property public abstract float density;
+    property public abstract float fontScale;
+  }
+
+  public final class DensityKt {
+    method public static androidx.ui.unit.Density Density(android.content.Context context);
+    method public static androidx.ui.unit.Density Density(float density, float fontScale = 1f);
+  }
+
+  public final class Dp implements java.lang.Comparable<androidx.ui.unit.Dp> {
+    ctor public Dp(float value);
+    method public operator int compareTo(androidx.ui.unit.Dp other);
+    method public float component1();
+    method public androidx.ui.unit.Dp copy(float value);
+    method public inline operator androidx.ui.unit.Dp div(float other);
+    method public inline operator androidx.ui.unit.Dp div(int other);
+    method public inline operator float div(androidx.ui.unit.Dp other);
+    method public inline operator float div-x8crYZs(float other);
+    method public float getValue();
+    method public inline operator androidx.ui.unit.Dp minus(androidx.ui.unit.Dp other);
+    method public inline operator androidx.ui.unit.Dp plus(androidx.ui.unit.Dp other);
+    method public inline operator androidx.ui.unit.Dp times(float other);
+    method public inline operator androidx.ui.unit.Dp times(int other);
+    method public inline operator float times(androidx.ui.unit.Dp other);
+    method public inline operator float times-x8crYZs(float other);
+    method public inline operator androidx.ui.unit.Dp unaryMinus();
+    field public static final androidx.ui.unit.Dp.Companion! Companion;
+  }
+
+  public static final class Dp.Companion {
+    method public androidx.ui.unit.Dp getHairline();
+    method public androidx.ui.unit.Dp getInfinity();
+    method public androidx.ui.unit.Dp getUnspecified();
+    property public final androidx.ui.unit.Dp Hairline;
+    property public final androidx.ui.unit.Dp Infinity;
+    property public final androidx.ui.unit.Dp Unspecified;
+  }
+
+  public final inline class DpCubed implements java.lang.Comparable<androidx.ui.unit.DpCubed> {
+    ctor public DpCubed();
+    method public operator int compareTo-JDqhs2g(float p);
+    method public static operator int compareTo-JDqhs2g(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-JDqhs2g(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static inline operator float div-impl(float $this, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp div-x8crYZs(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-JDqhs2g(float $this, float dimension);
+    method public static inline operator float plus-JDqhs2g(float $this, float dimension);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final inline class DpInverse implements java.lang.Comparable<androidx.ui.unit.DpInverse> {
+    ctor public DpInverse();
+    method public operator int compareTo-_K2iRR8(float p);
+    method public static operator int compareTo-_K2iRR8(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-_K2iRR8(float $this, float dimension);
+    method public static inline operator float plus-_K2iRR8(float $this, float dimension);
+    method public static inline operator float times-JDqhs2g(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static inline operator float times-impl(float $this, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp times-x8crYZs(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final class DpKt {
+    method public static inline long Position(androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+    method public static inline long Size(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public static long center-kAYDl8w(long);
+    method public static inline androidx.ui.unit.Dp coerceAtLeast(androidx.ui.unit.Dp, androidx.ui.unit.Dp minimumValue);
+    method public static inline androidx.ui.unit.Dp coerceAtMost(androidx.ui.unit.Dp, androidx.ui.unit.Dp maximumValue);
+    method public static inline androidx.ui.unit.Dp coerceIn(androidx.ui.unit.Dp, androidx.ui.unit.Dp minimumValue, androidx.ui.unit.Dp maximumValue);
+    method public static inline operator float div(float, androidx.ui.unit.Dp other);
+    method public static inline operator float div(double, androidx.ui.unit.Dp other);
+    method public static inline operator float div(int, androidx.ui.unit.Dp other);
+    method public static androidx.ui.unit.Dp getDistance-T8eBu-w(long);
+    method public static inline androidx.ui.unit.Dp getDp(int);
+    method public static inline androidx.ui.unit.Dp getDp(double);
+    method public static inline androidx.ui.unit.Dp getDp(float);
+    method public static inline androidx.ui.unit.Dp getHeight(androidx.ui.unit.Bounds);
+    method public static inline androidx.ui.unit.Dp getWidth(androidx.ui.unit.Bounds);
+    method public static inline boolean isFinite(androidx.ui.unit.Dp);
+    method public static androidx.ui.unit.Dp lerp(androidx.ui.unit.Dp start, androidx.ui.unit.Dp stop, float fraction);
+    method public static long lerp-d5NHFfI(long start, long stop, float fraction);
+    method public static inline androidx.ui.unit.Dp max(androidx.ui.unit.Dp a, androidx.ui.unit.Dp b);
+    method public static inline androidx.ui.unit.Dp min(androidx.ui.unit.Dp a, androidx.ui.unit.Dp b);
+    method public static inline operator androidx.ui.unit.Dp times(float, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp times(double, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp times(int, androidx.ui.unit.Dp other);
+    method public static inline operator long times--D0i1nw(float, long size);
+    method public static inline operator long times-DdskrAE(int, long size);
+    method public static inline operator long times-l9Tz9ww(double, long size);
+    method public static androidx.ui.unit.Bounds toBounds-kAYDl8w(long);
+    method public static inline long toSize(androidx.ui.unit.Bounds);
+  }
+
+  public final inline class DpSquared implements java.lang.Comparable<androidx.ui.unit.DpSquared> {
+    ctor public DpSquared();
+    method public operator int compareTo-x8crYZs(float p);
+    method public static operator int compareTo-x8crYZs(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-JDqhs2g(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static inline operator androidx.ui.unit.Dp div-impl(float $this, androidx.ui.unit.Dp other);
+    method public static inline operator float div-x8crYZs(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-x8crYZs(float $this, float other);
+    method public static inline operator float plus-x8crYZs(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static inline operator float times-impl(float $this, androidx.ui.unit.Dp other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final class Duration implements java.lang.Comparable<androidx.ui.unit.Duration> {
+    ctor public Duration(long nanoseconds);
+    method public int compareTo(androidx.ui.unit.Duration other);
+    method public long component1();
+    method public androidx.ui.unit.Duration copy(long nanoseconds);
+    method public operator androidx.ui.unit.Duration div(int quotient);
+    method public operator androidx.ui.unit.Duration div(double quotient);
+    method public long getNanoseconds();
+    method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Duration other);
+    method public operator androidx.ui.unit.Duration plus(androidx.ui.unit.Duration other);
+    method public operator androidx.ui.unit.Duration times(int factor);
+    method public operator androidx.ui.unit.Duration times(double factor);
+    field public static final androidx.ui.unit.Duration.Companion! Companion;
+  }
+
+  public static final class Duration.Companion {
+    method public androidx.ui.unit.Duration getZero();
+    property public final androidx.ui.unit.Duration Zero;
+  }
+
+  public final class Durations {
+    method public static androidx.ui.unit.Duration Duration(long days = 0, long hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0, long nanoseconds = 0);
+    method public static androidx.ui.unit.Duration getDays(long);
+    method public static androidx.ui.unit.Duration getDays(int);
+    method public static androidx.ui.unit.Duration getHours(long);
+    method public static androidx.ui.unit.Duration getHours(int);
+    method public static androidx.ui.unit.Duration getMicroseconds(long);
+    method public static androidx.ui.unit.Duration getMicroseconds(int);
+    method public static androidx.ui.unit.Duration getMilliseconds(long);
+    method public static androidx.ui.unit.Duration getMilliseconds(int);
+    method public static androidx.ui.unit.Duration getMinutes(long);
+    method public static androidx.ui.unit.Duration getMinutes(int);
+    method public static androidx.ui.unit.Duration getNanoseconds(long);
+    method public static androidx.ui.unit.Duration getNanoseconds(int);
+    method public static long getNanosecondsPerDay();
+    method public static long getNanosecondsPerHour();
+    method public static long getNanosecondsPerMillisecond();
+    method public static long getNanosecondsPerMinute();
+    method public static long getNanosecondsPerSecond();
+    method public static androidx.ui.unit.Duration getSeconds(long);
+    method public static androidx.ui.unit.Duration getSeconds(int);
+    method public static long inDays(androidx.ui.unit.Duration);
+    method public static long inHours(androidx.ui.unit.Duration);
+    method public static long inMicroseconds(androidx.ui.unit.Duration);
+    method public static long inMilliseconds(androidx.ui.unit.Duration);
+    method public static long inMinutes(androidx.ui.unit.Duration);
+    method public static long inSeconds(androidx.ui.unit.Duration);
+    field public static final long HoursPerDay = 24L; // 0x18L
+    field public static final long MicrosecondsPerMillisecond = 1000L; // 0x3e8L
+    field public static final long MillisecondsPerSecond = 1000L; // 0x3e8L
+    field public static final long MinutesPerHour = 60L; // 0x3cL
+    field public static final long NanosecondsPerMicrosecond = 1000L; // 0x3e8L
+    field public static final long SecondsPerMinute = 60L; // 0x3cL
+  }
+
+  public final inline class IntPx implements java.lang.Comparable<androidx.ui.unit.IntPx> {
+    ctor public IntPx();
+    method public static inline operator int compareTo-NgWp0Z8(int $this, float other);
+    method public operator int compareTo-gshw56o(int p);
+    method public static operator int compareTo-gshw56o(int $this, int other);
+    method public static int constructor-impl(int value);
+    method public static operator int div-impl(int $this, float other);
+    method public static operator int div-impl(int $this, double other);
+    method public static operator int div-impl(int $this, int other);
+    method public static boolean equals-impl(int p, Object? p1);
+    method public static boolean equals-impl0(int p1, int p2);
+    method public int getValue();
+    method public static int hashCode-impl(int p);
+    method public static operator int minus-gshw56o(int $this, int other);
+    method public static operator int plus-gshw56o(int $this, int other);
+    method public static inline operator int rem-impl(int $this, int other);
+    method public static operator int times-impl(int $this, float other);
+    method public static operator int times-impl(int $this, double other);
+    method public static operator int times-impl(int $this, int other);
+    method public static String toString-impl(int $this);
+    method public static operator int unaryMinus-impl(int $this);
+    field public static final androidx.ui.unit.IntPx.Companion! Companion;
+  }
+
+  public static final class IntPx.Companion {
+    method public int getInfinity();
+    method public int getZero();
+    property public final int Infinity;
+    property public final int Zero;
+  }
+
+  public final class IntPxBounds {
+    method public int component1();
+    method public int component2();
+    method public int component3();
+    method public int component4();
+    method public androidx.ui.unit.IntPxBounds copy-Q13GOEE(int left, int top, int right, int bottom);
+    method public int getBottom();
+    method public int getLeft();
+    method public int getRight();
+    method public int getTop();
+  }
+
+  public final class IntPxKt {
+    method public static inline androidx.ui.unit.IntPxPosition IntPxPosition-rRMsBxU(int x, int y);
+    method public static inline androidx.ui.unit.IntPxSize IntPxSize-rRMsBxU(int width, int height);
+    method public static inline androidx.ui.unit.PxPosition PxPosition-rRMsBxU(int x, int y);
+    method public static inline androidx.ui.unit.PxSize PxSize-rRMsBxU(int width, int height);
+    method public static inline int ceil-NgWp0Z8(float);
+    method public static androidx.ui.unit.IntPxPosition center(androidx.ui.unit.IntPxSize);
+    method public static inline androidx.ui.unit.IntPxPosition center(androidx.ui.unit.IntPxBounds);
+    method public static inline int coerceAtLeast-rRMsBxU(int, int minimumValue);
+    method public static inline int coerceAtMost-rRMsBxU(int, int maximumValue);
+    method public static inline int coerceIn-qx1LT1w(int, int minimumValue, int maximumValue);
+    method public static inline int getHeight(androidx.ui.unit.IntPxBounds);
+    method public static inline int getIpx(int);
+    method public static inline int getWidth(androidx.ui.unit.IntPxBounds);
+    method public static inline boolean isFinite-gshw56o(int);
+    method public static androidx.ui.unit.IntPxPosition lerp(androidx.ui.unit.IntPxPosition start, androidx.ui.unit.IntPxPosition stop, float fraction);
+    method public static int lerp-9BbVZj8(int start, int stop, float fraction);
+    method public static inline int max-rRMsBxU(int a, int b);
+    method public static inline int min-rRMsBxU(int a, int b);
+    method public static inline int round-NgWp0Z8(float);
+    method public static inline operator androidx.ui.unit.IntPxSize times(int, androidx.ui.unit.IntPxSize size);
+    method public static inline operator int times--Vi_IPY(float, int other);
+    method public static inline operator int times-9kGzznM(int, int other);
+    method public static inline operator int times-tHVXE4c(double, int other);
+    method public static inline float toPx-gshw56o(int);
+    method public static inline androidx.ui.unit.PxPosition toPxPosition(androidx.ui.unit.IntPxPosition);
+    method public static inline androidx.ui.unit.PxSize toPxSize(androidx.ui.unit.IntPxSize);
+    method public static inline androidx.ui.unit.IntPxSize toSize(androidx.ui.unit.IntPxBounds);
+  }
+
+  public final class IntPxPosition {
+    method public androidx.ui.unit.IntPxPosition copy(long value);
+    method public inline int getX();
+    method public inline int getY();
+    method public inline operator androidx.ui.unit.IntPxPosition minus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.IntPxPosition plus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.IntPxPosition unaryMinus();
+    property public final inline int x;
+    property public final inline int y;
+    field public static final androidx.ui.unit.IntPxPosition.Companion! Companion;
+  }
+
+  public static final class IntPxPosition.Companion {
+    method public androidx.ui.unit.IntPxPosition getOrigin();
+    property public final androidx.ui.unit.IntPxPosition Origin;
+  }
+
+  public final class IntPxSize {
+    method public androidx.ui.unit.IntPxSize copy(long value);
+    method public inline operator androidx.ui.unit.IntPxSize div(int other);
+    method public inline int getHeight();
+    method public inline int getWidth();
+    method public inline operator androidx.ui.unit.IntPxSize times(int other);
+    property public final inline int height;
+    property public final inline int width;
+  }
+
+  public final inline class IntSize {
+    ctor public IntSize();
+    method public static long constructor-impl(internal long value);
+    method public static operator long div-impl(long $this, int other);
+    method public static 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 public static int hashCode-impl(long p);
+    method public static operator long times-impl(long $this, int other);
+    method public static String toString-impl(long $this);
+  }
+
+  public final class IntSizeKt {
+    method public static long IntSize(int width, int height);
+    method public static operator long times-twsQOwo(int, long size);
+  }
+
+  public final inline class Position {
+    ctor public Position();
+    method public static long constructor-impl(internal long value);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static androidx.ui.unit.Dp getX-impl(long $this);
+    method public static androidx.ui.unit.Dp getY-impl(long $this);
+    method public static int hashCode-impl(long p);
+    method public static inline operator long minus-T8eBu-w(long $this, long other);
+    method public static inline operator long plus-T8eBu-w(long $this, long other);
+    method public static String toString-impl(long $this);
+  }
+
+  public final inline class Px implements java.lang.Comparable<androidx.ui.unit.Px> {
+    ctor public Px();
+    method public operator int compareTo-NgWp0Z8(float p);
+    method public static operator int compareTo-NgWp0Z8(float $this, float other);
+    method public static inline operator int compareTo-gshw56o(float $this, int other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-NgWp0Z8(float $this, float other);
+    method public static inline operator float div-RjPF0Mw(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static inline operator float div-impl(float $this, int other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-NgWp0Z8(float $this, float other);
+    method public static inline operator float minus-gshw56o(float $this, int other);
+    method public static inline operator float plus-NgWp0Z8(float $this, float other);
+    method public static inline operator float plus-gshw56o(float $this, int other);
+    method public static inline operator float times-NgWp0Z8(float $this, float other);
+    method public static inline operator float times-RjPF0Mw(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static inline operator float times-impl(float $this, int other);
+    method public static String toString-impl(float $this);
+    method public static inline operator float unaryMinus-impl(float $this);
+    field public static final androidx.ui.unit.Px.Companion! Companion;
+  }
+
+  public static final class Px.Companion {
+    method public float getInfinity();
+    method public float getZero();
+    property public final float Infinity;
+    property public final float Zero;
+  }
+
+  public final class PxBounds {
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public androidx.ui.unit.PxBounds copy-wHlpFhg(float left, float top, float right, float bottom);
+    method public float getBottom();
+    method public float getLeft();
+    method public float getRight();
+    method public float getTop();
+  }
+
+  public final inline class PxCubed implements java.lang.Comparable<androidx.ui.unit.PxCubed> {
+    ctor public PxCubed();
+    method public operator int compareTo-bji3ab4(float p);
+    method public static operator int compareTo-bji3ab4(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-NgWp0Z8(float $this, float other);
+    method public static inline operator float div-RjPF0Mw(float $this, float other);
+    method public static inline operator float div-bji3ab4(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-bji3ab4(float $this, float dimension);
+    method public static inline operator float plus-bji3ab4(float $this, float dimension);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final inline class PxInverse implements java.lang.Comparable<androidx.ui.unit.PxInverse> {
+    ctor public PxInverse();
+    method public operator int compareTo-KGV0gLo(float p);
+    method public static operator int compareTo-KGV0gLo(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-KGV0gLo(float $this, float dimension);
+    method public static inline operator float plus-KGV0gLo(float $this, float dimension);
+    method public static inline operator float times-NgWp0Z8(float $this, float other);
+    method public static inline operator float times-RjPF0Mw(float $this, float other);
+    method public static inline operator float times-bji3ab4(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final class PxKt {
+    method public static inline androidx.ui.unit.PxBounds PxBounds(androidx.ui.unit.PxPosition topLeft, androidx.ui.unit.PxSize size);
+    method public static inline androidx.ui.unit.PxPosition PxPosition-qHcltEY(float x, float y);
+    method public static inline androidx.ui.unit.PxSize PxSize-qHcltEY(float width, float height);
+    method public static inline float abs-NgWp0Z8(float x);
+    method public static androidx.ui.unit.PxPosition center(androidx.ui.unit.PxSize);
+    method public static inline androidx.ui.unit.PxPosition center(androidx.ui.unit.PxBounds);
+    method public static inline float coerceAtLeast-qHcltEY(float, float minimumValue);
+    method public static inline float coerceAtMost-qHcltEY(float, float maximumValue);
+    method public static inline float coerceIn-HXvnt1Q(float, float minimumValue, float maximumValue);
+    method public static inline operator float div-78fIwVY(double, float other);
+    method public static inline operator float div-Ndu7NvY(int, float other);
+    method public static inline operator float div-kxDXtn8(float, float other);
+    method public static float getDistance(androidx.ui.unit.PxPosition);
+    method public static inline float getHeight(androidx.ui.unit.PxBounds);
+    method public static float getMinDimension(androidx.ui.unit.PxSize);
+    method public static inline float getPx(int);
+    method public static inline float getPx(double);
+    method public static inline float getPx(float);
+    method public static inline float getWidth(androidx.ui.unit.PxBounds);
+    method public static androidx.ui.unit.PxPosition lerp(androidx.ui.unit.PxPosition start, androidx.ui.unit.PxPosition stop, float fraction);
+    method public static float lerp-g-Fs4Ag(float start, float stop, float fraction);
+    method public static inline float max-qHcltEY(float a, float b);
+    method public static inline float min-qHcltEY(float a, float b);
+    method public static inline androidx.ui.unit.IntPxPosition round(androidx.ui.unit.PxPosition);
+    method public static inline operator androidx.ui.unit.PxSize times(int, androidx.ui.unit.PxSize size);
+    method public static inline operator androidx.ui.unit.PxSize times(float, androidx.ui.unit.PxSize size);
+    method public static inline operator androidx.ui.unit.PxSize times(double, androidx.ui.unit.PxSize size);
+    method public static inline operator float times-78fIwVY(double, float other);
+    method public static inline operator float times-Ndu7NvY(int, float other);
+    method public static inline operator float times-kxDXtn8(float, float other);
+    method public static androidx.ui.unit.PxBounds toBounds(androidx.ui.unit.PxSize);
+    method public static inline androidx.ui.geometry.Offset toOffset(androidx.ui.unit.PxPosition);
+    method public static androidx.ui.geometry.Rect toRect(androidx.ui.unit.PxBounds);
+    method public static androidx.ui.geometry.Rect toRect(androidx.ui.unit.PxSize);
+    method public static androidx.ui.unit.PxSize toSize(androidx.ui.unit.PxBounds);
+  }
+
+  public final class PxPosition {
+    method public androidx.ui.unit.PxPosition copy(long value);
+    method public inline float getX();
+    method public inline float getY();
+    method public inline operator androidx.ui.unit.PxPosition minus(androidx.ui.unit.PxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition minus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition plus(androidx.ui.unit.PxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition plus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition unaryMinus();
+    property public final inline float x;
+    property public final inline float y;
+    field public static final androidx.ui.unit.PxPosition.Companion! Companion;
+  }
+
+  public static final class PxPosition.Companion {
+    method public androidx.ui.unit.PxPosition getOrigin();
+    property public final androidx.ui.unit.PxPosition Origin;
+  }
+
+  public final class PxSize {
+    method public androidx.ui.unit.PxSize copy(long value);
+    method public inline operator androidx.ui.unit.PxSize div(int other);
+    method public inline operator androidx.ui.unit.PxSize div(float other);
+    method public inline operator androidx.ui.unit.PxSize div(double other);
+    method public inline float getHeight();
+    method public inline float getWidth();
+    method public inline operator androidx.ui.unit.PxSize times(int other);
+    method public inline operator androidx.ui.unit.PxSize times(float other);
+    method public inline operator androidx.ui.unit.PxSize times(double other);
+    property public final inline float height;
+    property public final inline float width;
+    field public static final androidx.ui.unit.PxSize.Companion! Companion;
+  }
+
+  public static final class PxSize.Companion {
+    method public androidx.ui.unit.PxSize getUnspecifiedSize();
+    method public androidx.ui.unit.PxSize getZero();
+    property public final androidx.ui.unit.PxSize UnspecifiedSize;
+    property public final androidx.ui.unit.PxSize Zero;
+  }
+
+  public final inline class PxSquared implements java.lang.Comparable<androidx.ui.unit.PxSquared> {
+    ctor public PxSquared();
+    method public operator int compareTo-RjPF0Mw(float p);
+    method public static operator int compareTo-RjPF0Mw(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-NgWp0Z8(float $this, float other);
+    method public static inline operator float div-RjPF0Mw(float $this, float other);
+    method public static inline operator float div-bji3ab4(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-RjPF0Mw(float $this, float other);
+    method public static inline operator float plus-RjPF0Mw(float $this, float other);
+    method public static inline operator float times-NgWp0Z8(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final inline class Size {
+    ctor public Size();
+    method public static long constructor-impl(internal long value);
+    method public static inline operator long div-impl(long $this, int other);
+    method public static inline operator long div-impl(long $this, float other);
+    method public static inline operator long div-impl(long $this, double other);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static androidx.ui.unit.Dp getHeight-impl(long $this);
+    method public static androidx.ui.unit.Dp getWidth-impl(long $this);
+    method public static int hashCode-impl(long p);
+    method public static inline operator long times-impl(long $this, int other);
+    method public static inline operator long times-impl(long $this, float other);
+    method public static inline operator long times-impl(long $this, double other);
+    method public static String toString-impl(long $this);
+  }
+
+  public final inline class TextUnit {
+    ctor public TextUnit();
+    method public static inline operator int compareTo-vVlMl6k(long $this, long other);
+    method public static long constructor-impl(long packedValue);
+    method public static inline operator long div-impl(long $this, float other);
+    method public static inline operator long div-impl(long $this, double other);
+    method public static inline operator long div-impl(long $this, int other);
+    method public static inline operator float div-vVlMl6k(long $this, long other);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getPackedValue();
+    method public static androidx.ui.unit.TextUnitType getType-impl(long $this);
+    method public static float getValue-impl(long $this);
+    method public static int hashCode-impl(long p);
+    method public static boolean isEm-impl(long $this);
+    method public static boolean isInherit-impl(long $this);
+    method public static boolean isSp-impl(long $this);
+    method public static inline operator long minus-vVlMl6k(long $this, long other);
+    method public static inline operator long plus-vVlMl6k(long $this, long other);
+    method public static inline operator long times-impl(long $this, float other);
+    method public static inline operator long times-impl(long $this, double other);
+    method public static inline operator long times-impl(long $this, int other);
+    method public static String toString-impl(long $this);
+    method public static inline operator long unaryMinus-impl(long $this);
+    field public static final androidx.ui.unit.TextUnit.Companion! Companion;
+  }
+
+  public static final class TextUnit.Companion {
+    method public long Em(int value);
+    method public long Em(float value);
+    method public long Em(double value);
+    method public long Sp(int value);
+    method public long Sp(float value);
+    method public long Sp(double value);
+    method public long getInherit();
+    property public final long Inherit;
+  }
+
+  public final class TextUnitKt {
+    method public static inline long coerceAtLeast-gL_aCS0(long, long minimumValue);
+    method public static inline long coerceAtMost-gL_aCS0(long, long maximumValue);
+    method public static inline long coerceIn-Y2exRck(long, long minimumValue, long maximumValue);
+    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 long lerp-SpZbbpo(long a, long b, float t);
+    method public static inline long max-gL_aCS0(long a, long b);
+    method public static inline long min-gL_aCS0(long a, long b);
+    method public static inline operator long times-GncdoDw(double, long other);
+    method public static inline operator long times-MVx5XBU(float, long other);
+    method public static inline operator long times-UlzjdM0(int, long other);
+  }
+
+  public enum TextUnitType {
+    enum_constant public static final androidx.ui.unit.TextUnitType Em;
+    enum_constant public static final androidx.ui.unit.TextUnitType Inherit;
+    enum_constant public static final androidx.ui.unit.TextUnitType Sp;
+  }
+
+  public final class Uptime implements java.lang.Comparable<androidx.ui.unit.Uptime> {
+    ctor public Uptime(long nanoseconds);
+    method public int compareTo(androidx.ui.unit.Uptime other);
+    method public long component1();
+    method public androidx.ui.unit.Uptime copy(long nanoseconds);
+    method public long getNanoseconds();
+    method public operator androidx.ui.unit.Uptime minus(androidx.ui.unit.Duration duration);
+    method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Uptime other);
+    method public operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration duration);
+    field public static final androidx.ui.unit.Uptime.Companion! Companion;
+  }
+
+  public static final class Uptime.Companion {
+    method public androidx.ui.unit.Uptime getBoot();
+    property public final androidx.ui.unit.Uptime Boot;
+  }
+
+  public final class UptimeKt {
+    method public static operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration, androidx.ui.unit.Uptime uptime);
+  }
+
+  public final class Velocity {
+    ctor public Velocity(androidx.ui.unit.PxPosition pixelsPerSecond);
+    method public androidx.ui.unit.PxPosition component1();
+    method public androidx.ui.unit.Velocity copy(androidx.ui.unit.PxPosition pixelsPerSecond);
+    method public androidx.ui.unit.PxPosition getPixelsPerSecond();
+    method public operator androidx.ui.unit.Velocity unaryMinus();
+    field public static final androidx.ui.unit.Velocity.Companion! Companion;
+  }
+
+  public static final class Velocity.Companion {
+    method public androidx.ui.unit.Velocity getZero();
+    property public final androidx.ui.unit.Velocity Zero;
+  }
+
+  public final class VelocityKt {
+    method public static operator androidx.ui.unit.Velocity minus(androidx.ui.unit.Velocity, androidx.ui.unit.Velocity other);
+    method public static operator androidx.ui.unit.Velocity plus(androidx.ui.unit.Velocity, androidx.ui.unit.Velocity other);
+  }
+
+}
+
diff --git a/ui/ui-unit/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-unit/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..2f30c03
--- /dev/null
+++ b/ui/ui-unit/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,652 @@
+// Signature format: 3.0
+package androidx.ui.unit {
+
+  public final class Bounds {
+    ctor public Bounds(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.unit.Bounds copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getLeft();
+    method public androidx.ui.unit.Dp getRight();
+    method public androidx.ui.unit.Dp getTop();
+  }
+
+  public interface Density {
+    method public float getDensity();
+    method public float getFontScale();
+    method public default androidx.ui.unit.Dp toDp(float);
+    method public default androidx.ui.unit.Dp toDp(int);
+    method public default androidx.ui.unit.Dp toDp-NgWp0Z8(float);
+    method public default androidx.ui.unit.Dp toDp-gshw56o(int);
+    method public default androidx.ui.unit.Dp toDp-vVlMl6k(long);
+    method public default int toIntPx(androidx.ui.unit.Dp);
+    method public default int toIntPx-vVlMl6k(long);
+    method public default float toPx(androidx.ui.unit.Dp);
+    method public default androidx.ui.unit.PxSize toPx-kAYDl8w(long);
+    method public default float toPx-vVlMl6k(long);
+    method public default androidx.ui.geometry.Rect toRect(androidx.ui.unit.Bounds);
+    method public default long toSp(androidx.ui.unit.Dp);
+    method public default long toSp(float);
+    method public default long toSp(int);
+    method public default long toSp-NgWp0Z8(float);
+    method public default long toSp-gshw56o(int);
+    property public abstract float density;
+    property public abstract float fontScale;
+  }
+
+  public final class DensityKt {
+    method public static androidx.ui.unit.Density Density(android.content.Context context);
+    method public static androidx.ui.unit.Density Density(float density, float fontScale = 1f);
+  }
+
+  public final class Dp implements java.lang.Comparable<androidx.ui.unit.Dp> {
+    ctor public Dp(float value);
+    method public operator int compareTo(androidx.ui.unit.Dp other);
+    method public float component1();
+    method public androidx.ui.unit.Dp copy(float value);
+    method public inline operator androidx.ui.unit.Dp div(float other);
+    method public inline operator androidx.ui.unit.Dp div(int other);
+    method public inline operator float div(androidx.ui.unit.Dp other);
+    method public inline operator float div-x8crYZs(float other);
+    method public float getValue();
+    method public inline operator androidx.ui.unit.Dp minus(androidx.ui.unit.Dp other);
+    method public inline operator androidx.ui.unit.Dp plus(androidx.ui.unit.Dp other);
+    method public inline operator androidx.ui.unit.Dp times(float other);
+    method public inline operator androidx.ui.unit.Dp times(int other);
+    method public inline operator float times(androidx.ui.unit.Dp other);
+    method public inline operator float times-x8crYZs(float other);
+    method public inline operator androidx.ui.unit.Dp unaryMinus();
+    field public static final androidx.ui.unit.Dp.Companion! Companion;
+  }
+
+  public static final class Dp.Companion {
+    method public androidx.ui.unit.Dp getHairline();
+    method public androidx.ui.unit.Dp getInfinity();
+    method public androidx.ui.unit.Dp getUnspecified();
+    property public final androidx.ui.unit.Dp Hairline;
+    property public final androidx.ui.unit.Dp Infinity;
+    property public final androidx.ui.unit.Dp Unspecified;
+  }
+
+  public final inline class DpCubed implements java.lang.Comparable<androidx.ui.unit.DpCubed> {
+    ctor public DpCubed();
+    method public operator int compareTo-JDqhs2g(float p);
+    method public static operator int compareTo-JDqhs2g(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-JDqhs2g(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static inline operator float div-impl(float $this, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp div-x8crYZs(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-JDqhs2g(float $this, float dimension);
+    method public static inline operator float plus-JDqhs2g(float $this, float dimension);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final inline class DpInverse implements java.lang.Comparable<androidx.ui.unit.DpInverse> {
+    ctor public DpInverse();
+    method public operator int compareTo-_K2iRR8(float p);
+    method public static operator int compareTo-_K2iRR8(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-_K2iRR8(float $this, float dimension);
+    method public static inline operator float plus-_K2iRR8(float $this, float dimension);
+    method public static inline operator float times-JDqhs2g(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static inline operator float times-impl(float $this, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp times-x8crYZs(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final class DpKt {
+    method public static inline long Position(androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+    method public static inline long Size(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public static long center-kAYDl8w(long);
+    method public static inline androidx.ui.unit.Dp coerceAtLeast(androidx.ui.unit.Dp, androidx.ui.unit.Dp minimumValue);
+    method public static inline androidx.ui.unit.Dp coerceAtMost(androidx.ui.unit.Dp, androidx.ui.unit.Dp maximumValue);
+    method public static inline androidx.ui.unit.Dp coerceIn(androidx.ui.unit.Dp, androidx.ui.unit.Dp minimumValue, androidx.ui.unit.Dp maximumValue);
+    method public static inline operator float div(float, androidx.ui.unit.Dp other);
+    method public static inline operator float div(double, androidx.ui.unit.Dp other);
+    method public static inline operator float div(int, androidx.ui.unit.Dp other);
+    method public static androidx.ui.unit.Dp getDistance-T8eBu-w(long);
+    method public static inline androidx.ui.unit.Dp getDp(int);
+    method public static inline androidx.ui.unit.Dp getDp(double);
+    method public static inline androidx.ui.unit.Dp getDp(float);
+    method public static inline androidx.ui.unit.Dp getHeight(androidx.ui.unit.Bounds);
+    method public static inline androidx.ui.unit.Dp getWidth(androidx.ui.unit.Bounds);
+    method public static inline boolean isFinite(androidx.ui.unit.Dp);
+    method public static androidx.ui.unit.Dp lerp(androidx.ui.unit.Dp start, androidx.ui.unit.Dp stop, float fraction);
+    method public static long lerp-d5NHFfI(long start, long stop, float fraction);
+    method public static inline androidx.ui.unit.Dp max(androidx.ui.unit.Dp a, androidx.ui.unit.Dp b);
+    method public static inline androidx.ui.unit.Dp min(androidx.ui.unit.Dp a, androidx.ui.unit.Dp b);
+    method public static inline operator androidx.ui.unit.Dp times(float, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp times(double, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp times(int, androidx.ui.unit.Dp other);
+    method public static inline operator long times--D0i1nw(float, long size);
+    method public static inline operator long times-DdskrAE(int, long size);
+    method public static inline operator long times-l9Tz9ww(double, long size);
+    method public static androidx.ui.unit.Bounds toBounds-kAYDl8w(long);
+    method public static inline long toSize(androidx.ui.unit.Bounds);
+  }
+
+  public final inline class DpSquared implements java.lang.Comparable<androidx.ui.unit.DpSquared> {
+    ctor public DpSquared();
+    method public operator int compareTo-x8crYZs(float p);
+    method public static operator int compareTo-x8crYZs(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-JDqhs2g(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static inline operator androidx.ui.unit.Dp div-impl(float $this, androidx.ui.unit.Dp other);
+    method public static inline operator float div-x8crYZs(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-x8crYZs(float $this, float other);
+    method public static inline operator float plus-x8crYZs(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static inline operator float times-impl(float $this, androidx.ui.unit.Dp other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final class Duration implements java.lang.Comparable<androidx.ui.unit.Duration> {
+    ctor public Duration(long nanoseconds);
+    method public int compareTo(androidx.ui.unit.Duration other);
+    method public long component1();
+    method public androidx.ui.unit.Duration copy(long nanoseconds);
+    method public operator androidx.ui.unit.Duration div(int quotient);
+    method public operator androidx.ui.unit.Duration div(double quotient);
+    method public long getNanoseconds();
+    method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Duration other);
+    method public operator androidx.ui.unit.Duration plus(androidx.ui.unit.Duration other);
+    method public operator androidx.ui.unit.Duration times(int factor);
+    method public operator androidx.ui.unit.Duration times(double factor);
+    field public static final androidx.ui.unit.Duration.Companion! Companion;
+  }
+
+  public static final class Duration.Companion {
+    method public androidx.ui.unit.Duration getZero();
+    property public final androidx.ui.unit.Duration Zero;
+  }
+
+  public final class Durations {
+    method public static androidx.ui.unit.Duration Duration(long days = 0, long hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0, long nanoseconds = 0);
+    method public static androidx.ui.unit.Duration getDays(long);
+    method public static androidx.ui.unit.Duration getDays(int);
+    method public static androidx.ui.unit.Duration getHours(long);
+    method public static androidx.ui.unit.Duration getHours(int);
+    method public static androidx.ui.unit.Duration getMicroseconds(long);
+    method public static androidx.ui.unit.Duration getMicroseconds(int);
+    method public static androidx.ui.unit.Duration getMilliseconds(long);
+    method public static androidx.ui.unit.Duration getMilliseconds(int);
+    method public static androidx.ui.unit.Duration getMinutes(long);
+    method public static androidx.ui.unit.Duration getMinutes(int);
+    method public static androidx.ui.unit.Duration getNanoseconds(long);
+    method public static androidx.ui.unit.Duration getNanoseconds(int);
+    method public static long getNanosecondsPerDay();
+    method public static long getNanosecondsPerHour();
+    method public static long getNanosecondsPerMillisecond();
+    method public static long getNanosecondsPerMinute();
+    method public static long getNanosecondsPerSecond();
+    method public static androidx.ui.unit.Duration getSeconds(long);
+    method public static androidx.ui.unit.Duration getSeconds(int);
+    method public static long inDays(androidx.ui.unit.Duration);
+    method public static long inHours(androidx.ui.unit.Duration);
+    method public static long inMicroseconds(androidx.ui.unit.Duration);
+    method public static long inMilliseconds(androidx.ui.unit.Duration);
+    method public static long inMinutes(androidx.ui.unit.Duration);
+    method public static long inSeconds(androidx.ui.unit.Duration);
+    field public static final long HoursPerDay = 24L; // 0x18L
+    field public static final long MicrosecondsPerMillisecond = 1000L; // 0x3e8L
+    field public static final long MillisecondsPerSecond = 1000L; // 0x3e8L
+    field public static final long MinutesPerHour = 60L; // 0x3cL
+    field public static final long NanosecondsPerMicrosecond = 1000L; // 0x3e8L
+    field public static final long SecondsPerMinute = 60L; // 0x3cL
+  }
+
+  public final inline class IntPx implements java.lang.Comparable<androidx.ui.unit.IntPx> {
+    ctor public IntPx();
+    method public static inline operator int compareTo-NgWp0Z8(int $this, float other);
+    method public operator int compareTo-gshw56o(int p);
+    method public static operator int compareTo-gshw56o(int $this, int other);
+    method public static int constructor-impl(int value);
+    method public static operator int div-impl(int $this, float other);
+    method public static operator int div-impl(int $this, double other);
+    method public static operator int div-impl(int $this, int other);
+    method public static boolean equals-impl(int p, Object? p1);
+    method public static boolean equals-impl0(int p1, int p2);
+    method public int getValue();
+    method public static int hashCode-impl(int p);
+    method public static operator int minus-gshw56o(int $this, int other);
+    method public static operator int plus-gshw56o(int $this, int other);
+    method public static inline operator int rem-impl(int $this, int other);
+    method public static operator int times-impl(int $this, float other);
+    method public static operator int times-impl(int $this, double other);
+    method public static operator int times-impl(int $this, int other);
+    method public static String toString-impl(int $this);
+    method public static operator int unaryMinus-impl(int $this);
+    field public static final androidx.ui.unit.IntPx.Companion! Companion;
+  }
+
+  public static final class IntPx.Companion {
+    method public int getInfinity();
+    method public int getZero();
+    property public final int Infinity;
+    property public final int Zero;
+  }
+
+  public final class IntPxBounds {
+    method public int component1();
+    method public int component2();
+    method public int component3();
+    method public int component4();
+    method public androidx.ui.unit.IntPxBounds copy-Q13GOEE(int left, int top, int right, int bottom);
+    method public int getBottom();
+    method public int getLeft();
+    method public int getRight();
+    method public int getTop();
+  }
+
+  public final class IntPxKt {
+    method public static inline androidx.ui.unit.IntPxPosition IntPxPosition-rRMsBxU(int x, int y);
+    method public static inline androidx.ui.unit.IntPxSize IntPxSize-rRMsBxU(int width, int height);
+    method public static inline androidx.ui.unit.PxPosition PxPosition-rRMsBxU(int x, int y);
+    method public static inline androidx.ui.unit.PxSize PxSize-rRMsBxU(int width, int height);
+    method public static inline int ceil-NgWp0Z8(float);
+    method public static androidx.ui.unit.IntPxPosition center(androidx.ui.unit.IntPxSize);
+    method public static inline androidx.ui.unit.IntPxPosition center(androidx.ui.unit.IntPxBounds);
+    method public static inline int coerceAtLeast-rRMsBxU(int, int minimumValue);
+    method public static inline int coerceAtMost-rRMsBxU(int, int maximumValue);
+    method public static inline int coerceIn-qx1LT1w(int, int minimumValue, int maximumValue);
+    method public static inline int getHeight(androidx.ui.unit.IntPxBounds);
+    method public static inline int getIpx(int);
+    method public static inline int getWidth(androidx.ui.unit.IntPxBounds);
+    method public static inline boolean isFinite-gshw56o(int);
+    method public static androidx.ui.unit.IntPxPosition lerp(androidx.ui.unit.IntPxPosition start, androidx.ui.unit.IntPxPosition stop, float fraction);
+    method public static int lerp-9BbVZj8(int start, int stop, float fraction);
+    method public static inline int max-rRMsBxU(int a, int b);
+    method public static inline int min-rRMsBxU(int a, int b);
+    method public static inline int round-NgWp0Z8(float);
+    method public static inline operator androidx.ui.unit.IntPxSize times(int, androidx.ui.unit.IntPxSize size);
+    method public static inline operator int times--Vi_IPY(float, int other);
+    method public static inline operator int times-9kGzznM(int, int other);
+    method public static inline operator int times-tHVXE4c(double, int other);
+    method public static inline float toPx-gshw56o(int);
+    method public static inline androidx.ui.unit.PxPosition toPxPosition(androidx.ui.unit.IntPxPosition);
+    method public static inline androidx.ui.unit.PxSize toPxSize(androidx.ui.unit.IntPxSize);
+    method public static inline androidx.ui.unit.IntPxSize toSize(androidx.ui.unit.IntPxBounds);
+  }
+
+  public final class IntPxPosition {
+    method public androidx.ui.unit.IntPxPosition copy(long value);
+    method public inline int getX();
+    method public inline int getY();
+    method public inline operator androidx.ui.unit.IntPxPosition minus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.IntPxPosition plus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.IntPxPosition unaryMinus();
+    property public final inline int x;
+    property public final inline int y;
+    field public static final androidx.ui.unit.IntPxPosition.Companion! Companion;
+  }
+
+  public static final class IntPxPosition.Companion {
+    method public androidx.ui.unit.IntPxPosition getOrigin();
+    property public final androidx.ui.unit.IntPxPosition Origin;
+  }
+
+  public final class IntPxSize {
+    method public androidx.ui.unit.IntPxSize copy(long value);
+    method public inline operator androidx.ui.unit.IntPxSize div(int other);
+    method public inline int getHeight();
+    method public inline int getWidth();
+    method public inline operator androidx.ui.unit.IntPxSize times(int other);
+    property public final inline int height;
+    property public final inline int width;
+  }
+
+  public final inline class IntSize {
+    ctor public IntSize();
+    method public static long constructor-impl(internal long value);
+    method public static operator long div-impl(long $this, int other);
+    method public static 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 public static int hashCode-impl(long p);
+    method public static operator long times-impl(long $this, int other);
+    method public static String toString-impl(long $this);
+  }
+
+  public final class IntSizeKt {
+    method public static long IntSize(int width, int height);
+    method public static operator long times-twsQOwo(int, long size);
+  }
+
+  public final inline class Position {
+    ctor public Position();
+    method public static long constructor-impl(internal long value);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static androidx.ui.unit.Dp getX-impl(long $this);
+    method public static androidx.ui.unit.Dp getY-impl(long $this);
+    method public static int hashCode-impl(long p);
+    method public static inline operator long minus-T8eBu-w(long $this, long other);
+    method public static inline operator long plus-T8eBu-w(long $this, long other);
+    method public static String toString-impl(long $this);
+  }
+
+  public final inline class Px implements java.lang.Comparable<androidx.ui.unit.Px> {
+    ctor public Px();
+    method public operator int compareTo-NgWp0Z8(float p);
+    method public static operator int compareTo-NgWp0Z8(float $this, float other);
+    method public static inline operator int compareTo-gshw56o(float $this, int other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-NgWp0Z8(float $this, float other);
+    method public static inline operator float div-RjPF0Mw(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static inline operator float div-impl(float $this, int other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-NgWp0Z8(float $this, float other);
+    method public static inline operator float minus-gshw56o(float $this, int other);
+    method public static inline operator float plus-NgWp0Z8(float $this, float other);
+    method public static inline operator float plus-gshw56o(float $this, int other);
+    method public static inline operator float times-NgWp0Z8(float $this, float other);
+    method public static inline operator float times-RjPF0Mw(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static inline operator float times-impl(float $this, int other);
+    method public static String toString-impl(float $this);
+    method public static inline operator float unaryMinus-impl(float $this);
+    field public static final androidx.ui.unit.Px.Companion! Companion;
+  }
+
+  public static final class Px.Companion {
+    method public float getInfinity();
+    method public float getZero();
+    property public final float Infinity;
+    property public final float Zero;
+  }
+
+  public final class PxBounds {
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public androidx.ui.unit.PxBounds copy-wHlpFhg(float left, float top, float right, float bottom);
+    method public float getBottom();
+    method public float getLeft();
+    method public float getRight();
+    method public float getTop();
+  }
+
+  public final inline class PxCubed implements java.lang.Comparable<androidx.ui.unit.PxCubed> {
+    ctor public PxCubed();
+    method public operator int compareTo-bji3ab4(float p);
+    method public static operator int compareTo-bji3ab4(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-NgWp0Z8(float $this, float other);
+    method public static inline operator float div-RjPF0Mw(float $this, float other);
+    method public static inline operator float div-bji3ab4(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-bji3ab4(float $this, float dimension);
+    method public static inline operator float plus-bji3ab4(float $this, float dimension);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final inline class PxInverse implements java.lang.Comparable<androidx.ui.unit.PxInverse> {
+    ctor public PxInverse();
+    method public operator int compareTo-KGV0gLo(float p);
+    method public static operator int compareTo-KGV0gLo(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-KGV0gLo(float $this, float dimension);
+    method public static inline operator float plus-KGV0gLo(float $this, float dimension);
+    method public static inline operator float times-NgWp0Z8(float $this, float other);
+    method public static inline operator float times-RjPF0Mw(float $this, float other);
+    method public static inline operator float times-bji3ab4(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final class PxKt {
+    method public static inline androidx.ui.unit.PxBounds PxBounds(androidx.ui.unit.PxPosition topLeft, androidx.ui.unit.PxSize size);
+    method public static inline androidx.ui.unit.PxPosition PxPosition-qHcltEY(float x, float y);
+    method public static inline androidx.ui.unit.PxSize PxSize-qHcltEY(float width, float height);
+    method public static inline float abs-NgWp0Z8(float x);
+    method public static androidx.ui.unit.PxPosition center(androidx.ui.unit.PxSize);
+    method public static inline androidx.ui.unit.PxPosition center(androidx.ui.unit.PxBounds);
+    method public static inline float coerceAtLeast-qHcltEY(float, float minimumValue);
+    method public static inline float coerceAtMost-qHcltEY(float, float maximumValue);
+    method public static inline float coerceIn-HXvnt1Q(float, float minimumValue, float maximumValue);
+    method public static inline operator float div-78fIwVY(double, float other);
+    method public static inline operator float div-Ndu7NvY(int, float other);
+    method public static inline operator float div-kxDXtn8(float, float other);
+    method public static float getDistance(androidx.ui.unit.PxPosition);
+    method public static inline float getHeight(androidx.ui.unit.PxBounds);
+    method public static float getMinDimension(androidx.ui.unit.PxSize);
+    method public static inline float getPx(int);
+    method public static inline float getPx(double);
+    method public static inline float getPx(float);
+    method public static inline float getWidth(androidx.ui.unit.PxBounds);
+    method public static androidx.ui.unit.PxPosition lerp(androidx.ui.unit.PxPosition start, androidx.ui.unit.PxPosition stop, float fraction);
+    method public static float lerp-g-Fs4Ag(float start, float stop, float fraction);
+    method public static inline float max-qHcltEY(float a, float b);
+    method public static inline float min-qHcltEY(float a, float b);
+    method public static inline androidx.ui.unit.IntPxPosition round(androidx.ui.unit.PxPosition);
+    method public static inline operator androidx.ui.unit.PxSize times(int, androidx.ui.unit.PxSize size);
+    method public static inline operator androidx.ui.unit.PxSize times(float, androidx.ui.unit.PxSize size);
+    method public static inline operator androidx.ui.unit.PxSize times(double, androidx.ui.unit.PxSize size);
+    method public static inline operator float times-78fIwVY(double, float other);
+    method public static inline operator float times-Ndu7NvY(int, float other);
+    method public static inline operator float times-kxDXtn8(float, float other);
+    method public static androidx.ui.unit.PxBounds toBounds(androidx.ui.unit.PxSize);
+    method public static inline androidx.ui.geometry.Offset toOffset(androidx.ui.unit.PxPosition);
+    method public static androidx.ui.geometry.Rect toRect(androidx.ui.unit.PxBounds);
+    method public static androidx.ui.geometry.Rect toRect(androidx.ui.unit.PxSize);
+    method public static androidx.ui.unit.PxSize toSize(androidx.ui.unit.PxBounds);
+  }
+
+  public final class PxPosition {
+    method public androidx.ui.unit.PxPosition copy(long value);
+    method public inline float getX();
+    method public inline float getY();
+    method public inline operator androidx.ui.unit.PxPosition minus(androidx.ui.unit.PxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition minus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition plus(androidx.ui.unit.PxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition plus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition unaryMinus();
+    property public final inline float x;
+    property public final inline float y;
+    field public static final androidx.ui.unit.PxPosition.Companion! Companion;
+  }
+
+  public static final class PxPosition.Companion {
+    method public androidx.ui.unit.PxPosition getOrigin();
+    property public final androidx.ui.unit.PxPosition Origin;
+  }
+
+  public final class PxSize {
+    method public androidx.ui.unit.PxSize copy(long value);
+    method public inline operator androidx.ui.unit.PxSize div(int other);
+    method public inline operator androidx.ui.unit.PxSize div(float other);
+    method public inline operator androidx.ui.unit.PxSize div(double other);
+    method public inline float getHeight();
+    method public inline float getWidth();
+    method public inline operator androidx.ui.unit.PxSize times(int other);
+    method public inline operator androidx.ui.unit.PxSize times(float other);
+    method public inline operator androidx.ui.unit.PxSize times(double other);
+    property public final inline float height;
+    property public final inline float width;
+    field public static final androidx.ui.unit.PxSize.Companion! Companion;
+  }
+
+  public static final class PxSize.Companion {
+    method public androidx.ui.unit.PxSize getUnspecifiedSize();
+    method public androidx.ui.unit.PxSize getZero();
+    property public final androidx.ui.unit.PxSize UnspecifiedSize;
+    property public final androidx.ui.unit.PxSize Zero;
+  }
+
+  public final inline class PxSquared implements java.lang.Comparable<androidx.ui.unit.PxSquared> {
+    ctor public PxSquared();
+    method public operator int compareTo-RjPF0Mw(float p);
+    method public static operator int compareTo-RjPF0Mw(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-NgWp0Z8(float $this, float other);
+    method public static inline operator float div-RjPF0Mw(float $this, float other);
+    method public static inline operator float div-bji3ab4(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-RjPF0Mw(float $this, float other);
+    method public static inline operator float plus-RjPF0Mw(float $this, float other);
+    method public static inline operator float times-NgWp0Z8(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final inline class Size {
+    ctor public Size();
+    method public static long constructor-impl(internal long value);
+    method public static inline operator long div-impl(long $this, int other);
+    method public static inline operator long div-impl(long $this, float other);
+    method public static inline operator long div-impl(long $this, double other);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static androidx.ui.unit.Dp getHeight-impl(long $this);
+    method public static androidx.ui.unit.Dp getWidth-impl(long $this);
+    method public static int hashCode-impl(long p);
+    method public static inline operator long times-impl(long $this, int other);
+    method public static inline operator long times-impl(long $this, float other);
+    method public static inline operator long times-impl(long $this, double other);
+    method public static String toString-impl(long $this);
+  }
+
+  public final inline class TextUnit {
+    ctor public TextUnit();
+    method public static inline operator int compareTo-vVlMl6k(long $this, long other);
+    method public static long constructor-impl(long packedValue);
+    method public static inline operator long div-impl(long $this, float other);
+    method public static inline operator long div-impl(long $this, double other);
+    method public static inline operator long div-impl(long $this, int other);
+    method public static inline operator float div-vVlMl6k(long $this, long other);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getPackedValue();
+    method public static androidx.ui.unit.TextUnitType getType-impl(long $this);
+    method public static float getValue-impl(long $this);
+    method public static int hashCode-impl(long p);
+    method public static boolean isEm-impl(long $this);
+    method public static boolean isInherit-impl(long $this);
+    method public static boolean isSp-impl(long $this);
+    method public static inline operator long minus-vVlMl6k(long $this, long other);
+    method public static inline operator long plus-vVlMl6k(long $this, long other);
+    method public static inline operator long times-impl(long $this, float other);
+    method public static inline operator long times-impl(long $this, double other);
+    method public static inline operator long times-impl(long $this, int other);
+    method public static String toString-impl(long $this);
+    method public static inline operator long unaryMinus-impl(long $this);
+    field public static final androidx.ui.unit.TextUnit.Companion! Companion;
+  }
+
+  public static final class TextUnit.Companion {
+    method public long Em(int value);
+    method public long Em(float value);
+    method public long Em(double value);
+    method public long Sp(int value);
+    method public long Sp(float value);
+    method public long Sp(double value);
+    method public long getInherit();
+    property public final long Inherit;
+  }
+
+  public final class TextUnitKt {
+    method public static inline long coerceAtLeast-gL_aCS0(long, long minimumValue);
+    method public static inline long coerceAtMost-gL_aCS0(long, long maximumValue);
+    method public static inline long coerceIn-Y2exRck(long, long minimumValue, long maximumValue);
+    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 long lerp-SpZbbpo(long a, long b, float t);
+    method public static inline long max-gL_aCS0(long a, long b);
+    method public static inline long min-gL_aCS0(long a, long b);
+    method public static inline operator long times-GncdoDw(double, long other);
+    method public static inline operator long times-MVx5XBU(float, long other);
+    method public static inline operator long times-UlzjdM0(int, long other);
+  }
+
+  public enum TextUnitType {
+    enum_constant public static final androidx.ui.unit.TextUnitType Em;
+    enum_constant public static final androidx.ui.unit.TextUnitType Inherit;
+    enum_constant public static final androidx.ui.unit.TextUnitType Sp;
+  }
+
+  public final class Uptime implements java.lang.Comparable<androidx.ui.unit.Uptime> {
+    ctor public Uptime(long nanoseconds);
+    method public int compareTo(androidx.ui.unit.Uptime other);
+    method public long component1();
+    method public androidx.ui.unit.Uptime copy(long nanoseconds);
+    method public long getNanoseconds();
+    method public operator androidx.ui.unit.Uptime minus(androidx.ui.unit.Duration duration);
+    method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Uptime other);
+    method public operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration duration);
+    field public static final androidx.ui.unit.Uptime.Companion! Companion;
+  }
+
+  public static final class Uptime.Companion {
+    method public androidx.ui.unit.Uptime getBoot();
+    property public final androidx.ui.unit.Uptime Boot;
+  }
+
+  public final class UptimeKt {
+    method public static operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration, androidx.ui.unit.Uptime uptime);
+  }
+
+  public final class Velocity {
+    ctor public Velocity(androidx.ui.unit.PxPosition pixelsPerSecond);
+    method public androidx.ui.unit.PxPosition component1();
+    method public androidx.ui.unit.Velocity copy(androidx.ui.unit.PxPosition pixelsPerSecond);
+    method public androidx.ui.unit.PxPosition getPixelsPerSecond();
+    method public operator androidx.ui.unit.Velocity unaryMinus();
+    field public static final androidx.ui.unit.Velocity.Companion! Companion;
+  }
+
+  public static final class Velocity.Companion {
+    method public androidx.ui.unit.Velocity getZero();
+    property public final androidx.ui.unit.Velocity Zero;
+  }
+
+  public final class VelocityKt {
+    method public static operator androidx.ui.unit.Velocity minus(androidx.ui.unit.Velocity, androidx.ui.unit.Velocity other);
+    method public static operator androidx.ui.unit.Velocity plus(androidx.ui.unit.Velocity, androidx.ui.unit.Velocity other);
+  }
+
+}
+
diff --git a/ui/ui-unit/api/res-0.1.0-dev11.txt b/ui/ui-unit/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-unit/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-unit/api/restricted_0.1.0-dev11.txt b/ui/ui-unit/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..2f30c03
--- /dev/null
+++ b/ui/ui-unit/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,652 @@
+// Signature format: 3.0
+package androidx.ui.unit {
+
+  public final class Bounds {
+    ctor public Bounds(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp component1();
+    method public androidx.ui.unit.Dp component2();
+    method public androidx.ui.unit.Dp component3();
+    method public androidx.ui.unit.Dp component4();
+    method public androidx.ui.unit.Bounds copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+    method public androidx.ui.unit.Dp getBottom();
+    method public androidx.ui.unit.Dp getLeft();
+    method public androidx.ui.unit.Dp getRight();
+    method public androidx.ui.unit.Dp getTop();
+  }
+
+  public interface Density {
+    method public float getDensity();
+    method public float getFontScale();
+    method public default androidx.ui.unit.Dp toDp(float);
+    method public default androidx.ui.unit.Dp toDp(int);
+    method public default androidx.ui.unit.Dp toDp-NgWp0Z8(float);
+    method public default androidx.ui.unit.Dp toDp-gshw56o(int);
+    method public default androidx.ui.unit.Dp toDp-vVlMl6k(long);
+    method public default int toIntPx(androidx.ui.unit.Dp);
+    method public default int toIntPx-vVlMl6k(long);
+    method public default float toPx(androidx.ui.unit.Dp);
+    method public default androidx.ui.unit.PxSize toPx-kAYDl8w(long);
+    method public default float toPx-vVlMl6k(long);
+    method public default androidx.ui.geometry.Rect toRect(androidx.ui.unit.Bounds);
+    method public default long toSp(androidx.ui.unit.Dp);
+    method public default long toSp(float);
+    method public default long toSp(int);
+    method public default long toSp-NgWp0Z8(float);
+    method public default long toSp-gshw56o(int);
+    property public abstract float density;
+    property public abstract float fontScale;
+  }
+
+  public final class DensityKt {
+    method public static androidx.ui.unit.Density Density(android.content.Context context);
+    method public static androidx.ui.unit.Density Density(float density, float fontScale = 1f);
+  }
+
+  public final class Dp implements java.lang.Comparable<androidx.ui.unit.Dp> {
+    ctor public Dp(float value);
+    method public operator int compareTo(androidx.ui.unit.Dp other);
+    method public float component1();
+    method public androidx.ui.unit.Dp copy(float value);
+    method public inline operator androidx.ui.unit.Dp div(float other);
+    method public inline operator androidx.ui.unit.Dp div(int other);
+    method public inline operator float div(androidx.ui.unit.Dp other);
+    method public inline operator float div-x8crYZs(float other);
+    method public float getValue();
+    method public inline operator androidx.ui.unit.Dp minus(androidx.ui.unit.Dp other);
+    method public inline operator androidx.ui.unit.Dp plus(androidx.ui.unit.Dp other);
+    method public inline operator androidx.ui.unit.Dp times(float other);
+    method public inline operator androidx.ui.unit.Dp times(int other);
+    method public inline operator float times(androidx.ui.unit.Dp other);
+    method public inline operator float times-x8crYZs(float other);
+    method public inline operator androidx.ui.unit.Dp unaryMinus();
+    field public static final androidx.ui.unit.Dp.Companion! Companion;
+  }
+
+  public static final class Dp.Companion {
+    method public androidx.ui.unit.Dp getHairline();
+    method public androidx.ui.unit.Dp getInfinity();
+    method public androidx.ui.unit.Dp getUnspecified();
+    property public final androidx.ui.unit.Dp Hairline;
+    property public final androidx.ui.unit.Dp Infinity;
+    property public final androidx.ui.unit.Dp Unspecified;
+  }
+
+  public final inline class DpCubed implements java.lang.Comparable<androidx.ui.unit.DpCubed> {
+    ctor public DpCubed();
+    method public operator int compareTo-JDqhs2g(float p);
+    method public static operator int compareTo-JDqhs2g(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-JDqhs2g(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static inline operator float div-impl(float $this, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp div-x8crYZs(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-JDqhs2g(float $this, float dimension);
+    method public static inline operator float plus-JDqhs2g(float $this, float dimension);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final inline class DpInverse implements java.lang.Comparable<androidx.ui.unit.DpInverse> {
+    ctor public DpInverse();
+    method public operator int compareTo-_K2iRR8(float p);
+    method public static operator int compareTo-_K2iRR8(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-_K2iRR8(float $this, float dimension);
+    method public static inline operator float plus-_K2iRR8(float $this, float dimension);
+    method public static inline operator float times-JDqhs2g(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static inline operator float times-impl(float $this, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp times-x8crYZs(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final class DpKt {
+    method public static inline long Position(androidx.ui.unit.Dp x, androidx.ui.unit.Dp y);
+    method public static inline long Size(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+    method public static long center-kAYDl8w(long);
+    method public static inline androidx.ui.unit.Dp coerceAtLeast(androidx.ui.unit.Dp, androidx.ui.unit.Dp minimumValue);
+    method public static inline androidx.ui.unit.Dp coerceAtMost(androidx.ui.unit.Dp, androidx.ui.unit.Dp maximumValue);
+    method public static inline androidx.ui.unit.Dp coerceIn(androidx.ui.unit.Dp, androidx.ui.unit.Dp minimumValue, androidx.ui.unit.Dp maximumValue);
+    method public static inline operator float div(float, androidx.ui.unit.Dp other);
+    method public static inline operator float div(double, androidx.ui.unit.Dp other);
+    method public static inline operator float div(int, androidx.ui.unit.Dp other);
+    method public static androidx.ui.unit.Dp getDistance-T8eBu-w(long);
+    method public static inline androidx.ui.unit.Dp getDp(int);
+    method public static inline androidx.ui.unit.Dp getDp(double);
+    method public static inline androidx.ui.unit.Dp getDp(float);
+    method public static inline androidx.ui.unit.Dp getHeight(androidx.ui.unit.Bounds);
+    method public static inline androidx.ui.unit.Dp getWidth(androidx.ui.unit.Bounds);
+    method public static inline boolean isFinite(androidx.ui.unit.Dp);
+    method public static androidx.ui.unit.Dp lerp(androidx.ui.unit.Dp start, androidx.ui.unit.Dp stop, float fraction);
+    method public static long lerp-d5NHFfI(long start, long stop, float fraction);
+    method public static inline androidx.ui.unit.Dp max(androidx.ui.unit.Dp a, androidx.ui.unit.Dp b);
+    method public static inline androidx.ui.unit.Dp min(androidx.ui.unit.Dp a, androidx.ui.unit.Dp b);
+    method public static inline operator androidx.ui.unit.Dp times(float, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp times(double, androidx.ui.unit.Dp other);
+    method public static inline operator androidx.ui.unit.Dp times(int, androidx.ui.unit.Dp other);
+    method public static inline operator long times--D0i1nw(float, long size);
+    method public static inline operator long times-DdskrAE(int, long size);
+    method public static inline operator long times-l9Tz9ww(double, long size);
+    method public static androidx.ui.unit.Bounds toBounds-kAYDl8w(long);
+    method public static inline long toSize(androidx.ui.unit.Bounds);
+  }
+
+  public final inline class DpSquared implements java.lang.Comparable<androidx.ui.unit.DpSquared> {
+    ctor public DpSquared();
+    method public operator int compareTo-x8crYZs(float p);
+    method public static operator int compareTo-x8crYZs(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-JDqhs2g(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static inline operator androidx.ui.unit.Dp div-impl(float $this, androidx.ui.unit.Dp other);
+    method public static inline operator float div-x8crYZs(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-x8crYZs(float $this, float other);
+    method public static inline operator float plus-x8crYZs(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static inline operator float times-impl(float $this, androidx.ui.unit.Dp other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final class Duration implements java.lang.Comparable<androidx.ui.unit.Duration> {
+    ctor public Duration(long nanoseconds);
+    method public int compareTo(androidx.ui.unit.Duration other);
+    method public long component1();
+    method public androidx.ui.unit.Duration copy(long nanoseconds);
+    method public operator androidx.ui.unit.Duration div(int quotient);
+    method public operator androidx.ui.unit.Duration div(double quotient);
+    method public long getNanoseconds();
+    method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Duration other);
+    method public operator androidx.ui.unit.Duration plus(androidx.ui.unit.Duration other);
+    method public operator androidx.ui.unit.Duration times(int factor);
+    method public operator androidx.ui.unit.Duration times(double factor);
+    field public static final androidx.ui.unit.Duration.Companion! Companion;
+  }
+
+  public static final class Duration.Companion {
+    method public androidx.ui.unit.Duration getZero();
+    property public final androidx.ui.unit.Duration Zero;
+  }
+
+  public final class Durations {
+    method public static androidx.ui.unit.Duration Duration(long days = 0, long hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0, long nanoseconds = 0);
+    method public static androidx.ui.unit.Duration getDays(long);
+    method public static androidx.ui.unit.Duration getDays(int);
+    method public static androidx.ui.unit.Duration getHours(long);
+    method public static androidx.ui.unit.Duration getHours(int);
+    method public static androidx.ui.unit.Duration getMicroseconds(long);
+    method public static androidx.ui.unit.Duration getMicroseconds(int);
+    method public static androidx.ui.unit.Duration getMilliseconds(long);
+    method public static androidx.ui.unit.Duration getMilliseconds(int);
+    method public static androidx.ui.unit.Duration getMinutes(long);
+    method public static androidx.ui.unit.Duration getMinutes(int);
+    method public static androidx.ui.unit.Duration getNanoseconds(long);
+    method public static androidx.ui.unit.Duration getNanoseconds(int);
+    method public static long getNanosecondsPerDay();
+    method public static long getNanosecondsPerHour();
+    method public static long getNanosecondsPerMillisecond();
+    method public static long getNanosecondsPerMinute();
+    method public static long getNanosecondsPerSecond();
+    method public static androidx.ui.unit.Duration getSeconds(long);
+    method public static androidx.ui.unit.Duration getSeconds(int);
+    method public static long inDays(androidx.ui.unit.Duration);
+    method public static long inHours(androidx.ui.unit.Duration);
+    method public static long inMicroseconds(androidx.ui.unit.Duration);
+    method public static long inMilliseconds(androidx.ui.unit.Duration);
+    method public static long inMinutes(androidx.ui.unit.Duration);
+    method public static long inSeconds(androidx.ui.unit.Duration);
+    field public static final long HoursPerDay = 24L; // 0x18L
+    field public static final long MicrosecondsPerMillisecond = 1000L; // 0x3e8L
+    field public static final long MillisecondsPerSecond = 1000L; // 0x3e8L
+    field public static final long MinutesPerHour = 60L; // 0x3cL
+    field public static final long NanosecondsPerMicrosecond = 1000L; // 0x3e8L
+    field public static final long SecondsPerMinute = 60L; // 0x3cL
+  }
+
+  public final inline class IntPx implements java.lang.Comparable<androidx.ui.unit.IntPx> {
+    ctor public IntPx();
+    method public static inline operator int compareTo-NgWp0Z8(int $this, float other);
+    method public operator int compareTo-gshw56o(int p);
+    method public static operator int compareTo-gshw56o(int $this, int other);
+    method public static int constructor-impl(int value);
+    method public static operator int div-impl(int $this, float other);
+    method public static operator int div-impl(int $this, double other);
+    method public static operator int div-impl(int $this, int other);
+    method public static boolean equals-impl(int p, Object? p1);
+    method public static boolean equals-impl0(int p1, int p2);
+    method public int getValue();
+    method public static int hashCode-impl(int p);
+    method public static operator int minus-gshw56o(int $this, int other);
+    method public static operator int plus-gshw56o(int $this, int other);
+    method public static inline operator int rem-impl(int $this, int other);
+    method public static operator int times-impl(int $this, float other);
+    method public static operator int times-impl(int $this, double other);
+    method public static operator int times-impl(int $this, int other);
+    method public static String toString-impl(int $this);
+    method public static operator int unaryMinus-impl(int $this);
+    field public static final androidx.ui.unit.IntPx.Companion! Companion;
+  }
+
+  public static final class IntPx.Companion {
+    method public int getInfinity();
+    method public int getZero();
+    property public final int Infinity;
+    property public final int Zero;
+  }
+
+  public final class IntPxBounds {
+    method public int component1();
+    method public int component2();
+    method public int component3();
+    method public int component4();
+    method public androidx.ui.unit.IntPxBounds copy-Q13GOEE(int left, int top, int right, int bottom);
+    method public int getBottom();
+    method public int getLeft();
+    method public int getRight();
+    method public int getTop();
+  }
+
+  public final class IntPxKt {
+    method public static inline androidx.ui.unit.IntPxPosition IntPxPosition-rRMsBxU(int x, int y);
+    method public static inline androidx.ui.unit.IntPxSize IntPxSize-rRMsBxU(int width, int height);
+    method public static inline androidx.ui.unit.PxPosition PxPosition-rRMsBxU(int x, int y);
+    method public static inline androidx.ui.unit.PxSize PxSize-rRMsBxU(int width, int height);
+    method public static inline int ceil-NgWp0Z8(float);
+    method public static androidx.ui.unit.IntPxPosition center(androidx.ui.unit.IntPxSize);
+    method public static inline androidx.ui.unit.IntPxPosition center(androidx.ui.unit.IntPxBounds);
+    method public static inline int coerceAtLeast-rRMsBxU(int, int minimumValue);
+    method public static inline int coerceAtMost-rRMsBxU(int, int maximumValue);
+    method public static inline int coerceIn-qx1LT1w(int, int minimumValue, int maximumValue);
+    method public static inline int getHeight(androidx.ui.unit.IntPxBounds);
+    method public static inline int getIpx(int);
+    method public static inline int getWidth(androidx.ui.unit.IntPxBounds);
+    method public static inline boolean isFinite-gshw56o(int);
+    method public static androidx.ui.unit.IntPxPosition lerp(androidx.ui.unit.IntPxPosition start, androidx.ui.unit.IntPxPosition stop, float fraction);
+    method public static int lerp-9BbVZj8(int start, int stop, float fraction);
+    method public static inline int max-rRMsBxU(int a, int b);
+    method public static inline int min-rRMsBxU(int a, int b);
+    method public static inline int round-NgWp0Z8(float);
+    method public static inline operator androidx.ui.unit.IntPxSize times(int, androidx.ui.unit.IntPxSize size);
+    method public static inline operator int times--Vi_IPY(float, int other);
+    method public static inline operator int times-9kGzznM(int, int other);
+    method public static inline operator int times-tHVXE4c(double, int other);
+    method public static inline float toPx-gshw56o(int);
+    method public static inline androidx.ui.unit.PxPosition toPxPosition(androidx.ui.unit.IntPxPosition);
+    method public static inline androidx.ui.unit.PxSize toPxSize(androidx.ui.unit.IntPxSize);
+    method public static inline androidx.ui.unit.IntPxSize toSize(androidx.ui.unit.IntPxBounds);
+  }
+
+  public final class IntPxPosition {
+    method public androidx.ui.unit.IntPxPosition copy(long value);
+    method public inline int getX();
+    method public inline int getY();
+    method public inline operator androidx.ui.unit.IntPxPosition minus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.IntPxPosition plus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.IntPxPosition unaryMinus();
+    property public final inline int x;
+    property public final inline int y;
+    field public static final androidx.ui.unit.IntPxPosition.Companion! Companion;
+  }
+
+  public static final class IntPxPosition.Companion {
+    method public androidx.ui.unit.IntPxPosition getOrigin();
+    property public final androidx.ui.unit.IntPxPosition Origin;
+  }
+
+  public final class IntPxSize {
+    method public androidx.ui.unit.IntPxSize copy(long value);
+    method public inline operator androidx.ui.unit.IntPxSize div(int other);
+    method public inline int getHeight();
+    method public inline int getWidth();
+    method public inline operator androidx.ui.unit.IntPxSize times(int other);
+    property public final inline int height;
+    property public final inline int width;
+  }
+
+  public final inline class IntSize {
+    ctor public IntSize();
+    method public static long constructor-impl(internal long value);
+    method public static operator long div-impl(long $this, int other);
+    method public static 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 public static int hashCode-impl(long p);
+    method public static operator long times-impl(long $this, int other);
+    method public static String toString-impl(long $this);
+  }
+
+  public final class IntSizeKt {
+    method public static long IntSize(int width, int height);
+    method public static operator long times-twsQOwo(int, long size);
+  }
+
+  public final inline class Position {
+    ctor public Position();
+    method public static long constructor-impl(internal long value);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static androidx.ui.unit.Dp getX-impl(long $this);
+    method public static androidx.ui.unit.Dp getY-impl(long $this);
+    method public static int hashCode-impl(long p);
+    method public static inline operator long minus-T8eBu-w(long $this, long other);
+    method public static inline operator long plus-T8eBu-w(long $this, long other);
+    method public static String toString-impl(long $this);
+  }
+
+  public final inline class Px implements java.lang.Comparable<androidx.ui.unit.Px> {
+    ctor public Px();
+    method public operator int compareTo-NgWp0Z8(float p);
+    method public static operator int compareTo-NgWp0Z8(float $this, float other);
+    method public static inline operator int compareTo-gshw56o(float $this, int other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-NgWp0Z8(float $this, float other);
+    method public static inline operator float div-RjPF0Mw(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static inline operator float div-impl(float $this, int other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-NgWp0Z8(float $this, float other);
+    method public static inline operator float minus-gshw56o(float $this, int other);
+    method public static inline operator float plus-NgWp0Z8(float $this, float other);
+    method public static inline operator float plus-gshw56o(float $this, int other);
+    method public static inline operator float times-NgWp0Z8(float $this, float other);
+    method public static inline operator float times-RjPF0Mw(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static inline operator float times-impl(float $this, int other);
+    method public static String toString-impl(float $this);
+    method public static inline operator float unaryMinus-impl(float $this);
+    field public static final androidx.ui.unit.Px.Companion! Companion;
+  }
+
+  public static final class Px.Companion {
+    method public float getInfinity();
+    method public float getZero();
+    property public final float Infinity;
+    property public final float Zero;
+  }
+
+  public final class PxBounds {
+    method public float component1();
+    method public float component2();
+    method public float component3();
+    method public float component4();
+    method public androidx.ui.unit.PxBounds copy-wHlpFhg(float left, float top, float right, float bottom);
+    method public float getBottom();
+    method public float getLeft();
+    method public float getRight();
+    method public float getTop();
+  }
+
+  public final inline class PxCubed implements java.lang.Comparable<androidx.ui.unit.PxCubed> {
+    ctor public PxCubed();
+    method public operator int compareTo-bji3ab4(float p);
+    method public static operator int compareTo-bji3ab4(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-NgWp0Z8(float $this, float other);
+    method public static inline operator float div-RjPF0Mw(float $this, float other);
+    method public static inline operator float div-bji3ab4(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-bji3ab4(float $this, float dimension);
+    method public static inline operator float plus-bji3ab4(float $this, float dimension);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final inline class PxInverse implements java.lang.Comparable<androidx.ui.unit.PxInverse> {
+    ctor public PxInverse();
+    method public operator int compareTo-KGV0gLo(float p);
+    method public static operator int compareTo-KGV0gLo(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-KGV0gLo(float $this, float dimension);
+    method public static inline operator float plus-KGV0gLo(float $this, float dimension);
+    method public static inline operator float times-NgWp0Z8(float $this, float other);
+    method public static inline operator float times-RjPF0Mw(float $this, float other);
+    method public static inline operator float times-bji3ab4(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final class PxKt {
+    method public static inline androidx.ui.unit.PxBounds PxBounds(androidx.ui.unit.PxPosition topLeft, androidx.ui.unit.PxSize size);
+    method public static inline androidx.ui.unit.PxPosition PxPosition-qHcltEY(float x, float y);
+    method public static inline androidx.ui.unit.PxSize PxSize-qHcltEY(float width, float height);
+    method public static inline float abs-NgWp0Z8(float x);
+    method public static androidx.ui.unit.PxPosition center(androidx.ui.unit.PxSize);
+    method public static inline androidx.ui.unit.PxPosition center(androidx.ui.unit.PxBounds);
+    method public static inline float coerceAtLeast-qHcltEY(float, float minimumValue);
+    method public static inline float coerceAtMost-qHcltEY(float, float maximumValue);
+    method public static inline float coerceIn-HXvnt1Q(float, float minimumValue, float maximumValue);
+    method public static inline operator float div-78fIwVY(double, float other);
+    method public static inline operator float div-Ndu7NvY(int, float other);
+    method public static inline operator float div-kxDXtn8(float, float other);
+    method public static float getDistance(androidx.ui.unit.PxPosition);
+    method public static inline float getHeight(androidx.ui.unit.PxBounds);
+    method public static float getMinDimension(androidx.ui.unit.PxSize);
+    method public static inline float getPx(int);
+    method public static inline float getPx(double);
+    method public static inline float getPx(float);
+    method public static inline float getWidth(androidx.ui.unit.PxBounds);
+    method public static androidx.ui.unit.PxPosition lerp(androidx.ui.unit.PxPosition start, androidx.ui.unit.PxPosition stop, float fraction);
+    method public static float lerp-g-Fs4Ag(float start, float stop, float fraction);
+    method public static inline float max-qHcltEY(float a, float b);
+    method public static inline float min-qHcltEY(float a, float b);
+    method public static inline androidx.ui.unit.IntPxPosition round(androidx.ui.unit.PxPosition);
+    method public static inline operator androidx.ui.unit.PxSize times(int, androidx.ui.unit.PxSize size);
+    method public static inline operator androidx.ui.unit.PxSize times(float, androidx.ui.unit.PxSize size);
+    method public static inline operator androidx.ui.unit.PxSize times(double, androidx.ui.unit.PxSize size);
+    method public static inline operator float times-78fIwVY(double, float other);
+    method public static inline operator float times-Ndu7NvY(int, float other);
+    method public static inline operator float times-kxDXtn8(float, float other);
+    method public static androidx.ui.unit.PxBounds toBounds(androidx.ui.unit.PxSize);
+    method public static inline androidx.ui.geometry.Offset toOffset(androidx.ui.unit.PxPosition);
+    method public static androidx.ui.geometry.Rect toRect(androidx.ui.unit.PxBounds);
+    method public static androidx.ui.geometry.Rect toRect(androidx.ui.unit.PxSize);
+    method public static androidx.ui.unit.PxSize toSize(androidx.ui.unit.PxBounds);
+  }
+
+  public final class PxPosition {
+    method public androidx.ui.unit.PxPosition copy(long value);
+    method public inline float getX();
+    method public inline float getY();
+    method public inline operator androidx.ui.unit.PxPosition minus(androidx.ui.unit.PxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition minus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition plus(androidx.ui.unit.PxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition plus(androidx.ui.unit.IntPxPosition other);
+    method public inline operator androidx.ui.unit.PxPosition unaryMinus();
+    property public final inline float x;
+    property public final inline float y;
+    field public static final androidx.ui.unit.PxPosition.Companion! Companion;
+  }
+
+  public static final class PxPosition.Companion {
+    method public androidx.ui.unit.PxPosition getOrigin();
+    property public final androidx.ui.unit.PxPosition Origin;
+  }
+
+  public final class PxSize {
+    method public androidx.ui.unit.PxSize copy(long value);
+    method public inline operator androidx.ui.unit.PxSize div(int other);
+    method public inline operator androidx.ui.unit.PxSize div(float other);
+    method public inline operator androidx.ui.unit.PxSize div(double other);
+    method public inline float getHeight();
+    method public inline float getWidth();
+    method public inline operator androidx.ui.unit.PxSize times(int other);
+    method public inline operator androidx.ui.unit.PxSize times(float other);
+    method public inline operator androidx.ui.unit.PxSize times(double other);
+    property public final inline float height;
+    property public final inline float width;
+    field public static final androidx.ui.unit.PxSize.Companion! Companion;
+  }
+
+  public static final class PxSize.Companion {
+    method public androidx.ui.unit.PxSize getUnspecifiedSize();
+    method public androidx.ui.unit.PxSize getZero();
+    property public final androidx.ui.unit.PxSize UnspecifiedSize;
+    property public final androidx.ui.unit.PxSize Zero;
+  }
+
+  public final inline class PxSquared implements java.lang.Comparable<androidx.ui.unit.PxSquared> {
+    ctor public PxSquared();
+    method public operator int compareTo-RjPF0Mw(float p);
+    method public static operator int compareTo-RjPF0Mw(float $this, float other);
+    method public static float constructor-impl(float value);
+    method public static inline operator float div-NgWp0Z8(float $this, float other);
+    method public static inline operator float div-RjPF0Mw(float $this, float other);
+    method public static inline operator float div-bji3ab4(float $this, float other);
+    method public static inline operator float div-impl(float $this, float other);
+    method public static boolean equals-impl(float p, Object? p1);
+    method public static boolean equals-impl0(float p1, float p2);
+    method public float getValue();
+    method public static int hashCode-impl(float p);
+    method public static inline operator float minus-RjPF0Mw(float $this, float other);
+    method public static inline operator float plus-RjPF0Mw(float $this, float other);
+    method public static inline operator float times-NgWp0Z8(float $this, float other);
+    method public static inline operator float times-impl(float $this, float other);
+    method public static String toString-impl(float $this);
+  }
+
+  public final inline class Size {
+    ctor public Size();
+    method public static long constructor-impl(internal long value);
+    method public static inline operator long div-impl(long $this, int other);
+    method public static inline operator long div-impl(long $this, float other);
+    method public static inline operator long div-impl(long $this, double other);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public static androidx.ui.unit.Dp getHeight-impl(long $this);
+    method public static androidx.ui.unit.Dp getWidth-impl(long $this);
+    method public static int hashCode-impl(long p);
+    method public static inline operator long times-impl(long $this, int other);
+    method public static inline operator long times-impl(long $this, float other);
+    method public static inline operator long times-impl(long $this, double other);
+    method public static String toString-impl(long $this);
+  }
+
+  public final inline class TextUnit {
+    ctor public TextUnit();
+    method public static inline operator int compareTo-vVlMl6k(long $this, long other);
+    method public static long constructor-impl(long packedValue);
+    method public static inline operator long div-impl(long $this, float other);
+    method public static inline operator long div-impl(long $this, double other);
+    method public static inline operator long div-impl(long $this, int other);
+    method public static inline operator float div-vVlMl6k(long $this, long other);
+    method public static boolean equals-impl(long p, Object? p1);
+    method public static boolean equals-impl0(long p1, long p2);
+    method public long getPackedValue();
+    method public static androidx.ui.unit.TextUnitType getType-impl(long $this);
+    method public static float getValue-impl(long $this);
+    method public static int hashCode-impl(long p);
+    method public static boolean isEm-impl(long $this);
+    method public static boolean isInherit-impl(long $this);
+    method public static boolean isSp-impl(long $this);
+    method public static inline operator long minus-vVlMl6k(long $this, long other);
+    method public static inline operator long plus-vVlMl6k(long $this, long other);
+    method public static inline operator long times-impl(long $this, float other);
+    method public static inline operator long times-impl(long $this, double other);
+    method public static inline operator long times-impl(long $this, int other);
+    method public static String toString-impl(long $this);
+    method public static inline operator long unaryMinus-impl(long $this);
+    field public static final androidx.ui.unit.TextUnit.Companion! Companion;
+  }
+
+  public static final class TextUnit.Companion {
+    method public long Em(int value);
+    method public long Em(float value);
+    method public long Em(double value);
+    method public long Sp(int value);
+    method public long Sp(float value);
+    method public long Sp(double value);
+    method public long getInherit();
+    property public final long Inherit;
+  }
+
+  public final class TextUnitKt {
+    method public static inline long coerceAtLeast-gL_aCS0(long, long minimumValue);
+    method public static inline long coerceAtMost-gL_aCS0(long, long maximumValue);
+    method public static inline long coerceIn-Y2exRck(long, long minimumValue, long maximumValue);
+    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 long lerp-SpZbbpo(long a, long b, float t);
+    method public static inline long max-gL_aCS0(long a, long b);
+    method public static inline long min-gL_aCS0(long a, long b);
+    method public static inline operator long times-GncdoDw(double, long other);
+    method public static inline operator long times-MVx5XBU(float, long other);
+    method public static inline operator long times-UlzjdM0(int, long other);
+  }
+
+  public enum TextUnitType {
+    enum_constant public static final androidx.ui.unit.TextUnitType Em;
+    enum_constant public static final androidx.ui.unit.TextUnitType Inherit;
+    enum_constant public static final androidx.ui.unit.TextUnitType Sp;
+  }
+
+  public final class Uptime implements java.lang.Comparable<androidx.ui.unit.Uptime> {
+    ctor public Uptime(long nanoseconds);
+    method public int compareTo(androidx.ui.unit.Uptime other);
+    method public long component1();
+    method public androidx.ui.unit.Uptime copy(long nanoseconds);
+    method public long getNanoseconds();
+    method public operator androidx.ui.unit.Uptime minus(androidx.ui.unit.Duration duration);
+    method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Uptime other);
+    method public operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration duration);
+    field public static final androidx.ui.unit.Uptime.Companion! Companion;
+  }
+
+  public static final class Uptime.Companion {
+    method public androidx.ui.unit.Uptime getBoot();
+    property public final androidx.ui.unit.Uptime Boot;
+  }
+
+  public final class UptimeKt {
+    method public static operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration, androidx.ui.unit.Uptime uptime);
+  }
+
+  public final class Velocity {
+    ctor public Velocity(androidx.ui.unit.PxPosition pixelsPerSecond);
+    method public androidx.ui.unit.PxPosition component1();
+    method public androidx.ui.unit.Velocity copy(androidx.ui.unit.PxPosition pixelsPerSecond);
+    method public androidx.ui.unit.PxPosition getPixelsPerSecond();
+    method public operator androidx.ui.unit.Velocity unaryMinus();
+    field public static final androidx.ui.unit.Velocity.Companion! Companion;
+  }
+
+  public static final class Velocity.Companion {
+    method public androidx.ui.unit.Velocity getZero();
+    property public final androidx.ui.unit.Velocity Zero;
+  }
+
+  public final class VelocityKt {
+    method public static operator androidx.ui.unit.Velocity minus(androidx.ui.unit.Velocity, androidx.ui.unit.Velocity other);
+    method public static operator androidx.ui.unit.Velocity plus(androidx.ui.unit.Velocity, androidx.ui.unit.Velocity other);
+  }
+
+}
+
diff --git a/ui/ui-util/api/0.1.0-dev11.txt b/ui/ui-util/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..e8faee5
--- /dev/null
+++ b/ui/ui-util/api/0.1.0-dev11.txt
@@ -0,0 +1,35 @@
+// Signature format: 3.0
+package androidx.ui.util {
+
+  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 fastAny(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);
+  }
+
+  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);
+    method public static String toHexString(int);
+    method public static String toStringAsFixed(float, int digits);
+  }
+
+  public final class SynchronizationHelperKt {
+    method public static <T> T! synchronized(Object lock, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class TraceKt {
+    method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+}
+
diff --git a/ui/ui-util/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-util/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..e8faee5
--- /dev/null
+++ b/ui/ui-util/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,35 @@
+// Signature format: 3.0
+package androidx.ui.util {
+
+  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 fastAny(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);
+  }
+
+  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);
+    method public static String toHexString(int);
+    method public static String toStringAsFixed(float, int digits);
+  }
+
+  public final class SynchronizationHelperKt {
+    method public static <T> T! synchronized(Object lock, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class TraceKt {
+    method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+}
+
diff --git a/ui/ui-util/api/res-0.1.0-dev11.txt b/ui/ui-util/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-util/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-util/api/restricted_0.1.0-dev11.txt b/ui/ui-util/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..e8faee5
--- /dev/null
+++ b/ui/ui-util/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,35 @@
+// Signature format: 3.0
+package androidx.ui.util {
+
+  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 fastAny(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);
+  }
+
+  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);
+    method public static String toHexString(int);
+    method public static String toStringAsFixed(float, int digits);
+  }
+
+  public final class SynchronizationHelperKt {
+    method public static <T> T! synchronized(Object lock, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+  public final class TraceKt {
+    method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+  }
+
+}
+
diff --git a/ui/ui-vector/api/0.1.0-dev11.txt b/ui/ui-vector/api/0.1.0-dev11.txt
new file mode 100644
index 0000000..85a63f89
--- /dev/null
+++ b/ui/ui-vector/api/0.1.0-dev11.txt
@@ -0,0 +1,144 @@
+// Signature format: 3.0
+package androidx.ui.graphics.vector {
+
+  public final class GroupComponent extends androidx.ui.graphics.vector.VNode {
+    ctor public GroupComponent(String name);
+    ctor public GroupComponent();
+    method public String component1();
+    method public androidx.ui.graphics.vector.GroupComponent copy(String name);
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public java.util.List<androidx.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 void insertAt(int index, androidx.ui.graphics.vector.VNode instance);
+    method public void move(int from, int to, int count);
+    method public void remove(int index, int count);
+    method public void setClipPathData(java.util.List<? extends androidx.ui.graphics.vector.PathNode> value);
+    method public void setPivotX(float value);
+    method public void setPivotY(float value);
+    method public void setRotation(float value);
+    method public void setScaleX(float value);
+    method public void setScaleY(float value);
+    method public void setTranslationX(float value);
+    method public void setTranslationY(float value);
+    property public final java.util.List<androidx.ui.graphics.vector.PathNode> clipPathData;
+    property public kotlin.jvm.functions.Function0<kotlin.Unit>? invalidateListener;
+    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 PathComponent extends androidx.ui.graphics.vector.VNode {
+    ctor public PathComponent(String name);
+    method public String component1();
+    method public androidx.ui.graphics.vector.PathComponent copy(String name);
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public androidx.ui.graphics.Brush? getFill();
+    method public float getFillAlpha();
+    method public String getName();
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> getPathData();
+    method public androidx.ui.graphics.Brush? getStroke();
+    method public float getStrokeAlpha();
+    method public androidx.ui.graphics.StrokeCap getStrokeLineCap();
+    method public androidx.ui.graphics.StrokeJoin getStrokeLineJoin();
+    method public float getStrokeLineMiter();
+    method public float getStrokeLineWidth();
+    method public void setFill(androidx.ui.graphics.Brush? value);
+    method public void setFillAlpha(float value);
+    method public void setPathData(java.util.List<? extends androidx.ui.graphics.vector.PathNode> value);
+    method public void setStroke(androidx.ui.graphics.Brush? value);
+    method public void setStrokeAlpha(float value);
+    method public void setStrokeLineCap(androidx.ui.graphics.StrokeCap value);
+    method public void setStrokeLineJoin(androidx.ui.graphics.StrokeJoin value);
+    method public void setStrokeLineMiter(float value);
+    method public void setStrokeLineWidth(float value);
+    property public final androidx.ui.graphics.Brush? fill;
+    property public final float fillAlpha;
+    property public final java.util.List<androidx.ui.graphics.vector.PathNode> pathData;
+    property public final androidx.ui.graphics.Brush? stroke;
+    property public final float strokeAlpha;
+    property public final androidx.ui.graphics.StrokeCap strokeLineCap;
+    property public final androidx.ui.graphics.StrokeJoin strokeLineJoin;
+    property public final float strokeLineMiter;
+    property public final float strokeLineWidth;
+  }
+
+  public abstract sealed class VNode {
+    method public abstract void draw(androidx.ui.graphics.Canvas canvas);
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? getInvalidateListener();
+    method public final void invalidate();
+    method public void setInvalidateListener(kotlin.jvm.functions.Function0<kotlin.Unit>? p);
+    property public kotlin.jvm.functions.Function0<kotlin.Unit>? invalidateListener;
+  }
+
+  public final class VectorComponent extends androidx.ui.graphics.vector.VNode {
+    method public void draw(androidx.ui.graphics.Canvas canvas, float alpha, androidx.ui.graphics.ColorFilter? colorFilter);
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public float getDefaultHeight();
+    method public float getDefaultWidth();
+    method public String getName();
+    method public androidx.ui.graphics.vector.GroupComponent getRoot();
+    method public int getSize();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+    method public void setDefaultHeight-NgWp0Z8(float p);
+    method public void setDefaultWidth-NgWp0Z8(float p);
+    method public void setViewportHeight(float p);
+    method public void setViewportWidth(float p);
+    property public final androidx.ui.graphics.vector.GroupComponent root;
+    property public final int size;
+  }
+
+  public final class VectorComposeNonIRKt {
+    method public static androidx.compose.Composition composeVector(androidx.ui.graphics.vector.VectorComponent container, androidx.compose.Recomposer recomposer, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> composable);
+    method @Deprecated public static androidx.compose.Composition composeVector(androidx.ui.graphics.vector.VectorComponent container, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> composable);
+  }
+
+  public final class VectorComposer extends androidx.compose.Composer<androidx.ui.graphics.vector.VNode> {
+    ctor public VectorComposer(androidx.ui.graphics.vector.VNode root, androidx.compose.SlotTable slotTable, androidx.compose.Recomposer recomposer);
+    method public inline <T extends androidx.ui.graphics.vector.VNode> void emit(Object key, kotlin.jvm.functions.Function0<? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<androidx.ui.graphics.vector.VNode,androidx.ui.graphics.vector.VNode>,kotlin.Unit> update);
+    method public inline void emit(Object key, kotlin.jvm.functions.Function0<androidx.ui.graphics.vector.GroupComponent> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<androidx.ui.graphics.vector.VNode,androidx.ui.graphics.vector.GroupComponent>,kotlin.Unit> update, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public androidx.ui.graphics.vector.VNode getRoot();
+  }
+
+  public final class VectorKt {
+    method public static inline java.util.List<androidx.ui.graphics.vector.PathNode> PathData(kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.PathBuilder,kotlin.Unit> block);
+    method public static java.util.List<androidx.ui.graphics.vector.PathNode> addPathNodes(String? pathStr);
+    method public static androidx.ui.graphics.StrokeCap getDefaultStrokeLineCap();
+    method public static androidx.ui.graphics.StrokeJoin getDefaultStrokeLineJoin();
+    method public static androidx.ui.graphics.BlendMode getDefaultTintBlendMode();
+    method public static long getDefaultTintColor();
+    method public static java.util.List<androidx.ui.graphics.vector.PathNode> getEmptyPath();
+    field public static final float DefaultAlpha = 1.0f;
+    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;
+  }
+
+  public final class VectorScope {
+    ctor public VectorScope(androidx.ui.graphics.vector.VectorComposer composer);
+    method public androidx.ui.graphics.vector.VectorComposer getComposer();
+  }
+
+}
+
diff --git a/ui/ui-vector/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-vector/api/public_plus_experimental_0.1.0-dev11.txt
new file mode 100644
index 0000000..85a63f89
--- /dev/null
+++ b/ui/ui-vector/api/public_plus_experimental_0.1.0-dev11.txt
@@ -0,0 +1,144 @@
+// Signature format: 3.0
+package androidx.ui.graphics.vector {
+
+  public final class GroupComponent extends androidx.ui.graphics.vector.VNode {
+    ctor public GroupComponent(String name);
+    ctor public GroupComponent();
+    method public String component1();
+    method public androidx.ui.graphics.vector.GroupComponent copy(String name);
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public java.util.List<androidx.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 void insertAt(int index, androidx.ui.graphics.vector.VNode instance);
+    method public void move(int from, int to, int count);
+    method public void remove(int index, int count);
+    method public void setClipPathData(java.util.List<? extends androidx.ui.graphics.vector.PathNode> value);
+    method public void setPivotX(float value);
+    method public void setPivotY(float value);
+    method public void setRotation(float value);
+    method public void setScaleX(float value);
+    method public void setScaleY(float value);
+    method public void setTranslationX(float value);
+    method public void setTranslationY(float value);
+    property public final java.util.List<androidx.ui.graphics.vector.PathNode> clipPathData;
+    property public kotlin.jvm.functions.Function0<kotlin.Unit>? invalidateListener;
+    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 PathComponent extends androidx.ui.graphics.vector.VNode {
+    ctor public PathComponent(String name);
+    method public String component1();
+    method public androidx.ui.graphics.vector.PathComponent copy(String name);
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public androidx.ui.graphics.Brush? getFill();
+    method public float getFillAlpha();
+    method public String getName();
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> getPathData();
+    method public androidx.ui.graphics.Brush? getStroke();
+    method public float getStrokeAlpha();
+    method public androidx.ui.graphics.StrokeCap getStrokeLineCap();
+    method public androidx.ui.graphics.StrokeJoin getStrokeLineJoin();
+    method public float getStrokeLineMiter();
+    method public float getStrokeLineWidth();
+    method public void setFill(androidx.ui.graphics.Brush? value);
+    method public void setFillAlpha(float value);
+    method public void setPathData(java.util.List<? extends androidx.ui.graphics.vector.PathNode> value);
+    method public void setStroke(androidx.ui.graphics.Brush? value);
+    method public void setStrokeAlpha(float value);
+    method public void setStrokeLineCap(androidx.ui.graphics.StrokeCap value);
+    method public void setStrokeLineJoin(androidx.ui.graphics.StrokeJoin value);
+    method public void setStrokeLineMiter(float value);
+    method public void setStrokeLineWidth(float value);
+    property public final androidx.ui.graphics.Brush? fill;
+    property public final float fillAlpha;
+    property public final java.util.List<androidx.ui.graphics.vector.PathNode> pathData;
+    property public final androidx.ui.graphics.Brush? stroke;
+    property public final float strokeAlpha;
+    property public final androidx.ui.graphics.StrokeCap strokeLineCap;
+    property public final androidx.ui.graphics.StrokeJoin strokeLineJoin;
+    property public final float strokeLineMiter;
+    property public final float strokeLineWidth;
+  }
+
+  public abstract sealed class VNode {
+    method public abstract void draw(androidx.ui.graphics.Canvas canvas);
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? getInvalidateListener();
+    method public final void invalidate();
+    method public void setInvalidateListener(kotlin.jvm.functions.Function0<kotlin.Unit>? p);
+    property public kotlin.jvm.functions.Function0<kotlin.Unit>? invalidateListener;
+  }
+
+  public final class VectorComponent extends androidx.ui.graphics.vector.VNode {
+    method public void draw(androidx.ui.graphics.Canvas canvas, float alpha, androidx.ui.graphics.ColorFilter? colorFilter);
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public float getDefaultHeight();
+    method public float getDefaultWidth();
+    method public String getName();
+    method public androidx.ui.graphics.vector.GroupComponent getRoot();
+    method public int getSize();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+    method public void setDefaultHeight-NgWp0Z8(float p);
+    method public void setDefaultWidth-NgWp0Z8(float p);
+    method public void setViewportHeight(float p);
+    method public void setViewportWidth(float p);
+    property public final androidx.ui.graphics.vector.GroupComponent root;
+    property public final int size;
+  }
+
+  public final class VectorComposeNonIRKt {
+    method public static androidx.compose.Composition composeVector(androidx.ui.graphics.vector.VectorComponent container, androidx.compose.Recomposer recomposer, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> composable);
+    method @Deprecated public static androidx.compose.Composition composeVector(androidx.ui.graphics.vector.VectorComponent container, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> composable);
+  }
+
+  public final class VectorComposer extends androidx.compose.Composer<androidx.ui.graphics.vector.VNode> {
+    ctor public VectorComposer(androidx.ui.graphics.vector.VNode root, androidx.compose.SlotTable slotTable, androidx.compose.Recomposer recomposer);
+    method public inline <T extends androidx.ui.graphics.vector.VNode> void emit(Object key, kotlin.jvm.functions.Function0<? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<androidx.ui.graphics.vector.VNode,androidx.ui.graphics.vector.VNode>,kotlin.Unit> update);
+    method public inline void emit(Object key, kotlin.jvm.functions.Function0<androidx.ui.graphics.vector.GroupComponent> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<androidx.ui.graphics.vector.VNode,androidx.ui.graphics.vector.GroupComponent>,kotlin.Unit> update, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public androidx.ui.graphics.vector.VNode getRoot();
+  }
+
+  public final class VectorKt {
+    method public static inline java.util.List<androidx.ui.graphics.vector.PathNode> PathData(kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.PathBuilder,kotlin.Unit> block);
+    method public static java.util.List<androidx.ui.graphics.vector.PathNode> addPathNodes(String? pathStr);
+    method public static androidx.ui.graphics.StrokeCap getDefaultStrokeLineCap();
+    method public static androidx.ui.graphics.StrokeJoin getDefaultStrokeLineJoin();
+    method public static androidx.ui.graphics.BlendMode getDefaultTintBlendMode();
+    method public static long getDefaultTintColor();
+    method public static java.util.List<androidx.ui.graphics.vector.PathNode> getEmptyPath();
+    field public static final float DefaultAlpha = 1.0f;
+    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;
+  }
+
+  public final class VectorScope {
+    ctor public VectorScope(androidx.ui.graphics.vector.VectorComposer composer);
+    method public androidx.ui.graphics.vector.VectorComposer getComposer();
+  }
+
+}
+
diff --git a/ui/ui-vector/api/res-0.1.0-dev11.txt b/ui/ui-vector/api/res-0.1.0-dev11.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ui/ui-vector/api/res-0.1.0-dev11.txt
diff --git a/ui/ui-vector/api/restricted_0.1.0-dev11.txt b/ui/ui-vector/api/restricted_0.1.0-dev11.txt
new file mode 100644
index 0000000..85a63f89
--- /dev/null
+++ b/ui/ui-vector/api/restricted_0.1.0-dev11.txt
@@ -0,0 +1,144 @@
+// Signature format: 3.0
+package androidx.ui.graphics.vector {
+
+  public final class GroupComponent extends androidx.ui.graphics.vector.VNode {
+    ctor public GroupComponent(String name);
+    ctor public GroupComponent();
+    method public String component1();
+    method public androidx.ui.graphics.vector.GroupComponent copy(String name);
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public java.util.List<androidx.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 void insertAt(int index, androidx.ui.graphics.vector.VNode instance);
+    method public void move(int from, int to, int count);
+    method public void remove(int index, int count);
+    method public void setClipPathData(java.util.List<? extends androidx.ui.graphics.vector.PathNode> value);
+    method public void setPivotX(float value);
+    method public void setPivotY(float value);
+    method public void setRotation(float value);
+    method public void setScaleX(float value);
+    method public void setScaleY(float value);
+    method public void setTranslationX(float value);
+    method public void setTranslationY(float value);
+    property public final java.util.List<androidx.ui.graphics.vector.PathNode> clipPathData;
+    property public kotlin.jvm.functions.Function0<kotlin.Unit>? invalidateListener;
+    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 PathComponent extends androidx.ui.graphics.vector.VNode {
+    ctor public PathComponent(String name);
+    method public String component1();
+    method public androidx.ui.graphics.vector.PathComponent copy(String name);
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public androidx.ui.graphics.Brush? getFill();
+    method public float getFillAlpha();
+    method public String getName();
+    method public java.util.List<androidx.ui.graphics.vector.PathNode> getPathData();
+    method public androidx.ui.graphics.Brush? getStroke();
+    method public float getStrokeAlpha();
+    method public androidx.ui.graphics.StrokeCap getStrokeLineCap();
+    method public androidx.ui.graphics.StrokeJoin getStrokeLineJoin();
+    method public float getStrokeLineMiter();
+    method public float getStrokeLineWidth();
+    method public void setFill(androidx.ui.graphics.Brush? value);
+    method public void setFillAlpha(float value);
+    method public void setPathData(java.util.List<? extends androidx.ui.graphics.vector.PathNode> value);
+    method public void setStroke(androidx.ui.graphics.Brush? value);
+    method public void setStrokeAlpha(float value);
+    method public void setStrokeLineCap(androidx.ui.graphics.StrokeCap value);
+    method public void setStrokeLineJoin(androidx.ui.graphics.StrokeJoin value);
+    method public void setStrokeLineMiter(float value);
+    method public void setStrokeLineWidth(float value);
+    property public final androidx.ui.graphics.Brush? fill;
+    property public final float fillAlpha;
+    property public final java.util.List<androidx.ui.graphics.vector.PathNode> pathData;
+    property public final androidx.ui.graphics.Brush? stroke;
+    property public final float strokeAlpha;
+    property public final androidx.ui.graphics.StrokeCap strokeLineCap;
+    property public final androidx.ui.graphics.StrokeJoin strokeLineJoin;
+    property public final float strokeLineMiter;
+    property public final float strokeLineWidth;
+  }
+
+  public abstract sealed class VNode {
+    method public abstract void draw(androidx.ui.graphics.Canvas canvas);
+    method public kotlin.jvm.functions.Function0<kotlin.Unit>? getInvalidateListener();
+    method public final void invalidate();
+    method public void setInvalidateListener(kotlin.jvm.functions.Function0<kotlin.Unit>? p);
+    property public kotlin.jvm.functions.Function0<kotlin.Unit>? invalidateListener;
+  }
+
+  public final class VectorComponent extends androidx.ui.graphics.vector.VNode {
+    method public void draw(androidx.ui.graphics.Canvas canvas, float alpha, androidx.ui.graphics.ColorFilter? colorFilter);
+    method public void draw(androidx.ui.graphics.Canvas canvas);
+    method public float getDefaultHeight();
+    method public float getDefaultWidth();
+    method public String getName();
+    method public androidx.ui.graphics.vector.GroupComponent getRoot();
+    method public int getSize();
+    method public float getViewportHeight();
+    method public float getViewportWidth();
+    method public void setDefaultHeight-NgWp0Z8(float p);
+    method public void setDefaultWidth-NgWp0Z8(float p);
+    method public void setViewportHeight(float p);
+    method public void setViewportWidth(float p);
+    property public final androidx.ui.graphics.vector.GroupComponent root;
+    property public final int size;
+  }
+
+  public final class VectorComposeNonIRKt {
+    method public static androidx.compose.Composition composeVector(androidx.ui.graphics.vector.VectorComponent container, androidx.compose.Recomposer recomposer, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> composable);
+    method @Deprecated public static androidx.compose.Composition composeVector(androidx.ui.graphics.vector.VectorComponent container, androidx.compose.CompositionReference? parent = null, kotlin.jvm.functions.Function3<? super androidx.ui.graphics.vector.VectorScope,? super java.lang.Float,? super java.lang.Float,kotlin.Unit> composable);
+  }
+
+  public final class VectorComposer extends androidx.compose.Composer<androidx.ui.graphics.vector.VNode> {
+    ctor public VectorComposer(androidx.ui.graphics.vector.VNode root, androidx.compose.SlotTable slotTable, androidx.compose.Recomposer recomposer);
+    method public inline <T extends androidx.ui.graphics.vector.VNode> void emit(Object key, kotlin.jvm.functions.Function0<? extends T> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<androidx.ui.graphics.vector.VNode,androidx.ui.graphics.vector.VNode>,kotlin.Unit> update);
+    method public inline void emit(Object key, kotlin.jvm.functions.Function0<androidx.ui.graphics.vector.GroupComponent> ctor, kotlin.jvm.functions.Function1<? super androidx.compose.ComposerUpdater<androidx.ui.graphics.vector.VNode,androidx.ui.graphics.vector.GroupComponent>,kotlin.Unit> update, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method public androidx.ui.graphics.vector.VNode getRoot();
+  }
+
+  public final class VectorKt {
+    method public static inline java.util.List<androidx.ui.graphics.vector.PathNode> PathData(kotlin.jvm.functions.Function1<? super androidx.ui.graphics.vector.PathBuilder,kotlin.Unit> block);
+    method public static java.util.List<androidx.ui.graphics.vector.PathNode> addPathNodes(String? pathStr);
+    method public static androidx.ui.graphics.StrokeCap getDefaultStrokeLineCap();
+    method public static androidx.ui.graphics.StrokeJoin getDefaultStrokeLineJoin();
+    method public static androidx.ui.graphics.BlendMode getDefaultTintBlendMode();
+    method public static long getDefaultTintColor();
+    method public static java.util.List<androidx.ui.graphics.vector.PathNode> getEmptyPath();
+    field public static final float DefaultAlpha = 1.0f;
+    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;
+  }
+
+  public final class VectorScope {
+    ctor public VectorScope(androidx.ui.graphics.vector.VectorComposer composer);
+    method public androidx.ui.graphics.vector.VectorComposer getComposer();
+  }
+
+}
+
diff --git a/wear/wear/src/main/res/values-af/strings.xml b/wear/wear/src/main/res/values-af/strings.xml
index 6bc9a46..a0b1d41 100644
--- a/wear/wear/src/main/res/values-af/strings.xml
+++ b/wear/wear/src/main/res/values-af/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigasielaai"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Handelinglaai"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigasielaai"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Handelinglaai"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-am/strings.xml b/wear/wear/src/main/res/values-am/strings.xml
index 3918be4..e939f78 100644
--- a/wear/wear/src/main/res/values-am/strings.xml
+++ b/wear/wear/src/main/res/values-am/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"የአሰሳ መሳቢያ"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"የእርምጃ መሳቢያ"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"የአሰሳ መሳቢያ"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"የእርምጃ መሳቢያ"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ar/strings.xml b/wear/wear/src/main/res/values-ar/strings.xml
index 89f8f10..6f3fe90 100644
--- a/wear/wear/src/main/res/values-ar/strings.xml
+++ b/wear/wear/src/main/res/values-ar/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"لائحة التنقل"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"دُرج الإجراءات"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"لائحة التنقل"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"دُرج الإجراءات"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-as/strings.xml b/wear/wear/src/main/res/values-as/strings.xml
index 2a51efa..e905547 100644
--- a/wear/wear/src/main/res/values-as/strings.xml
+++ b/wear/wear/src/main/res/values-as/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"নেভিগেশ্বন ড্ৰৱাৰ"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"কাৰ্য ড্ৰৱাৰ"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"নেভিগেশ্বন ড্ৰৱাৰ"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"কাৰ্য ড্ৰৱাৰ"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-az/strings.xml b/wear/wear/src/main/res/values-az/strings.xml
index 25d3c3be..74ccfe8 100644
--- a/wear/wear/src/main/res/values-az/strings.xml
+++ b/wear/wear/src/main/res/values-az/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Naviqasiya qutusu"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Əməliyyat qutusu"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Naviqasiya qutusu"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Əməliyyat qutusu"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-b+sr+Latn/strings.xml b/wear/wear/src/main/res/values-b+sr+Latn/strings.xml
index b3c2c22..c58868b 100644
--- a/wear/wear/src/main/res/values-b+sr+Latn/strings.xml
+++ b/wear/wear/src/main/res/values-b+sr+Latn/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Fioka za navigaciju"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Fioka za radnju"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Fioka za navigaciju"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Fioka za radnju"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-be/strings.xml b/wear/wear/src/main/res/values-be/strings.xml
index ee3c17c..0fe9468 100644
--- a/wear/wear/src/main/res/values-be/strings.xml
+++ b/wear/wear/src/main/res/values-be/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Высоўнае меню навігацыі"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Высоўнае меню дзеянняў"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Высоўнае меню навігацыі"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Высоўнае меню дзеянняў"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-bg/strings.xml b/wear/wear/src/main/res/values-bg/strings.xml
index 0ed041b..4330806 100644
--- a/wear/wear/src/main/res/values-bg/strings.xml
+++ b/wear/wear/src/main/res/values-bg/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Слой за навигация"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Слой за действия"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Слой за навигация"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Слой за действия"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-bn/strings.xml b/wear/wear/src/main/res/values-bn/strings.xml
index 48bea20..66d6073 100644
--- a/wear/wear/src/main/res/values-bn/strings.xml
+++ b/wear/wear/src/main/res/values-bn/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"নেভিগেশন ড্রয়ার"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"অ্যাকশন ড্রয়ার"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"নেভিগেশন ড্রয়ার"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"অ্যাকশন ড্রয়ার"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-bs/strings.xml b/wear/wear/src/main/res/values-bs/strings.xml
index cf30702..aee1387 100644
--- a/wear/wear/src/main/res/values-bs/strings.xml
+++ b/wear/wear/src/main/res/values-bs/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Ladica za navigaciju"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Ladica za radnju"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Ladica za navigaciju"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Ladica za radnju"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ca/strings.xml b/wear/wear/src/main/res/values-ca/strings.xml
index e11bd6f..38972ba 100644
--- a/wear/wear/src/main/res/values-ca/strings.xml
+++ b/wear/wear/src/main/res/values-ca/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Tauler de navegació"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Tauler d\'accions"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Tauler de navegació"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Tauler d\'accions"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-cs/strings.xml b/wear/wear/src/main/res/values-cs/strings.xml
index 01a6c72..d37c363 100644
--- a/wear/wear/src/main/res/values-cs/strings.xml
+++ b/wear/wear/src/main/res/values-cs/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Vysouvací panel navigace"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Vysouvací panel akcí"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Vysouvací panel navigace"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Vysouvací panel akcí"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-da/strings.xml b/wear/wear/src/main/res/values-da/strings.xml
index ddafa9e..32691d8 100644
--- a/wear/wear/src/main/res/values-da/strings.xml
+++ b/wear/wear/src/main/res/values-da/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Sidemenu"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Handlingsmenu"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Sidemenu"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Handlingsmenu"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-de/strings.xml b/wear/wear/src/main/res/values-de/strings.xml
index cd463f1..97734c7 100644
--- a/wear/wear/src/main/res/values-de/strings.xml
+++ b/wear/wear/src/main/res/values-de/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigationsleiste"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Aktionsleiste"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigationsleiste"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Aktionsleiste"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-el/strings.xml b/wear/wear/src/main/res/values-el/strings.xml
index e1ae01b..25cff0c 100644
--- a/wear/wear/src/main/res/values-el/strings.xml
+++ b/wear/wear/src/main/res/values-el/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Συρτάρι πλοήγησης"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Συρτάρι ενεργειών"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Συρτάρι πλοήγησης"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Συρτάρι ενεργειών"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-en-rAU/strings.xml b/wear/wear/src/main/res/values-en-rAU/strings.xml
index ad16473..53d9019 100644
--- a/wear/wear/src/main/res/values-en-rAU/strings.xml
+++ b/wear/wear/src/main/res/values-en-rAU/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigation drawer"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Action drawer"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigation drawer"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Action drawer"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-en-rCA/strings.xml b/wear/wear/src/main/res/values-en-rCA/strings.xml
index ad16473..53d9019 100644
--- a/wear/wear/src/main/res/values-en-rCA/strings.xml
+++ b/wear/wear/src/main/res/values-en-rCA/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigation drawer"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Action drawer"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigation drawer"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Action drawer"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-en-rGB/strings.xml b/wear/wear/src/main/res/values-en-rGB/strings.xml
index ad16473..53d9019 100644
--- a/wear/wear/src/main/res/values-en-rGB/strings.xml
+++ b/wear/wear/src/main/res/values-en-rGB/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigation drawer"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Action drawer"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigation drawer"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Action drawer"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-en-rIN/strings.xml b/wear/wear/src/main/res/values-en-rIN/strings.xml
index ad16473..53d9019 100644
--- a/wear/wear/src/main/res/values-en-rIN/strings.xml
+++ b/wear/wear/src/main/res/values-en-rIN/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigation drawer"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Action drawer"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigation drawer"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Action drawer"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-en-rXC/strings.xml b/wear/wear/src/main/res/values-en-rXC/strings.xml
index 84cbe08..e20077ec 100644
--- a/wear/wear/src/main/res/values-en-rXC/strings.xml
+++ b/wear/wear/src/main/res/values-en-rXC/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎Navigation drawer‎‏‎‎‏‎"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎Action drawer‎‏‎‎‏‎"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎Navigation drawer‎‏‎‎‏‎"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎Action drawer‎‏‎‎‏‎"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-es-rUS/strings.xml b/wear/wear/src/main/res/values-es-rUS/strings.xml
index 7f5141d..9afe40c 100644
--- a/wear/wear/src/main/res/values-es-rUS/strings.xml
+++ b/wear/wear/src/main/res/values-es-rUS/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Panel lateral de navegación"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Panel lateral de acciones"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Panel lateral de navegación"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Panel lateral de acciones"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-es/strings.xml b/wear/wear/src/main/res/values-es/strings.xml
index 178fc8b..ad29e18 100644
--- a/wear/wear/src/main/res/values-es/strings.xml
+++ b/wear/wear/src/main/res/values-es/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Panel de navegación"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Panel de acciones"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Panel de navegación"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Panel de acciones"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-et/strings.xml b/wear/wear/src/main/res/values-et/strings.xml
index a7d04f0..2dff6b1 100644
--- a/wear/wear/src/main/res/values-et/strings.xml
+++ b/wear/wear/src/main/res/values-et/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigeerimissahtel"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Toimingusahtel"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigeerimissahtel"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Toimingusahtel"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-eu/strings.xml b/wear/wear/src/main/res/values-eu/strings.xml
index 353d3c6..df7e326 100644
--- a/wear/wear/src/main/res/values-eu/strings.xml
+++ b/wear/wear/src/main/res/values-eu/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Nabigazio-panel lerrakorra"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Ekintza-panel lerrakorra"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Nabigazio-panel lerrakorra"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Ekintza-panel lerrakorra"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-fa/strings.xml b/wear/wear/src/main/res/values-fa/strings.xml
index 62b8e1a..d2f3e66 100644
--- a/wear/wear/src/main/res/values-fa/strings.xml
+++ b/wear/wear/src/main/res/values-fa/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"کشوی پیمایش"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"کشوی فعالیت"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"کشوی پیمایش"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"کشوی فعالیت"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-fi/strings.xml b/wear/wear/src/main/res/values-fi/strings.xml
index bc96258..0216994 100644
--- a/wear/wear/src/main/res/values-fi/strings.xml
+++ b/wear/wear/src/main/res/values-fi/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigoinnin vetopaneeli"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Toimintojen vetopaneeli"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigoinnin vetopaneeli"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Toimintojen vetopaneeli"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-fr-rCA/strings.xml b/wear/wear/src/main/res/values-fr-rCA/strings.xml
index 5a284c2..bb3a2ffb 100644
--- a/wear/wear/src/main/res/values-fr-rCA/strings.xml
+++ b/wear/wear/src/main/res/values-fr-rCA/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Panneau de navigation"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Panneau d\'actions"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Panneau de navigation"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Panneau d\'actions"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-fr/strings.xml b/wear/wear/src/main/res/values-fr/strings.xml
index 2762885..bea0b78 100644
--- a/wear/wear/src/main/res/values-fr/strings.xml
+++ b/wear/wear/src/main/res/values-fr/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Panneau de navigation"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Panneau de commandes"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Panneau de navigation"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Panneau de commandes"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-gl/strings.xml b/wear/wear/src/main/res/values-gl/strings.xml
index 3c80d82..e6247d1 100644
--- a/wear/wear/src/main/res/values-gl/strings.xml
+++ b/wear/wear/src/main/res/values-gl/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Panel de navegación"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Panel de accións"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Panel de navegación"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Panel de accións"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-gu/strings.xml b/wear/wear/src/main/res/values-gu/strings.xml
index 18704b9..5fd6cf7 100644
--- a/wear/wear/src/main/res/values-gu/strings.xml
+++ b/wear/wear/src/main/res/values-gu/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"નૅવિગેશન ડ્રોઅર"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"ઍક્શન ડ્રોઅર"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"નૅવિગેશન ડ્રોઅર"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"ઍક્શન ડ્રોઅર"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-hi/strings.xml b/wear/wear/src/main/res/values-hi/strings.xml
index 931dd5b..1454fc1 100644
--- a/wear/wear/src/main/res/values-hi/strings.xml
+++ b/wear/wear/src/main/res/values-hi/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"नेविगेशन पैनल"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"कार्रवाई पैनल"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"नेविगेशन पैनल"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"कार्रवाई पैनल"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-hr/strings.xml b/wear/wear/src/main/res/values-hr/strings.xml
index cf30702..aee1387 100644
--- a/wear/wear/src/main/res/values-hr/strings.xml
+++ b/wear/wear/src/main/res/values-hr/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Ladica za navigaciju"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Ladica za radnju"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Ladica za navigaciju"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Ladica za radnju"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-hu/strings.xml b/wear/wear/src/main/res/values-hu/strings.xml
index 7956166..f77c207 100644
--- a/wear/wear/src/main/res/values-hu/strings.xml
+++ b/wear/wear/src/main/res/values-hu/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigációs fiók"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Műveleti fiók"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigációs fiók"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Műveleti fiók"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-hy/strings.xml b/wear/wear/src/main/res/values-hy/strings.xml
index 2ed20e3..68b259b 100644
--- a/wear/wear/src/main/res/values-hy/strings.xml
+++ b/wear/wear/src/main/res/values-hy/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Նավարկման դարակ"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Գործողությունների դարակ"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Նավարկման դարակ"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Գործողությունների դարակ"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-in/strings.xml b/wear/wear/src/main/res/values-in/strings.xml
index a4014a6..8c28e14 100644
--- a/wear/wear/src/main/res/values-in/strings.xml
+++ b/wear/wear/src/main/res/values-in/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Panel navigasi"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Panel samping tindakan"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Panel navigasi"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Panel samping tindakan"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-is/strings.xml b/wear/wear/src/main/res/values-is/strings.xml
index 5100ca2..2fc00e4 100644
--- a/wear/wear/src/main/res/values-is/strings.xml
+++ b/wear/wear/src/main/res/values-is/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Yfirlitsskúffa"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Aðgerðaskúffa"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Yfirlitsskúffa"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Aðgerðaskúffa"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-it/strings.xml b/wear/wear/src/main/res/values-it/strings.xml
index 680267d..4e9efb0 100644
--- a/wear/wear/src/main/res/values-it/strings.xml
+++ b/wear/wear/src/main/res/values-it/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Riquadro di navigazione a scomparsa"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Riquadro a scomparsa delle azioni"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Riquadro di navigazione a scomparsa"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Riquadro a scomparsa delle azioni"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-iw/strings.xml b/wear/wear/src/main/res/values-iw/strings.xml
index bf45234..6bcd69b 100644
--- a/wear/wear/src/main/res/values-iw/strings.xml
+++ b/wear/wear/src/main/res/values-iw/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"חלונית הזזה לניווט"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"חלונית הזזה לפעולות"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"חלונית הזזה לניווט"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"חלונית הזזה לפעולות"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ja/strings.xml b/wear/wear/src/main/res/values-ja/strings.xml
index cd96bad..d5400eb 100644
--- a/wear/wear/src/main/res/values-ja/strings.xml
+++ b/wear/wear/src/main/res/values-ja/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"ナビゲーション ドロワー"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"アクション ドロワー"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"ナビゲーション ドロワー"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"アクション ドロワー"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ka/strings.xml b/wear/wear/src/main/res/values-ka/strings.xml
index ba15c3b..9b1f566 100644
--- a/wear/wear/src/main/res/values-ka/strings.xml
+++ b/wear/wear/src/main/res/values-ka/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"ნავიგაციის უჯრა"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"ქმედების უჯრა"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"ნავიგაციის უჯრა"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"ქმედების უჯრა"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-kk/strings.xml b/wear/wear/src/main/res/values-kk/strings.xml
index a4e3343..fe96962 100644
--- a/wear/wear/src/main/res/values-kk/strings.xml
+++ b/wear/wear/src/main/res/values-kk/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Навигация тартпасы"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Әрекеттер тартпасы"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Навигация тартпасы"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Әрекеттер тартпасы"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-km/strings.xml b/wear/wear/src/main/res/values-km/strings.xml
index db04750..70abd5d 100644
--- a/wear/wear/src/main/res/values-km/strings.xml
+++ b/wear/wear/src/main/res/values-km/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"ថត​រុករក"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"ថត​សកម្មភាព"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"ថត​រុករក"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"ថត​សកម្មភាព"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-kn/strings.xml b/wear/wear/src/main/res/values-kn/strings.xml
index b2edb49..0b9669c 100644
--- a/wear/wear/src/main/res/values-kn/strings.xml
+++ b/wear/wear/src/main/res/values-kn/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"ನ್ಯಾವಿಗೇಶನ್ ಡ್ರಾಯರ್"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"ಕ್ರಿಯೆ ಡ್ರಾಯರ್"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"ನ್ಯಾವಿಗೇಶನ್ ಡ್ರಾಯರ್"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"ಕ್ರಿಯೆ ಡ್ರಾಯರ್"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ko/strings.xml b/wear/wear/src/main/res/values-ko/strings.xml
index 1c4c58e..4f93d4a 100644
--- a/wear/wear/src/main/res/values-ko/strings.xml
+++ b/wear/wear/src/main/res/values-ko/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"탐색 창"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"작업 창"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"탐색 창"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"작업 창"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ky/strings.xml b/wear/wear/src/main/res/values-ky/strings.xml
index 821cb35..6324aa7 100644
--- a/wear/wear/src/main/res/values-ky/strings.xml
+++ b/wear/wear/src/main/res/values-ky/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Чабыттоо суурмасы"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Аракет суурмасы"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Чабыттоо суурмасы"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Аракет суурмасы"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-lo/strings.xml b/wear/wear/src/main/res/values-lo/strings.xml
index 82b3403..a405fa6 100644
--- a/wear/wear/src/main/res/values-lo/strings.xml
+++ b/wear/wear/src/main/res/values-lo/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"ແຖບການນຳທາງ"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"ແຖບຄຳສັ່ງ"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"ແຖບການນຳທາງ"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"ແຖບຄຳສັ່ງ"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-lt/strings.xml b/wear/wear/src/main/res/values-lt/strings.xml
index c08f1bea..2ea598f 100644
--- a/wear/wear/src/main/res/values-lt/strings.xml
+++ b/wear/wear/src/main/res/values-lt/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Naršymo skydelis"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Veiksmo skydelis"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Naršymo skydelis"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Veiksmo skydelis"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-lv/strings.xml b/wear/wear/src/main/res/values-lv/strings.xml
index 233b9de2..b34c874 100644
--- a/wear/wear/src/main/res/values-lv/strings.xml
+++ b/wear/wear/src/main/res/values-lv/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigācijas atvilktne"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Darbību atvilktne"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigācijas atvilktne"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Darbību atvilktne"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-mk/strings.xml b/wear/wear/src/main/res/values-mk/strings.xml
index 3ba4480..dbc5bac 100644
--- a/wear/wear/src/main/res/values-mk/strings.xml
+++ b/wear/wear/src/main/res/values-mk/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Фиока за навигација"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Фиока за дејство"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Фиока за навигација"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Фиока за дејство"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ml/strings.xml b/wear/wear/src/main/res/values-ml/strings.xml
index 45527cd..f7347c0 100644
--- a/wear/wear/src/main/res/values-ml/strings.xml
+++ b/wear/wear/src/main/res/values-ml/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"നാവിഗേഷൻ ഡ്രോയർ"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"ആക്ഷൻ ഡ്രോയർ"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"നാവിഗേഷൻ ഡ്രോയർ"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"ആക്ഷൻ ഡ്രോയർ"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-mn/strings.xml b/wear/wear/src/main/res/values-mn/strings.xml
index 53c4dec..3477a4f 100644
--- a/wear/wear/src/main/res/values-mn/strings.xml
+++ b/wear/wear/src/main/res/values-mn/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Навигацийн шургуулга"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Үйлдлийн татуурга"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Навигацийн шургуулга"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Үйлдлийн татуурга"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-mr/strings.xml b/wear/wear/src/main/res/values-mr/strings.xml
index 20b5072..3a2e7a1 100644
--- a/wear/wear/src/main/res/values-mr/strings.xml
+++ b/wear/wear/src/main/res/values-mr/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"नेव्हिगेशन ड्रॉवर"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"क्रिया ड्रॉवर"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"नेव्हिगेशन ड्रॉवर"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"क्रिया ड्रॉवर"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ms/strings.xml b/wear/wear/src/main/res/values-ms/strings.xml
index e0ab113..d64a574 100644
--- a/wear/wear/src/main/res/values-ms/strings.xml
+++ b/wear/wear/src/main/res/values-ms/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Laci navigasi"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Laci tindakan"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Laci navigasi"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Laci tindakan"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-my/strings.xml b/wear/wear/src/main/res/values-my/strings.xml
index 1d7c401..ca60daf 100644
--- a/wear/wear/src/main/res/values-my/strings.xml
+++ b/wear/wear/src/main/res/values-my/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"လမ်းကြောင်းပြ အံဆွဲ"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"လုပ်ဆောင်ချက် အံဆွဲ"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"လမ်းကြောင်းပြ အံဆွဲ"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"လုပ်ဆောင်ချက် အံဆွဲ"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-nb/strings.xml b/wear/wear/src/main/res/values-nb/strings.xml
index fdd65d5..b02525d 100644
--- a/wear/wear/src/main/res/values-nb/strings.xml
+++ b/wear/wear/src/main/res/values-nb/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Uttrekksmeny"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Uttrekksmeny for handlinger"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Uttrekksmeny"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Uttrekksmeny for handlinger"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ne/strings.xml b/wear/wear/src/main/res/values-ne/strings.xml
index b524cf5..b8527a3 100644
--- a/wear/wear/src/main/res/values-ne/strings.xml
+++ b/wear/wear/src/main/res/values-ne/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"नेभिगेसन ड्रअर"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"कारबाहीसम्बन्धी ड्रअर"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"नेभिगेसन ड्रअर"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"कारबाहीसम्बन्धी ड्रअर"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-nl/strings.xml b/wear/wear/src/main/res/values-nl/strings.xml
index d7d7fdf..760346d 100644
--- a/wear/wear/src/main/res/values-nl/strings.xml
+++ b/wear/wear/src/main/res/values-nl/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Zijmenu"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Actiemenu"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Zijmenu"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Actiemenu"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-or/strings.xml b/wear/wear/src/main/res/values-or/strings.xml
index 53e75b3..a01f316 100644
--- a/wear/wear/src/main/res/values-or/strings.xml
+++ b/wear/wear/src/main/res/values-or/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"ନେଭିଗେଶନ୍ ପ୍ୟାନେଲ୍"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"କାର୍ଯ୍ୟକାରୀ ପ୍ୟାନେଲ୍"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"ନେଭିଗେଶନ୍ ପ୍ୟାନେଲ୍"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"କାର୍ଯ୍ୟକାରୀ ପ୍ୟାନେଲ୍"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-pa/strings.xml b/wear/wear/src/main/res/values-pa/strings.xml
index afb5599..f13d106 100644
--- a/wear/wear/src/main/res/values-pa/strings.xml
+++ b/wear/wear/src/main/res/values-pa/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਡ੍ਰਾਅਰ"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"ਕਾਰਵਾਈ ਡ੍ਰਾਅਰ"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਡ੍ਰਾਅਰ"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"ਕਾਰਵਾਈ ਡ੍ਰਾਅਰ"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-pl/strings.xml b/wear/wear/src/main/res/values-pl/strings.xml
index de964e7..fcb9b56 100644
--- a/wear/wear/src/main/res/values-pl/strings.xml
+++ b/wear/wear/src/main/res/values-pl/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Panel nawigacji"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Panel działań"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Panel nawigacji"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Panel działań"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-pt-rBR/strings.xml b/wear/wear/src/main/res/values-pt-rBR/strings.xml
index 6347156..46cf12e 100644
--- a/wear/wear/src/main/res/values-pt-rBR/strings.xml
+++ b/wear/wear/src/main/res/values-pt-rBR/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Gaveta de navegação"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Gaveta de ações"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Gaveta de navegação"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Gaveta de ações"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-pt-rPT/strings.xml b/wear/wear/src/main/res/values-pt-rPT/strings.xml
index 6347156..46cf12e 100644
--- a/wear/wear/src/main/res/values-pt-rPT/strings.xml
+++ b/wear/wear/src/main/res/values-pt-rPT/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Gaveta de navegação"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Gaveta de ações"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Gaveta de navegação"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Gaveta de ações"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-pt/strings.xml b/wear/wear/src/main/res/values-pt/strings.xml
index 6347156..46cf12e 100644
--- a/wear/wear/src/main/res/values-pt/strings.xml
+++ b/wear/wear/src/main/res/values-pt/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Gaveta de navegação"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Gaveta de ações"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Gaveta de navegação"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Gaveta de ações"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ro/strings.xml b/wear/wear/src/main/res/values-ro/strings.xml
index 6f6aa10..1cd2faf 100644
--- a/wear/wear/src/main/res/values-ro/strings.xml
+++ b/wear/wear/src/main/res/values-ro/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Panou de navigare"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Panou de acțiune"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Panou de navigare"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Panou de acțiune"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ru/strings.xml b/wear/wear/src/main/res/values-ru/strings.xml
index 7d3a266..226b67a 100644
--- a/wear/wear/src/main/res/values-ru/strings.xml
+++ b/wear/wear/src/main/res/values-ru/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Панель навигации"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Панель действий"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Панель навигации"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Панель действий"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-si/strings.xml b/wear/wear/src/main/res/values-si/strings.xml
index 4ae2f63..2ce2823 100644
--- a/wear/wear/src/main/res/values-si/strings.xml
+++ b/wear/wear/src/main/res/values-si/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"සංචාලන ලාච්චුව"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"ක්‍රියාමාර්ග ලාච්චුව"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"සංචාලන ලාච්චුව"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"ක්‍රියාමාර්ග ලාච්චුව"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-sk/strings.xml b/wear/wear/src/main/res/values-sk/strings.xml
index cbb2c6a..aa39b5f 100644
--- a/wear/wear/src/main/res/values-sk/strings.xml
+++ b/wear/wear/src/main/res/values-sk/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigačný vysúvací panel"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Vysúvací panel akcií"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigačný vysúvací panel"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Vysúvací panel akcií"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-sl/strings.xml b/wear/wear/src/main/res/values-sl/strings.xml
index e7aa38c..75ed0ee 100644
--- a/wear/wear/src/main/res/values-sl/strings.xml
+++ b/wear/wear/src/main/res/values-sl/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Predal za krmarjenje"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Predal z dejanji"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Predal za krmarjenje"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Predal z dejanji"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-sq/strings.xml b/wear/wear/src/main/res/values-sq/strings.xml
index 1b18aba..3a0d059 100644
--- a/wear/wear/src/main/res/values-sq/strings.xml
+++ b/wear/wear/src/main/res/values-sq/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Sirtari i navigimit"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Sirtari i veprimit"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Sirtari i navigimit"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Sirtari i veprimit"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-sr/strings.xml b/wear/wear/src/main/res/values-sr/strings.xml
index c2a6ff7..11cf001 100644
--- a/wear/wear/src/main/res/values-sr/strings.xml
+++ b/wear/wear/src/main/res/values-sr/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Фиока за навигацију"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Фиока за радњу"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Фиока за навигацију"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Фиока за радњу"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-sv/strings.xml b/wear/wear/src/main/res/values-sv/strings.xml
index c5c07a6..4dddc5e 100644
--- a/wear/wear/src/main/res/values-sv/strings.xml
+++ b/wear/wear/src/main/res/values-sv/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigeringspanel"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Åtgärdspanel"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigeringspanel"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Åtgärdspanel"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-sw/strings.xml b/wear/wear/src/main/res/values-sw/strings.xml
index 2f4bcc0..4244cf4 100644
--- a/wear/wear/src/main/res/values-sw/strings.xml
+++ b/wear/wear/src/main/res/values-sw/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Droo ya kusogeza"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Droo ya vitendo"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Droo ya kusogeza"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Droo ya vitendo"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ta/strings.xml b/wear/wear/src/main/res/values-ta/strings.xml
index ccfed38..4149d10 100644
--- a/wear/wear/src/main/res/values-ta/strings.xml
+++ b/wear/wear/src/main/res/values-ta/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"வழிசெலுத்தல் டிராயர்"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"செயல் டிராயர்"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"வழிசெலுத்தல் டிராயர்"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"செயல் டிராயர்"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-te/strings.xml b/wear/wear/src/main/res/values-te/strings.xml
index c3db02c..c288710 100644
--- a/wear/wear/src/main/res/values-te/strings.xml
+++ b/wear/wear/src/main/res/values-te/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"నావిగేషన్ డ్రాయర్"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"చర్య డ్రాయర్"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"నావిగేషన్ డ్రాయర్"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"చర్య డ్రాయర్"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-th/strings.xml b/wear/wear/src/main/res/values-th/strings.xml
index f5b0521..ea2a130 100644
--- a/wear/wear/src/main/res/values-th/strings.xml
+++ b/wear/wear/src/main/res/values-th/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"ลิ้นชักการนำทาง"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"ลิ้นชักการดำเนินการ"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"ลิ้นชักการนำทาง"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"ลิ้นชักการดำเนินการ"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-tl/strings.xml b/wear/wear/src/main/res/values-tl/strings.xml
index ad16473..53d9019 100644
--- a/wear/wear/src/main/res/values-tl/strings.xml
+++ b/wear/wear/src/main/res/values-tl/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigation drawer"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Action drawer"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigation drawer"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Action drawer"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-tr/strings.xml b/wear/wear/src/main/res/values-tr/strings.xml
index 32aff20..ccfd319 100644
--- a/wear/wear/src/main/res/values-tr/strings.xml
+++ b/wear/wear/src/main/res/values-tr/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Gezinme çekmecesi"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"İşlem çekmecesi"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Gezinme çekmecesi"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"İşlem çekmecesi"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-uk/strings.xml b/wear/wear/src/main/res/values-uk/strings.xml
index 93d9432..cfe9164 100644
--- a/wear/wear/src/main/res/values-uk/strings.xml
+++ b/wear/wear/src/main/res/values-uk/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Панель навігації"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Висувна панель команд"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Панель навігації"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Висувна панель команд"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-ur/strings.xml b/wear/wear/src/main/res/values-ur/strings.xml
index 53b133e..0756b77 100644
--- a/wear/wear/src/main/res/values-ur/strings.xml
+++ b/wear/wear/src/main/res/values-ur/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"نیویگیشن دراز"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"کارروائی دراز"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"نیویگیشن دراز"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"کارروائی دراز"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-uz/strings.xml b/wear/wear/src/main/res/values-uz/strings.xml
index a09fef7..bb4bf3b 100644
--- a/wear/wear/src/main/res/values-uz/strings.xml
+++ b/wear/wear/src/main/res/values-uz/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Navigatsiya paneli"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Buyruqlar paneli"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Navigatsiya paneli"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Buyruqlar paneli"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-vi/strings.xml b/wear/wear/src/main/res/values-vi/strings.xml
index d42c495..6625a06a 100644
--- a/wear/wear/src/main/res/values-vi/strings.xml
+++ b/wear/wear/src/main/res/values-vi/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Ngăn điều hướng"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Ngăn tác vụ"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Ngăn điều hướng"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Ngăn tác vụ"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-zh-rCN/strings.xml b/wear/wear/src/main/res/values-zh-rCN/strings.xml
index 1fbb17e..3f532cd 100644
--- a/wear/wear/src/main/res/values-zh-rCN/strings.xml
+++ b/wear/wear/src/main/res/values-zh-rCN/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"抽屉式导航栏"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"操作抽屉式导航栏"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"抽屉式导航栏"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"操作抽屉式导航栏"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-zh-rHK/strings.xml b/wear/wear/src/main/res/values-zh-rHK/strings.xml
index 7e96db7..0b64213 100644
--- a/wear/wear/src/main/res/values-zh-rHK/strings.xml
+++ b/wear/wear/src/main/res/values-zh-rHK/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"導覽列"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"操作導覽列"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"導覽列"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"操作導覽列"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-zh-rTW/strings.xml b/wear/wear/src/main/res/values-zh-rTW/strings.xml
index b2ca4a2..4c0be1b 100644
--- a/wear/wear/src/main/res/values-zh-rTW/strings.xml
+++ b/wear/wear/src/main/res/values-zh-rTW/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"導覽匣"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"動作導覽匣"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"導覽匣"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"動作導覽匣"</string>
 </resources>
diff --git a/wear/wear/src/main/res/values-zu/strings.xml b/wear/wear/src/main/res/values-zu/strings.xml
index 609f735..33c6483 100644
--- a/wear/wear/src/main/res/values-zu/strings.xml
+++ b/wear/wear/src/main/res/values-zu/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ws_navigation_drawer_content_description" msgid="7216697245762194759">"Ikhabethe lokuzulazula"</string>
-    <string name="ws_action_drawer_content_description" msgid="1837365417701148489">"Ikhabethe lesenzo"</string>
+    <string name="ws_navigation_drawer_content_description" msgid="777117228299084604">"Ikhabethe lokuzulazula"</string>
+    <string name="ws_action_drawer_content_description" msgid="8863821639144537553">"Ikhabethe lesenzo"</string>
 </resources>
diff --git a/window/window-extensions/build.gradle b/window/window-extensions/build.gradle
index 324914c..67bcdc5 100644
--- a/window/window-extensions/build.gradle
+++ b/window/window-extensions/build.gradle
@@ -38,7 +38,7 @@
 
 androidx {
     name = "Jetpack WindowManager library Extensions"
-    publish = Publish.SNAPSHOT_AND_RELEASE
+    publish = Publish.NONE
     mavenGroup = LibraryGroups.WINDOW
     mavenVersion = LibraryVersions.WINDOW
     inceptionYear = "2020"
diff --git a/work/workmanager-lint/src/main/java/androidx/work/lint/WorkManagerIssueRegistry.kt b/work/workmanager-lint/src/main/java/androidx/work/lint/WorkManagerIssueRegistry.kt
index 065ff8e..bb1b527 100644
--- a/work/workmanager-lint/src/main/java/androidx/work/lint/WorkManagerIssueRegistry.kt
+++ b/work/workmanager-lint/src/main/java/androidx/work/lint/WorkManagerIssueRegistry.kt
@@ -33,6 +33,7 @@
         RemoveWorkManagerInitializerDetector.ISSUE,
         RxWorkerSetProgressDetector.ISSUE,
         SpecifyForegroundServiceTypeIssueDetector.ISSUE,
-        SpecifyJobSchedulerIdRangeIssueDetector.ISSUE
+        SpecifyJobSchedulerIdRangeIssueDetector.ISSUE,
+        WorkerHasPublicModifierDetector.ISSUE
     )
 }
diff --git a/work/workmanager-lint/src/main/java/androidx/work/lint/WorkerHasPublicModifierDetector.kt b/work/workmanager-lint/src/main/java/androidx/work/lint/WorkerHasPublicModifierDetector.kt
new file mode 100644
index 0000000..a5730e6
--- /dev/null
+++ b/work/workmanager-lint/src/main/java/androidx/work/lint/WorkerHasPublicModifierDetector.kt
@@ -0,0 +1,96 @@
+/*
+ * 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.work.lint
+
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Context
+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.Location
+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.lang.jvm.JvmModifier
+import com.intellij.psi.PsiMethod
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.UClass
+import java.util.EnumSet
+
+class WorkerHasPublicModifierDetector : Detector(), SourceCodeScanner {
+    companion object {
+        private const val DESCRIPTION =
+            "ListenableWorkers constructed using the default WorkerFactories need to be public"
+
+        val ISSUE = Issue.create(
+            id = "WorkerHasAPublicModifier",
+            briefDescription = DESCRIPTION,
+            explanation = """
+                When you define a ListenableWorker which is constructed using the 
+                default WorkerFactory, the ListenableWorker sub-type needs to be public.
+            """,
+            androidSpecific = true,
+            category = Category.CORRECTNESS,
+            severity = Severity.FATAL,
+            implementation = Implementation(
+                WorkerHasPublicModifierDetector::class.java,
+                EnumSet.of(Scope.JAVA_FILE)
+            )
+        )
+    }
+
+    override fun getApplicableMethodNames(): List<String> = listOf("setWorkerFactory")
+
+    override fun applicableSuperClasses() = listOf(
+        "androidx.work.ListenableWorker"
+    )
+
+    private var hasCustomWorkerFactory = false
+    private val workers = mutableListOf<Pair<UClass, Location>>()
+
+    override fun visitMethodCall(context: JavaContext, node: UCallExpression, method: PsiMethod) {
+        if (context.evaluator.isMemberInClass(method, "androidx.work.Configuration.Builder")) {
+            hasCustomWorkerFactory = true
+        }
+    }
+
+    override fun visitClass(context: JavaContext, declaration: UClass) {
+        if (declaration.hasModifier(JvmModifier.ABSTRACT) || declaration.isInterface) {
+            // Exempt base types from analysis
+            return
+        }
+
+        if (!declaration.hasModifier(JvmModifier.PUBLIC)) {
+            workers += Pair(declaration, context.getLocation(declaration.javaPsi))
+        }
+    }
+
+    override fun afterCheckRootProject(context: Context) {
+        if (!hasCustomWorkerFactory && workers.isNotEmpty()) {
+            for ((declaration, location) in workers) {
+                context.report(
+                    issue = ISSUE,
+                    location = location,
+                    message = "${declaration.qualifiedName} needs to be public"
+                )
+            }
+        }
+    }
+}
diff --git a/work/workmanager-lint/src/test/java/androidx/work/lint/Stubs.kt b/work/workmanager-lint/src/test/java/androidx/work/lint/Stubs.kt
index 9fb367b..a3bf923 100644
--- a/work/workmanager-lint/src/test/java/androidx/work/lint/Stubs.kt
+++ b/work/workmanager-lint/src/test/java/androidx/work/lint/Stubs.kt
@@ -21,16 +21,28 @@
 import com.android.tools.lint.checks.infrastructure.TestFile
 
 object Stubs {
+
+    val WORKER_FACTORY: TestFile = kotlin(
+        "androidx/work/WorkerFactory.kt", """
+        package androidx.work
+
+        open class WorkerFactory
+    """
+    ).indented().within("src")
+
     val WORK_MANAGER_CONFIGURATION_PROVIDER: TestFile = java(
         "androidx/work/Configuration.java",
         """
-                 package androidx.work;
+                 package androidx.work; 
 
                  class Configuration {
                     static class Builder {
                         void setJobSchedulerJobIdRange(int minId, int maxId) {
 
                         }
+                        void setWorkerFactory(WorkerFactory factory) {
+
+                        }
                     }
                     interface Provider {
                         Configuration getWorkManagerConfiguration();
@@ -132,7 +144,8 @@
         """
     ).indented().within("src")
 
-    val CONSTRAINTS: TestFile = java("androidx/work/Constraints.java", """
+    val CONSTRAINTS: TestFile = java(
+        "androidx/work/Constraints.java", """
         package androidx.work;
 
         class Constraints {
@@ -145,7 +158,8 @@
                 }
             }
         }
-    """).indented().within("src")
+    """
+    ).indented().within("src")
 
     val NOTIFICATION: TestFile = kotlin(
         "android/app/Notification.kt",
diff --git a/work/workmanager-lint/src/test/java/androidx/work/lint/WorkerHasPublicModifierDetectorTest.kt b/work/workmanager-lint/src/test/java/androidx/work/lint/WorkerHasPublicModifierDetectorTest.kt
new file mode 100644
index 0000000..fb2561b
--- /dev/null
+++ b/work/workmanager-lint/src/test/java/androidx/work/lint/WorkerHasPublicModifierDetectorTest.kt
@@ -0,0 +1,119 @@
+/*
+ * 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.lint
+
+import androidx.work.lint.Stubs.LISTENABLE_WORKER
+import androidx.work.lint.Stubs.WORKER_FACTORY
+import androidx.work.lint.Stubs.WORK_MANAGER_CONFIGURATION_PROVIDER
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest.kotlin
+import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import org.junit.Test
+
+class WorkerHasPublicModifierDetectorTest {
+    @Test
+    fun testWithPrivateWorker() {
+        val worker = kotlin(
+            "com/example/Worker.kt",
+            """
+            package com.example
+
+            import androidx.work.ListenableWorker
+
+            private class Worker: ListenableWorker()
+            """
+        ).indented().within("src")
+
+        /* ktlint-disable max-line-length */
+        lint().files(
+            // Source files
+            LISTENABLE_WORKER,
+            worker
+        ).issues(WorkerHasPublicModifierDetector.ISSUE)
+            .run()
+            .expect("""
+                src/com/example/Worker.kt:5: Error: com.example.Worker needs to be public [WorkerHasAPublicModifier]
+                private class Worker: ListenableWorker()
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                1 errors, 0 warnings
+            """.trimIndent())
+        /* ktlint-enable max-line-length */
+    }
+
+    @Test
+    fun testWithPublicWorker() {
+        val worker = kotlin(
+            "com/example/Worker.kt",
+            """
+            package com.example
+
+            import androidx.work.ListenableWorker
+
+            class Worker: ListenableWorker()
+            """
+        ).indented().within("src")
+
+        lint().files(
+            // Source files
+            LISTENABLE_WORKER,
+            worker
+        ).issues(WorkerHasPublicModifierDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun testWithPrivateWorkerAndCustomFactory() {
+        val worker = kotlin(
+            "com/example/Worker.kt",
+            """
+            package com.example
+
+            import androidx.work.ListenableWorker
+
+            private class Worker: ListenableWorker()
+            """
+        ).indented().within("src")
+
+        val snippet = kotlin(
+            "com/example/Test.kt",
+            """
+            package com.example
+
+            import androidx.work.Configuration
+
+            class Test {
+                fun buildConfiguration() {
+                   val factory: WorkerFactory = TODO()
+                   val builder = Configuration.Builder(factory)
+                   builder.setWorkerFactory(factory)
+                }
+            }
+            """
+        ).indented().within("src")
+
+        lint().files(
+            // Source files
+            WORKER_FACTORY,
+            LISTENABLE_WORKER,
+            WORK_MANAGER_CONFIGURATION_PROVIDER,
+            worker,
+            snippet
+        ).issues(WorkerHasPublicModifierDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+}